diff --git a/azure-rest-api-specs b/azure-rest-api-specs
new file mode 160000
index 000000000000..c6c46a85babe
--- /dev/null
+++ b/azure-rest-api-specs
@@ -0,0 +1 @@
+Subproject commit c6c46a85babe68ad27f626bc40007e1556ec8fa1
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateService.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateService.json
index d55b18a2e6e4..600a8e260f5e 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateService.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateService.json
@@ -90,7 +90,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "publicIPAddresses": [
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceHavingMsi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
index 4f191c2952b5..ea928dbfa4d9 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
@@ -94,7 +94,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "virtualNetworkType": "None",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
index b201020f5c1c..40a695c3b41e 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
@@ -59,7 +59,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "publicIpAddressId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/publicIPAddresses/apimazvnet",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInZones.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInZones.json
index 01b6b695fdb2..04f586004078 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInZones.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInZones.json
@@ -54,7 +54,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "virtualNetworkType": "None",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
index de70e2cdef6e..88d32716335d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
@@ -81,7 +81,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",
@@ -175,7 +175,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
index 92ac8b61ef1f..21e30738e630 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
@@ -110,7 +110,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "publicIPAddresses": [
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json
index 7436e93f636e..a117cfc2adae 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json
@@ -56,7 +56,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "virtualNetworkType": "None"
@@ -99,7 +99,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "customProperties": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json
index 79e6d2f68081..936dc678ad5b 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json
@@ -33,7 +33,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetService.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetService.json
index 1236e8e7900c..3508905b8d90 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetService.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetService.json
@@ -37,7 +37,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json
index 3bb412017869..a6a95e7ee74f 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json
@@ -33,7 +33,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimanagement.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimanagement.json
new file mode 100644
index 000000000000..b5c09291b632
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimanagement.json
@@ -0,0 +1,770 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on entities like API, Product, and Subscription associated with your Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {},
+  "definitions": {
+    "ErrorFieldContract": {
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "Property level error code."
+        },
+        "message": {
+          "type": "string",
+          "description": "Human-readable representation of property-level error."
+        },
+        "target": {
+          "type": "string",
+          "description": "Property name."
+        }
+      },
+      "description": "Error Field contract."
+    },
+    "ErrorResponse": {
+      "properties": {
+        "error": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ErrorResponseBody",
+          "description": "Properties of the Error Response."
+        }
+      },
+      "description": "Error Response."
+    },
+    "ErrorResponseBody": {
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "Service-defined error code. This code serves as a sub-status for the HTTP error code specified in the response."
+        },
+        "message": {
+          "type": "string",
+          "description": "Human-readable representation of the error."
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ErrorFieldContract"
+          },
+          "description": "The list of invalid fields send in request, in case of validation error."
+        }
+      },
+      "description": "Error Body contract."
+    },
+    "RegionContract": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Region name.",
+          "readOnly": true
+        },
+        "isMasterRegion": {
+          "description": "whether Region is the master region.",
+          "type": "boolean"
+        },
+        "isDeleted": {
+          "description": "whether Region is deleted.",
+          "type": "boolean"
+        }
+      },
+      "description": "Region profile."
+    },
+    "RegionListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RegionContract"
+          },
+          "description": "Lists of Regions."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Lists Regions operation response details."
+    }
+  },
+  "parameters": {
+    "AccessParameter": {
+      "name": "accessName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "access",
+        "gitAccess"
+      ],
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "AccessIdName"
+      },
+      "description": "The identifier of the Access configuration.",
+      "x-ms-parameter-location": "method"
+    },
+    "SettingsParameter": {
+      "name": "settingsType",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "public"
+      ],
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "settingsTypeName"
+      },
+      "description": "The identifier of the settings.",
+      "x-ms-parameter-location": "method"
+    },
+    "ApiIdParameter": {
+      "name": "apiId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "API identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "x-ms-parameter-location": "method"
+    },
+    "ApiIdRevParameter": {
+      "name": "apiId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "API revision identifier. Must be unique in the current API Management service instance. Non-current revision has ;rev=n as a suffix where n is the revision number.",
+      "minLength": 1,
+      "maxLength": 256,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "ApiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "description": "Version of the API to be used with the client request."
+    },
+    "ApiVersionSetIdParameter": {
+      "name": "versionSetId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Api Version Set identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "AppTypeParameter": {
+      "name": "appType",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "description": "Determines the type of application which send the create user request. Default is legacy publisher portal.",
+      "enum": [
+        "portal",
+        "developerPortal"
+      ],
+      "x-ms-enum": {
+        "name": "AppType",
+        "modelAsString": true,
+        "values": [
+          {
+            "value": "portal",
+            "description": "User create request was sent by legacy developer portal."
+          },
+          {
+            "value": "developerPortal",
+            "description": "User create request was sent by new developer portal."
+          }
+        ]
+      },
+      "default": "portal",
+      "x-ms-parameter-location": "method"
+    },
+    "AttachmentIdParameter": {
+      "name": "attachmentId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Attachment identifier within an Issue. Must be unique in the current Issue.",
+      "minLength": 1,
+      "maxLength": 256,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "AuthenticationServerIdParameter": {
+      "name": "authsid",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Identifier of the authorization server.",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "BackendIdParameter": {
+      "name": "backendId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Identifier of the Backend entity. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "x-ms-parameter-location": "method"
+    },
+    "CacheIdParameter": {
+      "name": "cacheId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Identifier of the Cache entity. Cache identifier (should be either 'default' or valid Azure region identifier).",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "CertificateIdParameter": {
+      "name": "certificateId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Identifier of the certificate entity. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "CommentIdParameter": {
+      "name": "commentId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Comment identifier within an Issue. Must be unique in the current Issue.",
+      "minLength": 1,
+      "maxLength": 256,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "ConfigurationParameter": {
+      "name": "configurationName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "configuration"
+      ],
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "configurationIdName"
+      },
+      "description": "The identifier of the Git Configuration Operation.",
+      "x-ms-parameter-location": "method"
+    },
+    "DiagnosticIdParameter": {
+      "name": "diagnosticId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Diagnostic identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "EmailParameter": {
+      "name": "email",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Email identifier.",
+      "x-ms-parameter-location": "method"
+    },
+    "GroupIdParameter": {
+      "name": "groupId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Group identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 256,
+      "x-ms-parameter-location": "method"
+    },
+    "IdentityProviderNameParameter": {
+      "name": "identityProviderName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "facebook",
+        "google",
+        "microsoft",
+        "twitter",
+        "aad",
+        "aadB2C"
+      ],
+      "x-ms-enum": {
+        "name": "IdentityProviderType",
+        "modelAsString": true,
+        "values": [
+          {
+            "value": "facebook",
+            "description": "Facebook as Identity provider."
+          },
+          {
+            "value": "google",
+            "description": "Google as Identity provider."
+          },
+          {
+            "value": "microsoft",
+            "description": "Microsoft Live as Identity provider."
+          },
+          {
+            "value": "twitter",
+            "description": "Twitter as Identity provider."
+          },
+          {
+            "value": "aad",
+            "description": "Azure Active Directory as Identity provider."
+          },
+          {
+            "value": "aadB2C",
+            "description": "Azure Active Directory B2C as Identity provider."
+          }
+        ]
+      },
+      "description": "Identity Provider Type identifier.",
+      "x-ms-parameter-location": "method"
+    },
+    "IfMatchOptionalParameter": {
+      "name": "If-Match",
+      "in": "header",
+      "required": false,
+      "description": "ETag of the Entity. Not required when creating an entity, but required when updating an entity.",
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "IfMatchRequiredParameter": {
+      "name": "If-Match",
+      "in": "header",
+      "required": true,
+      "description": "ETag of the Entity. ETag should match the current entity state from the header response of the GET request or it should be * for unconditional update.",
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "IssueIdParameter": {
+      "name": "issueId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Issue identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 256,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "LocationNameParameter": {
+      "name": "locationName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Location in which the API Management service is deployed. This is one of the Azure Regions like West US, East US, South Central US.",
+      "minLength": 1,
+      "x-ms-parameter-location": "method"
+    },
+    "LoggerIdParameter": {
+      "name": "loggerId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "maxLength": 256,
+      "pattern": "^[^*#&+:<>?]+$",
+      "description": "Logger identifier. Must be unique in the API Management service instance.",
+      "x-ms-parameter-location": "method"
+    },
+    "NotificationNameParameter": {
+      "name": "notificationName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "RequestPublisherNotificationMessage",
+        "PurchasePublisherNotificationMessage",
+        "NewApplicationNotificationMessage",
+        "BCC",
+        "NewIssuePublisherNotificationMessage",
+        "AccountClosedPublisher",
+        "QuotaLimitApproachingPublisherNotificationMessage"
+      ],
+      "x-ms-enum": {
+        "name": "NotificationName",
+        "modelAsString": true,
+        "values": [
+          {
+            "value": "RequestPublisherNotificationMessage",
+            "description": "The following email recipients and users will receive email notifications about subscription requests for API products requiring approval."
+          },
+          {
+            "value": "PurchasePublisherNotificationMessage",
+            "description": "The following email recipients and users will receive email notifications about new API product subscriptions."
+          },
+          {
+            "value": "NewApplicationNotificationMessage",
+            "description": "The following email recipients and users will receive email notifications when new applications are submitted to the application gallery."
+          },
+          {
+            "value": "BCC",
+            "description": "The following recipients will receive blind carbon copies of all emails sent to developers."
+          },
+          {
+            "value": "NewIssuePublisherNotificationMessage",
+            "description": "The following email recipients and users will receive email notifications when a new issue or comment is submitted on the developer portal."
+          },
+          {
+            "value": "AccountClosedPublisher",
+            "description": "The following email recipients and users will receive email notifications when developer closes his account."
+          },
+          {
+            "value": "QuotaLimitApproachingPublisherNotificationMessage",
+            "description": "The following email recipients and users will receive email notifications when subscription usage gets close to usage quota."
+          }
+        ]
+      },
+      "description": "Notification Name Identifier.",
+      "x-ms-parameter-location": "method"
+    },
+    "NotifySubscriptionStateChangeParameter": {
+      "name": "notify",
+      "in": "query",
+      "required": false,
+      "type": "boolean",
+      "description": "Notify change in Subscription State. \n - If false, do not send any email notification for change of state of subscription \n - If true, send email notification of change of state of subscription ",
+      "x-ms-parameter-location": "method"
+    },
+    "OpenIdConnectIdParameter": {
+      "name": "opid",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Identifier of the OpenID Connect Provider.",
+      "maxLength": 256,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "OperationIdParameter": {
+      "name": "operationId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Operation identifier within an API. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "x-ms-parameter-location": "method"
+    },
+    "PolicyExportFormat": {
+      "name": "format",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "description": "Policy Export Format.",
+      "enum": [
+        "xml",
+        "rawxml"
+      ],
+      "x-ms-enum": {
+        "name": "PolicyExportFormat",
+        "modelAsString": true,
+        "values": [
+          {
+            "value": "xml",
+            "description": "The contents are inline and Content type is an XML document."
+          },
+          {
+            "value": "rawxml",
+            "description": "The contents are inline and Content type is a non XML encoded policy document."
+          }
+        ]
+      },
+      "default": "xml",
+      "x-ms-parameter-location": "method"
+    },
+    "PolicyIdParameter": {
+      "name": "policyId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "policy"
+      ],
+      "description": "The identifier of the Policy.",
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "PolicyIdName"
+      },
+      "x-ms-parameter-location": "method"
+    },
+    "PortalRevisionIdParameter": {
+      "name": "portalRevisionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Portal revision identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 256,
+      "x-ms-parameter-location": "method"
+    },
+    "ProductIdParameter": {
+      "name": "productId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Product identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 256,
+      "x-ms-parameter-location": "method"
+    },
+    "NamedValueIdParameter": {
+      "name": "namedValueId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Identifier of the NamedValue.",
+      "maxLength": 256,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "QuotaCounterKeyParameter": {
+      "name": "quotaCounterKey",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Quota counter key identifier.This is the result of expression defined in counter-key attribute of the quota-by-key policy.For Example, if you specify counter-key=\"boo\" in the policy, then it’s accessible by \"boo\" counter key. But if it’s defined as counter-key=\"@(\"b\"+\"a\")\" then it will be accessible by \"ba\" key",
+      "x-ms-parameter-location": "method"
+    },
+    "QuotaPeriodKeyParameter": {
+      "name": "quotaPeriodKey",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Quota period key identifier.",
+      "x-ms-parameter-location": "method"
+    },
+    "ReleaseIdParameter": {
+      "name": "releaseId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Release identifier within an API. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "ResourceGroupNameParameter": {
+      "name": "resourceGroupName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "The name of the resource group.",
+      "x-ms-parameter-location": "method"
+    },
+    "SchemaIdParameter": {
+      "name": "schemaId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Schema identifier within an API. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "ServiceNameParameter": {
+      "name": "serviceName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "The name of the API Management service.",
+      "minLength": 1,
+      "maxLength": 50,
+      "pattern": "^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$",
+      "x-ms-parameter-location": "method"
+    },
+    "SkipQueryParameter": {
+      "name": "$skip",
+      "in": "query",
+      "required": false,
+      "type": "integer",
+      "format": "int32",
+      "description": "Number of records to skip.",
+      "minimum": 0,
+      "x-ms-parameter-location": "method"
+    },
+    "SubscriptionEntityIdParameter": {
+      "name": "sid",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Subscription entity Identifier. The entity represents the association between a user and a product in API Management.",
+      "maxLength": 256,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
+    },
+    "TagIdParameter": {
+      "name": "tagId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Tag identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "TagDescriptionIdParameter": {
+      "name": "tagDescriptionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Tag description identifier. Used when creating tagDescription for API/Tag association. Based on API and Tag names.",
+      "minLength": 1,
+      "maxLength": 80,
+      "pattern": "^[^*#&+:<>?]+$",
+      "x-ms-parameter-location": "method"
+    },
+    "TemplateNameParameter": {
+      "name": "templateName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "applicationApprovedNotificationMessage",
+        "accountClosedDeveloper",
+        "quotaLimitApproachingDeveloperNotificationMessage",
+        "newDeveloperNotificationMessage",
+        "emailChangeIdentityDefault",
+        "inviteUserNotificationMessage",
+        "newCommentNotificationMessage",
+        "confirmSignUpIdentityDefault",
+        "newIssueNotificationMessage",
+        "purchaseDeveloperNotificationMessage",
+        "passwordResetIdentityDefault",
+        "passwordResetByAdminNotificationMessage",
+        "rejectDeveloperNotificationMessage",
+        "requestDeveloperNotificationMessage"
+      ],
+      "x-ms-enum": {
+        "name": "TemplateName",
+        "modelAsString": true
+      },
+      "description": "Email Template Name Identifier.",
+      "x-ms-parameter-location": "method"
+    },
+    "TopQueryParameter": {
+      "name": "$top",
+      "in": "query",
+      "required": false,
+      "type": "integer",
+      "format": "int32",
+      "description": "Number of records to return.",
+      "minimum": 1,
+      "x-ms-parameter-location": "method"
+    },
+    "UserIdParameter": {
+      "name": "userId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "User identifier. Must be unique in the current API Management service instance.",
+      "minLength": 1,
+      "maxLength": 80,
+      "x-ms-parameter-location": "method"
+    },
+    "GatewayIdParameter": {
+      "name": "gatewayId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Gateway entity identifier. Must be unique in the current API Management service instance. Must not have value 'managed'",
+      "minLength": 1,
+      "maxLength": 80,
+      "x-ms-parameter-location": "method"
+    },
+    "GatewayHostnameConfigurationIdParameter": {
+      "name": "hcId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Gateway hostname configuration identifier. Must be unique in the scope of parent Gateway entity.",
+      "minLength": 1,
+      "maxLength": 80,
+      "x-ms-parameter-location": "method"
+    },
+    "ContentTypeIdParameter": {
+      "name": "contentTypeId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Content type identifier.",
+      "minLength": 1,
+      "maxLength": 80,
+      "x-ms-parameter-location": "method"
+    },
+    "ContentItemIdParameter": {
+      "name": "contentItemId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Content item identifier.",
+      "minLength": 1,
+      "maxLength": 80,
+      "x-ms-parameter-location": "method"
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapis.json
new file mode 100644
index 000000000000..95f12fcad9ee
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapis.json
@@ -0,0 +1,4522 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on API entity and their Operations associated with your Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis": {
+      "get": {
+        "tags": [
+          "Api"
+        ],
+        "operationId": "Api_ListByService",
+        "description": "Lists all APIs of the API Management service instance.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-create-apis"
+        },
+        "x-ms-examples": {
+          "ApiManagementListApis": {
+            "$ref": "./examples/ApiManagementListApis.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| path | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| isCurrent | filter | eq, ne |  |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Include tags in the response."
+          },
+          {
+            "name": "expandApiVersionSet",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Include full ApiVersionSet resource in response"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Paged Result response of Apis.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ApiContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}": {
+      "head": {
+        "tags": [
+          "Api"
+        ],
+        "operationId": "Api_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApi": {
+            "$ref": "./examples/ApiManagementHeadApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified API entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Api"
+        ],
+        "operationId": "Api_Get",
+        "description": "Gets the details of the API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetApiContract": {
+            "$ref": "./examples/ApiManagementGetApiContract.json"
+          },
+          "ApiManagementGetApiRevisionContract": {
+            "$ref": "./examples/ApiManagementGetApiRevision.json"
+          }
+        },
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified API entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Api"
+        ],
+        "operationId": "Api_CreateOrUpdate",
+        "description": "Creates new or updates existing specified API of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiUsingOai3Import": {
+            "$ref": "./examples/ApiManagementCreateApiUsingOai3Import.json"
+          },
+          "ApiManagementCreateApiUsingSwaggerImport": {
+            "$ref": "./examples/ApiManagementCreateApiUsingSwaggerImport.json"
+          },
+          "ApiManagementCreateApiUsingWadlImport": {
+            "$ref": "./examples/ApiManagementCreateApiUsingWadlImport.json"
+          },
+          "ApiManagementCreateSoapToRestApiUsingWsdlImport": {
+            "$ref": "./examples/ApiManagementCreateSoapToRestApiUsingWsdlImport.json"
+          },
+          "ApiManagementCreateSoapPassThroughApiUsingWsdlImport": {
+            "$ref": "./examples/ApiManagementCreateSoapPassThroughApiUsingWsdlImport.json"
+          },
+          "ApiManagementCreateApi": {
+            "$ref": "./examples/ApiManagementCreateApi.json"
+          },
+          "ApiManagementCreateWebSocketApi": {
+            "$ref": "./examples/ApiManagementCreateWebsocketApi.json"
+          },
+          "ApiManagementCreateApiRevisionFromExistingApi": {
+            "$ref": "./examples/ApiManagementCreateApiRevisionFromExistingApi.json"
+          },
+          "ApiManagementCreateApiNewVersionUsingExistingApi": {
+            "$ref": "./examples/ApiManagementCreateApiNewVersionUsingExistingApi.json"
+          },
+          "ApiManagementCreateApiClone": {
+            "$ref": "./examples/ApiManagementCreateApiClone.json"
+          },
+          "ApiManagementCreateApiWithOpenIdConnect": {
+            "$ref": "./examples/ApiManagementCreateApiWithOpenIdConnect.json"
+          },
+          "ApiManagementCreateApiUsingImportOverrideServiceUrl": {
+            "$ref": "./examples/ApiManagementCreateApiUsingImportOverrideServiceUrl.json"
+          },
+          "ApiManagementCreateGraphQLApi": {
+            "$ref": "./examples/ApiManagementCreateGraphQLApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiCreateOrUpdateParameter"
+            },
+            "description": "Create or update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "API was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "202": {
+            "description": "Request to create or update API was accepted. Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "200": {
+            "description": "API was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      },
+      "patch": {
+        "tags": [
+          "Api"
+        ],
+        "operationId": "Api_Update",
+        "description": "Updates the specified API of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementUpdateApi": {
+            "$ref": "./examples/ApiManagementUpdateApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiUpdateContract"
+            },
+            "description": "API Update Contract parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "API was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Api"
+        ],
+        "operationId": "Api_Delete",
+        "description": "Deletes the specified API of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApi": {
+            "$ref": "./examples/ApiManagementDeleteApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "deleteRevisions",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Delete all revisions of the Api."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The API was successfully deleted."
+          },
+          "204": {
+            "description": "The API was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/revisions": {
+      "get": {
+        "tags": [
+          "ApiRevision"
+        ],
+        "operationId": "ApiRevision_ListByService",
+        "description": "Lists all revisions of an API.",
+        "x-ms-examples": {
+          "ApiManagementListApiRevisions": {
+            "$ref": "./examples/ApiManagementListApiRevisions.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| apiRevision | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation returns a list of revision details.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiRevisionCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ApiRevisionContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases": {
+      "get": {
+        "tags": [
+          "ApiRelease"
+        ],
+        "operationId": "ApiRelease_ListByService",
+        "description": "Lists all releases of an API. An API release is created when making an API Revision current. Releases are also used to rollback to previous revisions. Results will be paged and can be constrained by the $top and $skip parameters.",
+        "x-ms-examples": {
+          "ApiManagementListApiReleases": {
+            "$ref": "./examples/ApiManagementListApiReleases.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| notes | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation returns a list of API Releases.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiReleaseCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ApiReleaseContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}": {
+      "head": {
+        "tags": [
+          "ApiRelease"
+        ],
+        "operationId": "ApiRelease_GetEntityTag",
+        "description": "Returns the etag of an API release.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiRelease": {
+            "$ref": "./examples/ApiManagementHeadApiRelease.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ReleaseIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the entity state (Etag) version of the api release as specified by its identifier.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiRelease"
+        ],
+        "operationId": "ApiRelease_Get",
+        "description": "Returns the details of an API release.",
+        "x-ms-examples": {
+          "ApiManagementGetApiRelease": {
+            "$ref": "./examples/ApiManagementGetApiRelease.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ReleaseIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation returns the details of an API Release.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiReleaseContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiRelease"
+        ],
+        "operationId": "ApiRelease_CreateOrUpdate",
+        "description": "Creates a new Release for the API.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiRelease": {
+            "$ref": "./examples/ApiManagementCreateApiRelease.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ReleaseIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiReleaseContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Release was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiReleaseContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Release was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiReleaseContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "ApiRelease"
+        ],
+        "operationId": "ApiRelease_Update",
+        "description": "Updates the details of the release of the API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateApiRelease": {
+            "$ref": "./examples/ApiManagementUpdateApiRelease.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ReleaseIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiReleaseContract"
+            },
+            "description": "API Release Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Release was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiReleaseContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiRelease"
+        ],
+        "operationId": "ApiRelease_Delete",
+        "description": "Deletes the specified release in the API.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiRelease": {
+            "$ref": "./examples/ApiManagementDeleteApiRelease.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ReleaseIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "API release successfully removed"
+          },
+          "204": {
+            "description": "API release successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations": {
+      "get": {
+        "tags": [
+          "ApiOperation"
+        ],
+        "operationId": "ApiOperation_ListByApi",
+        "description": "Lists a collection of the operations for the specified API.",
+        "x-ms-examples": {
+          "ApiManagementListApiOperations": {
+            "$ref": "./examples/ApiManagementListApiOperations.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| method | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Include tags in the response."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A collection of operation summary entities at the API level.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/OperationContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}": {
+      "head": {
+        "tags": [
+          "ApiOperation"
+        ],
+        "operationId": "ApiOperation_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the API operation specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiOperation": {
+            "$ref": "./examples/ApiManagementHeadApiOperation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified API operation entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiOperation"
+        ],
+        "operationId": "ApiOperation_Get",
+        "description": "Gets the details of the API Operation specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetApiOperation": {
+            "$ref": "./examples/ApiManagementGetApiOperation.json"
+          },
+          "ApiManagementGetApiOperationPetStore": {
+            "$ref": "./examples/ApiManagementGetApiOperationPetStore.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Operation entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiOperation"
+        ],
+        "operationId": "ApiOperation_CreateOrUpdate",
+        "description": "Creates a new operation in the API or updates an existing one.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiOperation": {
+            "$ref": "./examples/ApiManagementCreateApiOperation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Operation was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Operation was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "ApiOperation"
+        ],
+        "operationId": "ApiOperation_Update",
+        "description": "Updates the details of the operation in the API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateApiOperation": {
+            "$ref": "./examples/ApiManagementUpdateApiOperation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationUpdateContract"
+            },
+            "description": "API Operation Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiOperation"
+        ],
+        "operationId": "ApiOperation_Delete",
+        "description": "Deletes the specified operation in the API.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiOperation": {
+            "$ref": "./examples/ApiManagementDeleteApiOperation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "API operation successfully removed"
+          },
+          "204": {
+            "description": "API operation successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies": {
+      "get": {
+        "tags": [
+          "ApiOperationPolicy"
+        ],
+        "operationId": "ApiOperationPolicy_ListByOperation",
+        "description": "Get the list of policy configuration at the API Operation level.",
+        "x-ms-examples": {
+          "ApiManagementListApiOperationPolicies": {
+            "$ref": "./examples/ApiManagementListApiOperationPolicies.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Api Operations Policy Collection.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}": {
+      "head": {
+        "tags": [
+          "ApiOperationPolicy"
+        ],
+        "operationId": "ApiOperationPolicy_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the API operation policy specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiOperationPolicy": {
+            "$ref": "./examples/ApiManagementHeadApiOperationPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified API operation policy entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiOperationPolicy"
+        ],
+        "operationId": "ApiOperationPolicy_Get",
+        "description": "Get the policy configuration at the API Operation level.",
+        "x-ms-examples": {
+          "ApiManagementGetApiOperationPolicy": {
+            "$ref": "./examples/ApiManagementGetApiOperationPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyExportFormat"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Api Operation Policy information.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiOperationPolicy"
+        ],
+        "operationId": "ApiOperationPolicy_CreateOrUpdate",
+        "description": "Creates or updates policy configuration for the API Operation level.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiOperationPolicy": {
+            "$ref": "./examples/ApiManagementCreateApiOperationPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "description": "The policy contents to apply."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Api Operation policy configuration was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Api Operation policy configuration of the tenant was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiOperationPolicy"
+        ],
+        "operationId": "ApiOperationPolicy_Delete",
+        "description": "Deletes the policy configuration at the Api Operation.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiOperationPolicy": {
+            "$ref": "./examples/ApiManagementDeleteApiOperationPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Policy successfully removed"
+          },
+          "204": {
+            "description": "Policy successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags": {
+      "get": {
+        "tags": [
+          "ApiOperationTag"
+        ],
+        "operationId": "Tag_ListByOperation",
+        "description": "Lists all Tags associated with the Operation.",
+        "x-ms-examples": {
+          "ApiManagementListApiOperationTags": {
+            "$ref": "./examples/ApiManagementListApiOperationTags.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation returns a collection of tags associated with the Operation entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}": {
+      "head": {
+        "tags": [
+          "ApiOperationTag"
+        ],
+        "operationId": "Tag_GetEntityStateByOperation",
+        "description": "Gets the entity state version of the tag specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiOperationTag": {
+            "$ref": "./examples/ApiManagementHeadApiOperationTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Empty response body, ETag header entity state version.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiOperationTag"
+        ],
+        "operationId": "Tag_GetByOperation",
+        "description": "Get tag associated with the Operation.",
+        "x-ms-examples": {
+          "ApiManagementGetApiOperationTag": {
+            "$ref": "./examples/ApiManagementGetApiOperationTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the details of the tag specified by its identifier.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiOperationTag"
+        ],
+        "operationId": "Tag_AssignToOperation",
+        "description": "Assign tag to the Operation.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiOperationTag": {
+            "$ref": "./examples/ApiManagementCreateApiOperationTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Tag was assigned to the Operation.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            }
+          },
+          "200": {
+            "description": "Tag is already assigned to the Operation.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiOperationTag"
+        ],
+        "operationId": "Tag_DetachFromOperation",
+        "description": "Detach the tag from the Operation.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiOperationTag": {
+            "$ref": "./examples/ApiManagementDeleteApiOperationTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OperationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tag was successfully removed from Operation"
+          },
+          "204": {
+            "description": "Tag successfully removed by previous request or does not exist in Operation"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/products": {
+      "get": {
+        "tags": [
+          "ApiProduct"
+        ],
+        "operationId": "ApiProduct_ListByApis",
+        "description": "Lists all Products, which the API is part of.",
+        "x-ms-examples": {
+          "ApiManagementListApiProducts": {
+            "$ref": "./examples/ApiManagementListApiProducts.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation returns a collection of products which have the Api entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ProductCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ProductContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies": {
+      "get": {
+        "tags": [
+          "ApiPolicy"
+        ],
+        "operationId": "ApiPolicy_ListByApi",
+        "description": "Get the policy configuration at the API level.",
+        "x-ms-examples": {
+          "ApiManagementListApiPolicies": {
+            "$ref": "./examples/ApiManagementListApiPolicies.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Apis Policy Collection.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}": {
+      "head": {
+        "tags": [
+          "ApiPolicy"
+        ],
+        "operationId": "ApiPolicy_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the API policy specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiPolicy": {
+            "$ref": "./examples/ApiManagementHeadApiPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified API Policy entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiPolicy"
+        ],
+        "operationId": "ApiPolicy_Get",
+        "description": "Get the policy configuration at the API level.",
+        "x-ms-examples": {
+          "ApiManagementGetApiPolicy": {
+            "$ref": "./examples/ApiManagementGetApiPolicy.json"
+          }
+        },
+        "produces": [
+          "application/json",
+          "application/vnd.ms-azure-apim.policy+xml",
+          "application/vnd.ms-azure-apim.policy.raw+xml"
+        ],
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyExportFormat"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Api Policy information.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiPolicy"
+        ],
+        "operationId": "ApiPolicy_CreateOrUpdate",
+        "description": "Creates or updates policy configuration for the API.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiPolicy": {
+            "$ref": "./examples/ApiManagementCreateApiPolicy.json"
+          },
+          "ApiManagementCreateApiPolicyNonXmlEncoded": {
+            "$ref": "./examples/ApiManagementCreateApiPolicyNonXmlEncoded.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "description": "The policy contents to apply."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Api policy configuration was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Api policy configuration of the tenant was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiPolicy"
+        ],
+        "operationId": "ApiPolicy_Delete",
+        "description": "Deletes the policy configuration at the Api.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiPolicy": {
+            "$ref": "./examples/ApiManagementDeleteApiPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully deleted the policy configuration at the API level."
+          },
+          "204": {
+            "description": "Successfully deleted the policy configuration at the API level."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas": {
+      "get": {
+        "tags": [
+          "ApiSchema"
+        ],
+        "operationId": "ApiSchema_ListByApi",
+        "description": "Get the schema configuration at the API level.",
+        "x-ms-examples": {
+          "ApiManagementListApiSchemas": {
+            "$ref": "./examples/ApiManagementListApiSchemas.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| contentType | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Apis Schema Collection.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SchemaCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}": {
+      "head": {
+        "tags": [
+          "ApiSchema"
+        ],
+        "operationId": "ApiSchema_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the schema specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiSchema": {
+            "$ref": "./examples/ApiManagementHeadApiSchema.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SchemaIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified schema entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiSchema"
+        ],
+        "operationId": "ApiSchema_Get",
+        "description": "Get the schema configuration at the API level.",
+        "x-ms-examples": {
+          "ApiManagementGetApiSchema": {
+            "$ref": "./examples/ApiManagementGetApiSchema.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SchemaIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Api Schema information.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SchemaContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiSchema"
+        ],
+        "operationId": "ApiSchema_CreateOrUpdate",
+        "description": "Creates or updates schema configuration for the API.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiSchema": {
+            "$ref": "./examples/ApiManagementCreateApiSchema.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SchemaIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SchemaContract"
+            },
+            "description": "The schema contents to apply."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Request to create or update Api schema was accepted."
+          },
+          "201": {
+            "description": "Api schema configuration was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SchemaContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Api schema configuration of the tenant was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SchemaContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiSchema"
+        ],
+        "operationId": "ApiSchema_Delete",
+        "description": "Deletes the schema configuration at the Api.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiSchema": {
+            "$ref": "./examples/ApiManagementDeleteApiSchema.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SchemaIdParameter"
+          },
+          {
+            "name": "force",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "If true removes all references to the schema before deleting it."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully deleted the schema configuration at the API level."
+          },
+          "204": {
+            "description": "Successfully deleted the schema configuration at the API level."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics": {
+      "get": {
+        "tags": [
+          "ApiDiagnostic"
+        ],
+        "operationId": "ApiDiagnostic_ListByService",
+        "description": "Lists all diagnostics of an API.",
+        "x-ms-examples": {
+          "ApiManagementListApiDiagnostics": {
+            "$ref": "./examples/ApiManagementListApiDiagnostics.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Paged Result response of diagnostics for an API.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/DiagnosticContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}": {
+      "head": {
+        "tags": [
+          "ApiDiagnostic"
+        ],
+        "operationId": "ApiDiagnostic_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the Diagnostic for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiDiagnostic": {
+            "$ref": "./examples/ApiManagementHeadApiDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiDiagnostic"
+        ],
+        "operationId": "ApiDiagnostic_Get",
+        "description": "Gets the details of the Diagnostic for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetApiDiagnostic": {
+            "$ref": "./examples/ApiManagementGetApiDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Diagnostic entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiDiagnostic"
+        ],
+        "operationId": "ApiDiagnostic_CreateOrUpdate",
+        "description": "Creates a new Diagnostic for an API or updates an existing one.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiDiagnostic": {
+            "$ref": "./examples/ApiManagementCreateApiDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Diagnostic was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Diagnostic was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "ApiDiagnostic"
+        ],
+        "operationId": "ApiDiagnostic_Update",
+        "description": "Updates the details of the Diagnostic for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateApiDiagnostic": {
+            "$ref": "./examples/ApiManagementUpdateApiDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "description": "Diagnostic Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Diagnostic was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiDiagnostic"
+        ],
+        "operationId": "ApiDiagnostic_Delete",
+        "description": "Deletes the specified Diagnostic from an API.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiDiagnostic": {
+            "$ref": "./examples/ApiManagementDeleteApiDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Diagnostic successfully removed"
+          },
+          "204": {
+            "description": "Diagnostic successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues": {
+      "get": {
+        "tags": [
+          "ApiIssue"
+        ],
+        "operationId": "ApiIssue_ListByService",
+        "description": "Lists all issues associated with the specified API.",
+        "x-ms-examples": {
+          "ApiManagementListApiIssues": {
+            "$ref": "./examples/ApiManagementListApiIssues.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq |     |</br>"
+          },
+          {
+            "name": "expandCommentsAttachments",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Expand the comment attachments. "
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Paged Result response of issues for the API.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/IssueContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}": {
+      "head": {
+        "tags": [
+          "ApiIssue"
+        ],
+        "operationId": "ApiIssue_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the Issue for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiIssue": {
+            "$ref": "./examples/ApiManagementHeadApiIssue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiIssue"
+        ],
+        "operationId": "ApiIssue_Get",
+        "description": "Gets the details of the Issue for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetApiIssue": {
+            "$ref": "./examples/ApiManagementGetApiIssue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "name": "expandCommentsAttachments",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Expand the comment attachments. "
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Issue entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiIssue"
+        ],
+        "operationId": "ApiIssue_CreateOrUpdate",
+        "description": "Creates a new Issue for an API or updates an existing one.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiIssue": {
+            "$ref": "./examples/ApiManagementCreateApiIssue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "New api issue successfully added",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Api issue successfully updated",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "ApiIssue"
+        ],
+        "operationId": "ApiIssue_Update",
+        "description": "Updates an existing issue for an API.",
+        "x-ms-examples": {
+          "ApiManagementUpdateApiIssue": {
+            "$ref": "./examples/ApiManagementUpdateApiIssue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueUpdateContract"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Api issue updated successfully.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiIssue"
+        ],
+        "operationId": "ApiIssue_Delete",
+        "description": "Deletes the specified Issue from an API.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiIssue": {
+            "$ref": "./examples/ApiManagementDeleteApiIssue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Issue successfully removed"
+          },
+          "204": {
+            "description": "Issue successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments": {
+      "get": {
+        "tags": [
+          "ApiIssueComment"
+        ],
+        "operationId": "ApiIssueComment_ListByService",
+        "description": "Lists all comments for the Issue associated with the specified API.",
+        "x-ms-examples": {
+          "ApiManagementListApiIssueComments": {
+            "$ref": "./examples/ApiManagementListApiIssueComments.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Paged Result response of issue comments for the API.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueCommentCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/IssueCommentContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}": {
+      "head": {
+        "tags": [
+          "ApiIssueComment"
+        ],
+        "operationId": "ApiIssueComment_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the issue Comment for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiIssueComment": {
+            "$ref": "./examples/ApiManagementHeadApiIssueComment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CommentIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiIssueComment"
+        ],
+        "operationId": "ApiIssueComment_Get",
+        "description": "Gets the details of the issue Comment for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetApiIssueComment": {
+            "$ref": "./examples/ApiManagementGetApiIssueComment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CommentIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified issue Comment entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueCommentContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiIssueComment"
+        ],
+        "operationId": "ApiIssueComment_CreateOrUpdate",
+        "description": "Creates a new Comment for the Issue in an API or updates an existing one.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiIssueComment": {
+            "$ref": "./examples/ApiManagementCreateApiIssueComment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CommentIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueCommentContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "New api issue comment successfully added",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueCommentContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Api issue comment successfully updated",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueCommentContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiIssueComment"
+        ],
+        "operationId": "ApiIssueComment_Delete",
+        "description": "Deletes the specified comment from an Issue.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiIssueComment": {
+            "$ref": "./examples/ApiManagementDeleteApiIssueComment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CommentIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Comment successfully removed"
+          },
+          "204": {
+            "description": "Comment successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments": {
+      "get": {
+        "tags": [
+          "ApiIssueAttachment"
+        ],
+        "operationId": "ApiIssueAttachment_ListByService",
+        "description": "Lists all attachments for the Issue associated with the specified API.",
+        "x-ms-examples": {
+          "ApiManagementListApiIssueAttachments": {
+            "$ref": "./examples/ApiManagementListApiIssueAttachments.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Paged Result response of issue attachments for the API.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueAttachmentCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/IssueAttachmentContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}": {
+      "head": {
+        "tags": [
+          "ApiIssueAttachment"
+        ],
+        "operationId": "ApiIssueAttachment_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the issue Attachment for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiIssueAttachment": {
+            "$ref": "./examples/ApiManagementHeadApiIssueAttachment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AttachmentIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiIssueAttachment"
+        ],
+        "operationId": "ApiIssueAttachment_Get",
+        "description": "Gets the details of the issue Attachment for an API specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetApiIssueAttachment": {
+            "$ref": "./examples/ApiManagementGetApiIssueAttachment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AttachmentIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified issue Attachment entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueAttachmentContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiIssueAttachment"
+        ],
+        "operationId": "ApiIssueAttachment_CreateOrUpdate",
+        "description": "Creates a new Attachment for the Issue in an API or updates an existing one.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiIssueAttachment": {
+            "$ref": "./examples/ApiManagementCreateApiIssueAttachment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AttachmentIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueAttachmentContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "New api issue attachment successfully added",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueAttachmentContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Api issue attachment successfully updated",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueAttachmentContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiIssueAttachment"
+        ],
+        "operationId": "ApiIssueAttachment_Delete",
+        "description": "Deletes the specified comment from an Issue.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiIssueAttachment": {
+            "$ref": "./examples/ApiManagementDeleteApiIssueAttachment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AttachmentIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Attachment successfully removed"
+          },
+          "204": {
+            "description": "Attachment successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions": {
+      "get": {
+        "tags": [
+          "ApiTagDescription"
+        ],
+        "operationId": "ApiTagDescription_ListByService",
+        "description": "Lists all Tags descriptions in scope of API. Model similar to swagger - tagDescription is defined on API level but tag may be assigned to the Operations",
+        "x-ms-examples": {
+          "ApiManagementListApiTagDescriptions": {
+            "$ref": "./examples/ApiManagementListApiTagDescriptions.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation returns a collection of tagDescriptions associated with the Api entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagDescriptionCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagDescriptionContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagDescriptionId}": {
+      "head": {
+        "tags": [
+          "ApiTagDescription"
+        ],
+        "operationId": "ApiTagDescription_GetEntityTag",
+        "description": "Gets the entity state version of the tag specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiTagDescription": {
+            "$ref": "./examples/ApiManagementHeadApiTagDescription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagDescriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Empty response body, ETag header entity state version.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiTagDescription"
+        ],
+        "operationId": "ApiTagDescription_Get",
+        "description": "Get Tag description in scope of API",
+        "x-ms-examples": {
+          "ApiManagementGetApiTagDescription": {
+            "$ref": "./examples/ApiManagementGetApiTagDescription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagDescriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the description of the tag specified by its identifier in scope if the Api.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagDescriptionContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiTagDescription"
+        ],
+        "operationId": "ApiTagDescription_CreateOrUpdate",
+        "description": "Create/Update tag description in scope of the Api.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiTagDescription": {
+            "$ref": "./examples/ApiManagementCreateApiTagDescription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagDescriptionIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagDescriptionCreateParameters"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Tag Description was created for the Api.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagDescriptionContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Tag Description was updated for the Api.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagDescriptionContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiTagDescription"
+        ],
+        "operationId": "ApiTagDescription_Delete",
+        "description": "Delete tag description for the Api.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiTagDescription": {
+            "$ref": "./examples/ApiManagementDeleteApiTagDescription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagDescriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tag description successfully removed"
+          },
+          "204": {
+            "description": "Tag description successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags": {
+      "get": {
+        "tags": [
+          "ApiTag"
+        ],
+        "operationId": "Tag_ListByApi",
+        "description": "Lists all Tags associated with the API.",
+        "x-ms-examples": {
+          "ApiManagementListApiTags": {
+            "$ref": "./examples/ApiManagementListApiTags.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation returns a collection of tags associated with the Api entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}": {
+      "head": {
+        "tags": [
+          "ApiTag"
+        ],
+        "operationId": "Tag_GetEntityStateByApi",
+        "description": "Gets the entity state version of the tag specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiTag": {
+            "$ref": "./examples/ApiManagementHeadApiTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Empty response body, ETag header entity state version.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiTag"
+        ],
+        "operationId": "Tag_GetByApi",
+        "description": "Get tag associated with the API.",
+        "x-ms-examples": {
+          "ApiManagementGetApiTag": {
+            "$ref": "./examples/ApiManagementGetApiTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the details of the tag specified by its identifier.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiTag"
+        ],
+        "operationId": "Tag_AssignToApi",
+        "description": "Assign tag to the Api.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiTag": {
+            "$ref": "./examples/ApiManagementCreateApiTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Tag was assigned to the Api.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Tag is already assigned to the Api.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiTag"
+        ],
+        "operationId": "Tag_DetachFromApi",
+        "description": "Detach the tag from the Api.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiTag": {
+            "$ref": "./examples/ApiManagementDeleteApiTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "API/Tag association successfully removed"
+          },
+          "204": {
+            "description": "API/Tag association successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operationsByTags": {
+      "get": {
+        "tags": [
+          "ApiOperationsByTag"
+        ],
+        "operationId": "Operation_ListByTags",
+        "description": "Lists a collection of operations associated with tags.",
+        "x-ms-examples": {
+          "ApiManagementListApiOperationsByTags": {
+            "$ref": "./examples/ApiManagementListApiOperationsByTags.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| method | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "includeNotTaggedOperations",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Include not tagged Operations."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of TagResource entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagResourceCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagResourceContract"
+      }
+    }
+  },
+  "x-ms-paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}?export=true": {
+      "get": {
+        "tags": [
+          "Apis"
+        ],
+        "operationId": "ApiExport_Get",
+        "description": "Gets the details of the API specified by its identifier in the format specified to the Storage Blob with SAS Key valid for 5 minutes.",
+        "x-ms-examples": {
+          "ApiManagementGetApiExportInOpenApi2dot0": {
+            "$ref": "./examples/ApiManagementGetApiExportInOpenApi2dot0.json"
+          },
+          "ApiManagementGetApiExportInOpenApi3dot0": {
+            "$ref": "./examples/ApiManagementGetApiExportInOpenApi3dot0.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "name": "format",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "swagger-link",
+              "wadl-link",
+              "wsdl-link",
+              "openapi-link",
+              "openapi+json-link"
+            ],
+            "x-ms-enum": {
+              "name": "ExportFormat",
+              "modelAsString": true,
+              "values": [
+                {
+                  "value": "swagger-link",
+                  "description": "Export the Api Definition in OpenAPI 2.0 Specification as JSON document to the Storage Blob.",
+                  "name": "Swagger"
+                },
+                {
+                  "value": "wsdl-link",
+                  "description": "Export the Api Definition in WSDL Schema to Storage Blob. This is only supported for APIs of Type `soap`",
+                  "name": "Wsdl"
+                },
+                {
+                  "value": "wadl-link",
+                  "description": "Export the Api Definition in WADL Schema to Storage Blob.",
+                  "name": "Wadl"
+                },
+                {
+                  "value": "openapi-link",
+                  "description": "Export the Api Definition in OpenAPI 3.0 Specification as YAML document to Storage Blob.",
+                  "name": "Openapi"
+                },
+                {
+                  "value": "openapi+json-link",
+                  "description": "Export the Api Definition in OpenAPI 3.0 Specification as JSON document to Storage Blob.",
+                  "name": "OpenapiJson"
+                }
+              ]
+            },
+            "description": "Format in which to export the Api Details to the Storage Blob with Sas Key valid for 5 minutes."
+          },
+          {
+            "name": "export",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "enum": [
+              "true"
+            ],
+            "x-ms-enum": {
+              "modelAsString": true,
+              "name": "ExportApi"
+            },
+            "description": "Query parameter required to export the API details."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response contains a stream with a full set of API metadata and includes API entity with an embedded array of operation entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiExportResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapisByTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapisByTags.json
new file mode 100644
index 000000000000..2a5e16f899e2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapisByTags.json
@@ -0,0 +1,106 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing retrieve a collection of Apis associated with a tag in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apisByTags": {
+      "get": {
+        "tags": [
+          "ApisByTag"
+        ],
+        "operationId": "Api_ListByTags",
+        "description": "Lists a collection of apis associated with tags.",
+        "x-ms-examples": {
+          "ApiManagementListApisByTags": {
+            "$ref": "./examples/ApiManagementListApisByTags.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiRevision | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| path | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| isCurrent | filter | eq |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "includeNotTaggedApis",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Include not tagged APIs."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of TagResource entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagResourceCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagResourceContract"
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapiversionsets.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapiversionsets.json
new file mode 100644
index 000000000000..d5b2584f1a8e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimapiversionsets.json
@@ -0,0 +1,376 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on the ApiVersionSet entity associated with your Azure API Management deployment. Using this entity you create and manage API Version Sets that are used to group APIs for consistent versioning.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets": {
+      "get": {
+        "tags": [
+          "ApiVersionSet"
+        ],
+        "operationId": "ApiVersionSet_ListByService",
+        "description": "Lists a collection of API Version Sets in the specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementListApiVersionSets": {
+            "$ref": "./examples/ApiManagementListApiVersionSets.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Api Version Set entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiVersionSetCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ApiVersionSetContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}": {
+      "head": {
+        "tags": [
+          "ApiVersionSet"
+        ],
+        "operationId": "ApiVersionSet_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the Api Version Set specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadApiVersionSet": {
+            "$ref": "./examples/ApiManagementHeadApiVersionSet.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionSetIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified Api Version Set entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ApiVersionSet"
+        ],
+        "operationId": "ApiVersionSet_Get",
+        "description": "Gets the details of the Api Version Set specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetApiVersionSet": {
+            "$ref": "./examples/ApiManagementGetApiVersionSet.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionSetIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the specified Api Version Set entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiVersionSetContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApiVersionSet"
+        ],
+        "operationId": "ApiVersionSet_CreateOrUpdate",
+        "description": "Creates or Updates a Api Version Set.",
+        "x-ms-examples": {
+          "ApiManagementCreateApiVersionSet": {
+            "$ref": "./examples/ApiManagementCreateApiVersionSet.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionSetIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiVersionSetContract"
+            },
+            "description": "Create or update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Api Version Set was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiVersionSetContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Api Version Set was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiVersionSetContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "ApiVersionSet"
+        ],
+        "operationId": "ApiVersionSet_Update",
+        "description": "Updates the details of the Api VersionSet specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateApiVersionSet": {
+            "$ref": "./examples/ApiManagementUpdateApiVersionSet.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionSetIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiVersionSetUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Api Version Set was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiVersionSetContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiVersionSets"
+        ],
+        "operationId": "ApiVersionSet_Delete",
+        "description": "Deletes specific Api Version Set.",
+        "x-ms-examples": {
+          "ApiManagementDeleteApiVersionSet": {
+            "$ref": "./examples/ApiManagementDeleteApiVersionSet.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionSetIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The ApiVersion Set details were successfully deleted."
+          },
+          "204": {
+            "description": "The ApiVersion Set details were successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimauthorizationservers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimauthorizationservers.json
new file mode 100644
index 000000000000..5e6aac66e69b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimauthorizationservers.json
@@ -0,0 +1,427 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for managing OAuth2 servers configuration in your Azure API Management deployment. OAuth 2.0 can be used to authorize developer accounts for Azure API Management. For more information refer to [How to OAuth2](https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-oauth2).",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers": {
+      "get": {
+        "tags": [
+          "AuthorizationServer"
+        ],
+        "operationId": "AuthorizationServer_ListByService",
+        "description": "Lists a collection of authorization servers defined within a service instance.",
+        "x-ms-examples": {
+          "ApiManagementListAuthorizationServers": {
+            "$ref": "./examples/ApiManagementListAuthorizationServers.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A Collection of the Authorization Server entities for the specified API Management service instance.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AuthorizationServerCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/AuthorizationServerContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}": {
+      "head": {
+        "tags": [
+          "AuthorizationServer"
+        ],
+        "operationId": "AuthorizationServer_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the authorizationServer specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadAuthorizationServer": {
+            "$ref": "./examples/ApiManagementHeadAuthorizationServer.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AuthenticationServerIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified authorization server entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "AuthorizationServer"
+        ],
+        "operationId": "AuthorizationServer_Get",
+        "description": "Gets the details of the authorization server specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetAuthorizationServer": {
+            "$ref": "./examples/ApiManagementGetAuthorizationServer.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AuthenticationServerIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the details of the specified authorization server. No secrets included.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AuthorizationServerContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "AuthorizationServer"
+        ],
+        "operationId": "AuthorizationServer_CreateOrUpdate",
+        "description": "Creates new authorization server or updates an existing authorization server.",
+        "x-ms-examples": {
+          "ApiManagementCreateAuthorizationServer": {
+            "$ref": "./examples/ApiManagementCreateAuthorizationServer.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AuthenticationServerIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AuthorizationServerContract"
+            },
+            "description": "Create or update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Authorization server was successfully registered.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AuthorizationServerContract"
+            }
+          },
+          "200": {
+            "description": "Authorization server is already registered.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AuthorizationServerContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "AuthorizationServer"
+        ],
+        "operationId": "AuthorizationServer_Update",
+        "description": "Updates the details of the authorization server specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateAuthorizationServer": {
+            "$ref": "./examples/ApiManagementUpdateAuthorizationServer.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AuthenticationServerIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AuthorizationServerUpdateContract"
+            },
+            "description": "OAuth2 Server settings Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The authorization server settings were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AuthorizationServerContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "AuthorizationServer"
+        ],
+        "operationId": "AuthorizationServer_Delete",
+        "description": "Deletes specific authorization server instance.",
+        "x-ms-examples": {
+          "ApiManagementDeleteAuthorizationServer": {
+            "$ref": "./examples/ApiManagementDeleteAuthorizationServer.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AuthenticationServerIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The authorization server settings were successfully deleted."
+          },
+          "204": {
+            "description": "The authorization server settings were successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}/listSecrets": {
+      "post": {
+        "tags": [
+          "AuthorizationServer"
+        ],
+        "operationId": "AuthorizationServer_ListSecrets",
+        "description": "Gets the client secret details of the authorization server.",
+        "x-ms-examples": {
+          "ApiManagementAuthorizationServerListSecrets": {
+            "$ref": "./examples/ApiManagementAuthorizationServerListSecrets.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AuthenticationServerIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the secrets of the specified authorization server.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AuthorizationServerSecretsContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimbackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimbackends.json
new file mode 100644
index 000000000000..0dd12d1d8f7c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimbackends.json
@@ -0,0 +1,430 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Backend entity in Azure API Management deployment. The Backend entity in API Management represents a backend service that is configured to skip certification chain validation when using a self-signed certificate to test mutual certificate authentication.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends": {
+      "get": {
+        "tags": [
+          "Backend"
+        ],
+        "operationId": "Backend_ListByService",
+        "description": "Lists a collection of backends in the specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementListBackends": {
+            "$ref": "./examples/ApiManagementListBackends.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| title | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| url | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Backend entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/BackendCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/BackendContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}": {
+      "head": {
+        "tags": [
+          "Backend"
+        ],
+        "operationId": "Backend_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the backend specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadBackend": {
+            "$ref": "./examples/ApiManagementHeadBackend.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/BackendIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified backend entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Backend"
+        ],
+        "operationId": "Backend_Get",
+        "description": "Gets the details of the backend specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetBackend": {
+            "$ref": "./examples/ApiManagementGetBackend.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/BackendIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Backend entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/BackendContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Backend"
+        ],
+        "operationId": "Backend_CreateOrUpdate",
+        "description": "Creates or Updates a backend.",
+        "x-ms-examples": {
+          "ApiManagementCreateBackendServiceFabric": {
+            "$ref": "./examples/ApiManagementCreateBackendServiceFabric.json"
+          },
+          "ApiManagementCreateBackendProxyBackend": {
+            "$ref": "./examples/ApiManagementCreateBackendProxyBackend.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/BackendIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/BackendContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Backend was successfully created.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/BackendContract"
+            }
+          },
+          "200": {
+            "description": "The existing backend was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/BackendContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Backend"
+        ],
+        "operationId": "Backend_Update",
+        "description": "Updates an existing backend.",
+        "x-ms-examples": {
+          "ApiManagementUpdateBackend": {
+            "$ref": "./examples/ApiManagementUpdateBackend.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/BackendIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/BackendUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The existing backend was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/BackendContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Backend"
+        ],
+        "operationId": "Backend_Delete",
+        "description": "Deletes the specified backend.",
+        "x-ms-examples": {
+          "ApiManagementDeleteBackend": {
+            "$ref": "./examples/ApiManagementDeleteBackend.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/BackendIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The backend was successfully deleted."
+          },
+          "204": {
+            "description": "The backend was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}/reconnect": {
+      "post": {
+        "tags": [
+          "BackendReconnect"
+        ],
+        "operationId": "Backend_Reconnect",
+        "description": "Notifies the APIM proxy to create a new connection to the backend after the specified timeout. If no timeout was specified, timeout of 2 minutes is used.",
+        "x-ms-examples": {
+          "ApiManagementBackendReconnect": {
+            "$ref": "./examples/ApiManagementBackendReconnect.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/BackendIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/BackendReconnectContract"
+            },
+            "description": "Reconnect request parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Reconnect request accepted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcaches.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcaches.json
new file mode 100644
index 000000000000..2d8d8790a57f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcaches.json
@@ -0,0 +1,372 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Cache entity in your Azure API Management deployment. Azure API Management also allows for caching responses in an external Azure Cache for Redis. For more information refer to [External Redis Cache in ApiManagement](https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-cache-external).",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches": {
+      "get": {
+        "tags": [
+          "Cache"
+        ],
+        "operationId": "Cache_ListByService",
+        "description": "Lists a collection of all external Caches in the specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementListCaches": {
+            "$ref": "./examples/ApiManagementListCaches.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns a collection of Cache entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CacheCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}": {
+      "head": {
+        "tags": [
+          "Cache"
+        ],
+        "operationId": "Cache_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the Cache specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadCache": {
+            "$ref": "./examples/ApiManagementHeadCache.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CacheIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified Cache entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Cache"
+        ],
+        "operationId": "Cache_Get",
+        "description": "Gets the details of the Cache specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetCache": {
+            "$ref": "./examples/ApiManagementGetCache.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CacheIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Cache entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CacheContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Cache"
+        ],
+        "operationId": "Cache_CreateOrUpdate",
+        "description": "Creates or updates an External Cache to be used in Api Management instance.",
+        "externalDocs": {
+          "description": "Use an external cache in Azure API Management",
+          "url": "https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-cache-external"
+        },
+        "x-ms-examples": {
+          "ApiManagementCreateCache": {
+            "$ref": "./examples/ApiManagementCreateCache.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CacheIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CacheContract"
+            },
+            "description": "Create or Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The new Cache was successfully added.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CacheContract"
+            }
+          },
+          "200": {
+            "description": "The Cache details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CacheContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Cache"
+        ],
+        "operationId": "Cache_Update",
+        "description": "Updates the details of the cache specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateCache": {
+            "$ref": "./examples/ApiManagementUpdateCache.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CacheIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CacheUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The Cache details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CacheContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Cache"
+        ],
+        "operationId": "Cache_Delete",
+        "description": "Deletes specific Cache.",
+        "x-ms-examples": {
+          "ApiManagementDeleteCache": {
+            "$ref": "./examples/ApiManagementDeleteCache.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CacheIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The Cache was successfully deleted."
+          },
+          "204": {
+            "description": "The Cache was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcertificates.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcertificates.json
new file mode 100644
index 000000000000..a04f574e7f3d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcertificates.json
@@ -0,0 +1,387 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Certificate entity in your Azure API Management deployment. Certificates can be used to setup mutual authentication with your Backend in API Management. For more information refer to [How to secure backend using Mutual Auth Certificate](https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-mutual-certificates).",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates": {
+      "get": {
+        "tags": [
+          "Certificate"
+        ],
+        "operationId": "Certificate_ListByService",
+        "description": "Lists a collection of all certificates in the specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementListCertificates": {
+            "$ref": "./examples/ApiManagementListCertificates.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| subject | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| thumbprint | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| expirationDate | filter | ge, le, eq, ne, gt, lt |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "isKeyVaultRefreshFailed",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "When set to true, the response contains only certificates entities which failed refresh."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns a collection of Certificate entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CertificateCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/CertificateContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}": {
+      "head": {
+        "tags": [
+          "Certificate"
+        ],
+        "operationId": "Certificate_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the certificate specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadCertificate": {
+            "$ref": "./examples/ApiManagementHeadCertificate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified certificate entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Certificate"
+        ],
+        "operationId": "Certificate_Get",
+        "description": "Gets the details of the certificate specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetCertificate": {
+            "$ref": "./examples/ApiManagementGetCertificate.json"
+          },
+          "ApiManagementGetCertificateWithKeyVault": {
+            "$ref": "./examples/ApiManagementGetCertificateWithKeyVault.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Certificate entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CertificateContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Certificate"
+        ],
+        "operationId": "Certificate_CreateOrUpdate",
+        "description": "Creates or updates the certificate being used for authentication with the backend.",
+        "externalDocs": {
+          "description": "How to secure back-end services using client certificate authentication in Azure API Management",
+          "url": "https://azure.microsoft.com/en-us/documentation/articles/api-management-howto-mutual-certificates/"
+        },
+        "x-ms-examples": {
+          "ApiManagementCreateCertificate": {
+            "$ref": "./examples/ApiManagementCreateCertificate.json"
+          },
+          "ApiManagementCreateCertificateWithKeyVault": {
+            "$ref": "./examples/ApiManagementCreateCertificateWithKeyVault.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CertificateCreateOrUpdateParameters"
+            },
+            "description": "Create or Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The new certificate was successfully added.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CertificateContract"
+            }
+          },
+          "200": {
+            "description": "The certificate details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CertificateContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Certificate"
+        ],
+        "operationId": "Certificate_Delete",
+        "description": "Deletes specific certificate.",
+        "x-ms-examples": {
+          "ApiManagementDeleteCertificate": {
+            "$ref": "./examples/ApiManagementDeleteCertificate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The certificate was successfully deleted."
+          },
+          "204": {
+            "description": "The certificate was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}/refreshSecret": {
+      "post": {
+        "tags": [
+          "Certificate"
+        ],
+        "operationId": "Certificate_RefreshSecret",
+        "description": "From KeyVault, Refresh the certificate being used for authentication with the backend.",
+        "externalDocs": {
+          "description": "How to secure back-end services using client certificate authentication in Azure API Management",
+          "url": "https://azure.microsoft.com/en-us/documentation/articles/api-management-howto-mutual-certificates/"
+        },
+        "x-ms-examples": {
+          "ApiManagementRefreshCertificate": {
+            "$ref": "./examples/ApiManagementRefreshCertificate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The certificate details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/CertificateContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimconnectivitycheck.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimconnectivitycheck.json
new file mode 100644
index 000000000000..cf08c2c49c05
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimconnectivitycheck.json
@@ -0,0 +1,99 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use this REST APIs to perform connectivity troubleshoot operations in API Management deployments.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/connectivityCheck": {
+      "post": {
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        },
+        "tags": [
+          "PerformConnectivityCheck"
+        ],
+        "operationId": "PerformConnectivityCheckAsync",
+        "description": "Performs a connectivity check between the API Management service and a given destination, and returns metrics for the connection, as well as errors encountered while trying to establish it.",
+        "x-ms-examples": {
+          "TCP Connectivity Check": {
+            "$ref": "./examples/ApiManagementPerformConnectivityCheck.json"
+          },
+          "HTTP Connectivity Check": {
+            "$ref": "./examples/ApiManagementPerformConnectivityCheckHttpConnect.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "connectivityCheckRequestParams",
+            "description": "Connectivity Check request parameters.",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ConnectivityCheckRequest"
+            }
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Request was accepted and is currently running. Location header contains the URL where the status of the long running operation can be checked and the result eventually retrieved."
+          },
+          "200": {
+            "description": "Connectivity Check Request was completed.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ConnectivityCheckResponse"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcontenttypes.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcontenttypes.json
new file mode 100644
index 000000000000..ba836d666001
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimcontenttypes.json
@@ -0,0 +1,513 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes": {
+      "get": {
+        "tags": [
+          "ContentType"
+        ],
+        "operationId": "ContentType_ListByService",
+        "description": "Lists the developer portal's content types. Content types describe content items' properties, validation rules, and constraints.",
+        "x-ms-examples": {
+          "ApiManagementListContentTypes": {
+            "$ref": "./examples/ApiManagementListContentTypes.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns a collection of the Content Type entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ContentTypeCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}": {
+      "get": {
+        "tags": [
+          "ContentType"
+        ],
+        "operationId": "ContentType_Get",
+        "description": "Gets the details of the developer portal's content type. Content types describe content items' properties, validation rules, and constraints.",
+        "x-ms-examples": {
+          "ApiManagementGetContentType": {
+            "$ref": "./examples/ApiManagementGetContentType.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentTypeIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the details of the specified content type.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ContentTypeContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ContentType"
+        ],
+        "operationId": "ContentType_CreateOrUpdate",
+        "description": "Creates or updates the developer portal's content type. Content types describe content items' properties, validation rules, and constraints. Custom content types' identifiers need to start with the `c-` prefix. Built-in content types can't be modified.",
+        "x-ms-examples": {
+          "ApiManagementCreateContentType": {
+            "$ref": "./examples/ApiManagementCreateContentType.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentTypeIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The content type was successfully created.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ContentTypeContract"
+            }
+          },
+          "200": {
+            "description": "The existing content type was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ContentTypeContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ContentType"
+        ],
+        "operationId": "ContentType_Delete",
+        "description": "Removes the specified developer portal's content type. Content types describe content items' properties, validation rules, and constraints. Built-in content types (with identifiers starting with the `c-` prefix) can't be removed.",
+        "x-ms-examples": {
+          "ApiManagementDeleteContentType": {
+            "$ref": "./examples/ApiManagementDeleteContentType.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentTypeIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The content type was successfully deleted."
+          },
+          "204": {
+            "description": "The content type was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}/contentItems": {
+      "get": {
+        "tags": [
+          "ContentTypeContentItem"
+        ],
+        "operationId": "ContentItem_ListByService",
+        "description": "Lists developer portal's content items specified by the provided content type.",
+        "x-ms-examples": {
+          "ApiManagementListContentTypeContentItems": {
+            "$ref": "./examples/ApiManagementListContentTypeContentItems.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentTypeIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns a collection of Content Type entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ContentItemCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}/contentItems/{contentItemId}": {
+      "head": {
+        "tags": [
+          "ContentTypeContentItem"
+        ],
+        "operationId": "ContentItem_GetEntityTag",
+        "description": "Returns the entity state (ETag) version of the developer portal's content item specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadContentTypeContentItem": {
+            "$ref": "./examples/ApiManagementHeadContentTypeContentItem.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentTypeIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentItemIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified content item entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ContentTypeContentItem"
+        ],
+        "operationId": "ContentItem_Get",
+        "description": "Returns the developer portal's content item specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetContentTypeContentItem": {
+            "$ref": "./examples/ApiManagementGetContentTypeContentItem.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentTypeIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentItemIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the content item.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ContentItemContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ContentTypeContentItem"
+        ],
+        "operationId": "ContentItem_CreateOrUpdate",
+        "description": "Creates a new developer portal's content item specified by the provided content type.",
+        "x-ms-examples": {
+          "ApiManagementCreateContentTypeContentItem": {
+            "$ref": "./examples/ApiManagementCreateContentTypeContentItem.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentTypeIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentItemIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The content item was successfully created.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ContentItemContract"
+            }
+          },
+          "200": {
+            "description": "The existing content item was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ContentItemContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ContentTypeContentItem"
+        ],
+        "operationId": "ContentItem_Delete",
+        "description": "Removes the specified developer portal's content item.",
+        "x-ms-examples": {
+          "ApiManagementDeleteContentTypeContentItem": {
+            "$ref": "./examples/ApiManagementDeleteContentTypeContentItem.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentTypeIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ContentItemIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The content item was successfully deleted."
+          },
+          "204": {
+            "description": "The content item was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeletedservices.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeletedservices.json
new file mode 100644
index 000000000000..c1bb98bfcfc6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeletedservices.json
@@ -0,0 +1,179 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/deletedservices": {
+      "get": {
+        "tags": [
+          "DeletedService"
+        ],
+        "operationId": "DeletedServices_ListBySubscription",
+        "description": "Lists all soft-deleted services available for undelete for the given subscription.",
+        "x-ms-examples": {
+          "ApiManagementDeletedServicesListBySubscription": {
+            "$ref": "./examples/ApiManagementDeletedServicesListBySubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "List of all soft-deleted services available for undelete for the given subscription.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DeletedServicesCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/locations/{location}/deletedservices/{serviceName}": {
+      "get": {
+        "tags": [
+          "DeletedService"
+        ],
+        "operationId": "DeletedServices_GetByName",
+        "description": "Get soft-deleted Api Management Service by name.",
+        "x-ms-examples": {
+          "ApiManagementGetDeletedServiceByName": {
+            "$ref": "./examples/ApiManagementGetDeletedServiceByName.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The location of the deleted API Management service."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Soft-deleted Api Management Service.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DeletedServiceContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "DeletedService"
+        ],
+        "operationId": "DeletedServices_Purge",
+        "description": "Purges Api Management Service (deletes it with no option to undelete).",
+        "x-ms-examples": {
+          "ApiManagementDeletedServicesPurge": {
+            "$ref": "./examples/ApiManagementDeletedServicesPurge.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The location of the deleted API Management service."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Api Service was successfully purged."
+          },
+          "202": {
+            "description": "Api Service purge started.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DeletedServiceContract"
+            }
+          },
+          "204": {
+            "description": "The service does not exist."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeployment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeployment.json
new file mode 100644
index 000000000000..29f18d1d2ef9
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeployment.json
@@ -0,0 +1,1826 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs to manage Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/providers/Microsoft.ApiManagement/operations": {
+      "get": {
+        "tags": [
+          "ApiManagementOperations"
+        ],
+        "description": "Lists all of the available REST API operations of the Microsoft.ApiManagement provider.",
+        "operationId": "ApiManagementOperations_List",
+        "x-ms-examples": {
+          "ApiManagementListOperations": {
+            "$ref": "./examples/ApiManagementListOperations.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success. The response describes the list of operations.",
+            "schema": {
+              "$ref": "#/definitions/OperationListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/skus": {
+      "get": {
+        "tags": [
+          "ApiManagementServiceSkus"
+        ],
+        "summary": "Gets available SKUs for API Management service",
+        "description": "Gets all available SKU for a given API Management service",
+        "operationId": "ApiManagementServiceSkus_ListAvailableServiceSkus",
+        "x-ms-examples": {
+          "ApiManagementListSKUs-Dedicated": {
+            "$ref": "./examples/ApiManagementListSKUs-Dedicated.json"
+          },
+          "ApiManagementListSKUs-Consumption": {
+            "$ref": "./examples/ApiManagementListSKUs-Consumption.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success. The response describes the list of SKUs.",
+            "schema": {
+              "$ref": "#/definitions/ResourceSkuResults"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/restore": {
+      "post": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_Restore",
+        "description": "Restores a backup of an API Management service created using the ApiManagementService_Backup operation on the current service. This is a long running operation and could take several minutes to complete.",
+        "x-ms-examples": {
+          "ApiManagementRestoreService": {
+            "$ref": "./examples/ApiManagementRestoreWithAccessKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceBackupRestoreParameters"
+            },
+            "description": "Parameters supplied to the Restore API Management service from backup operation."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully restored the backup onto the API Management service.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
+          },
+          "202": {
+            "description": "Accepted: Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backup": {
+      "post": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_Backup",
+        "description": "Creates a backup of the API Management service to the given Azure Storage Account. This is long running operation and could take several minutes to complete.",
+        "x-ms-examples": {
+          "ApiManagementBackupWithAccessKey": {
+            "$ref": "./examples/ApiManagementBackupWithAccessKey.json"
+          },
+          "ApiManagementBackupWithSystemManagedIdentity": {
+            "$ref": "./examples/ApiManagementBackupWithSystemManagedIdentity.json"
+          },
+          "ApiManagementBackupWithUserAssignedManagedIdentity": {
+            "$ref": "./examples/ApiManagementBackupWithUserAssignedManagedIdentity.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceBackupRestoreParameters"
+            },
+            "description": "Parameters supplied to the ApiManagementService_Backup operation."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully backed up the API Management service to the storage account.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
+          },
+          "202": {
+            "description": "Accepted: Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}": {
+      "put": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_CreateOrUpdate",
+        "description": "Creates or updates an API Management service. This is long running operation and could take several minutes to complete.",
+        "x-ms-examples": {
+          "ApiManagementCreateService": {
+            "$ref": "./examples/ApiManagementCreateService.json"
+          },
+          "ApiManagementCreateServiceInVnetWithPublicIP": {
+            "$ref": "./examples/ApiManagementCreateServiceInVnetWithPublicIP.json"
+          },
+          "ApiManagementCreateMultiRegionServiceWithCustomHostname": {
+            "$ref": "./examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json"
+          },
+          "ApiManagementCreateServiceHavingMsi": {
+            "$ref": "./examples/ApiManagementCreateServiceHavingMsi.json"
+          },
+          "ApiManagementCreateServiceWithSystemCertificates": {
+            "$ref": "./examples/ApiManagementCreateServiceWithSystemCertificates.json"
+          },
+          "ApiManagementCreateServiceWithUserAssignedIdentity": {
+            "$ref": "./examples/ApiManagementCreateServiceWithUserAssignedIdentity.json"
+          },
+          "ApiManagementCreateServiceInZones": {
+            "$ref": "./examples/ApiManagementCreateServiceInZones.json"
+          },
+          "ApiManagementUndelete": {
+            "$ref": "./examples/ApiManagementUndelete.json"
+          },
+          "ApiManagementCreateServiceWithCustomHostnameKeyVault": {
+            "$ref": "./examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            },
+            "description": "Parameters supplied to the CreateOrUpdate API Management service operation."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The service was successfully set up.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
+          },
+          "201": {
+            "description": "Created",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
+          },
+          "202": {
+            "description": "Accepted the configuration change when updating the service."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "patch": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_Update",
+        "description": "Updates an existing API Management service.",
+        "x-ms-examples": {
+          "ApiManagementUpdateServiceDisableTls10": {
+            "$ref": "./examples/ApiManagementUpdateServiceDisableTls10.json"
+          },
+          "ApiManagementUpdateServicePublisherDetails": {
+            "$ref": "./examples/ApiManagementUpdateServicePublisherDetails.json"
+          },
+          "ApiManagementUpdateServiceToNewVnetAndAvailabilityZones": {
+            "$ref": "./examples/ApiManagementUpdateServiceToNewVnetAndAZs.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceUpdateParameters"
+            },
+            "description": "Parameters supplied to the CreateOrUpdate API Management service operation."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The service was successfully updated.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
+          },
+          "202": {
+            "description": "The service update request was Accepted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_Get",
+        "description": "Gets an API Management service resource description.",
+        "x-ms-examples": {
+          "ApiManagementServiceGetService": {
+            "$ref": "./examples/ApiManagementServiceGetService.json"
+          },
+          "ApiManagementServiceGetServiceHavingMsi": {
+            "$ref": "./examples/ApiManagementServiceGetServiceHavingMsi.json"
+          },
+          "ApiManagementServiceGetMultiRegionInternalVnet": {
+            "$ref": "./examples/ApiManagementServiceGetMultiRegionInternalVnet.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully got the API Management Service Resource.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_Delete",
+        "description": "Deletes an existing API Management service.",
+        "x-ms-examples": {
+          "ApiManagementServiceDeleteService": {
+            "$ref": "./examples/ApiManagementServiceDeleteService.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Service was successfully deleted."
+          },
+          "202": {
+            "description": "The service delete request was Accepted.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
+          },
+          "204": {
+            "description": "The service does not exist."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service": {
+      "get": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_ListByResourceGroup",
+        "description": "List all API Management services within a resource group.",
+        "x-ms-examples": {
+          "ApiManagementListServiceBySubscriptionAndResourceGroup": {
+            "$ref": "./examples/ApiManagementListServiceBySubscriptionAndResourceGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The API Management service list.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/service": {
+      "get": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_List",
+        "description": "Lists all API Management services within an Azure subscription.",
+        "x-ms-examples": {
+          "ApiManagementListServiceBySubscription": {
+            "$ref": "./examples/ApiManagementListServiceBySubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The API Management service list.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/getssotoken": {
+      "post": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_GetSsoToken",
+        "description": "Gets the Single-Sign-On token for the API Management Service which is valid for 5 Minutes.",
+        "x-ms-examples": {
+          "ApiManagementServiceGetSsoToken": {
+            "$ref": "./examples/ApiManagementServiceGetSsoToken.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK if successful with the SSO Redirect URI.",
+            "schema": {
+              "x-ms-client-flatten": true,
+              "$ref": "#/definitions/ApiManagementServiceGetSsoTokenResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/checkNameAvailability": {
+      "post": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_CheckNameAvailability",
+        "description": "Checks availability and correctness of a name for an API Management service.",
+        "x-ms-examples": {
+          "ApiManagementServiceCheckNameAvailability": {
+            "$ref": "./examples/ApiManagementServiceCheckNameAvailability.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceCheckNameAvailabilityParameters"
+            },
+            "description": "Parameters supplied to the CheckNameAvailability operation."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The result of check name availability.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceNameAvailabilityResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/getDomainOwnershipIdentifier": {
+      "post": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_GetDomainOwnershipIdentifier",
+        "description": "Get the custom domain ownership identifier for an API Management service.",
+        "x-ms-examples": {
+          "ApiManagementServiceGetDomainOwnershipIdentifier": {
+            "$ref": "./examples/ApiManagementServiceGetDomainOwnershipIdentifier.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The result of getting domain ownership identifier.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceGetDomainOwnershipIdentifierResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/applynetworkconfigurationupdates": {
+      "post": {
+        "tags": [
+          "ApiManagementService"
+        ],
+        "operationId": "ApiManagementService_ApplyNetworkConfigurationUpdates",
+        "description": "Updates the Microsoft.ApiManagement resource running in the Virtual network to pick the updated DNS changes.",
+        "x-ms-examples": {
+          "ApiManagementApplyNetworkConfigurationUpdates": {
+            "$ref": "./examples/ApiManagementApplyNetworkConfigurationUpdates.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceApplyNetworkConfigurationParameters"
+            },
+            "description": "Parameters supplied to the Apply Network Configuration operation. If the parameters are empty, all the regions in which the Api Management service is deployed will be updated sequentially without incurring downtime in the region."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted: Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "200": {
+            "description": "Network configuration updates were successfully applied on the Api Management service.",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    }
+  },
+  "definitions": {
+    "ResourceSkuResults": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ResourceSkuResult"
+          },
+          "description": "The list of skus available for the service."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "The uri to fetch the next page of API Management service Skus."
+        }
+      },
+      "required": [
+        "value"
+      ],
+      "description": "The API Management service SKUs operation response."
+    },
+    "ResourceSkuResult": {
+      "properties": {
+        "resourceType": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The type of resource the SKU applies to."
+        },
+        "sku": {
+          "$ref": "#/definitions/ResourceSku",
+          "readOnly": true,
+          "description": "Specifies API Management SKU."
+        },
+        "capacity": {
+          "$ref": "#/definitions/ResourceSkuCapacity",
+          "readOnly": true,
+          "description": "Specifies the number of API Management units."
+        }
+      },
+      "description": "Describes an available API Management service SKU."
+    },
+    "ResourceSkuCapacity": {
+      "properties": {
+        "minimum": {
+          "type": "integer",
+          "readOnly": true,
+          "format": "int32",
+          "description": "The minimum capacity."
+        },
+        "maximum": {
+          "type": "integer",
+          "readOnly": true,
+          "format": "int32",
+          "description": "The maximum capacity that can be set."
+        },
+        "default": {
+          "type": "integer",
+          "readOnly": true,
+          "format": "int32",
+          "description": "The default capacity."
+        },
+        "scaleType": {
+          "type": "string",
+          "readOnly": true,
+          "description": "The scale type applicable to the sku.",
+          "enum": [
+            "automatic",
+            "manual",
+            "none"
+          ],
+          "x-ms-enum": {
+            "name": "ResourceSkuCapacityScaleType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "automatic",
+                "description": "Supported scale type automatic."
+              },
+              {
+                "value": "manual",
+                "description": "Supported scale type manual."
+              },
+              {
+                "value": "none",
+                "description": "Scaling not supported."
+              }
+            ]
+          }
+        }
+      },
+      "description": "Describes scaling information of a SKU."
+    },
+    "ResourceSku": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the Sku.",
+          "externalDocs": {
+            "url": "https://azure.microsoft.com/en-us/pricing/details/api-management/"
+          },
+          "enum": [
+            "Developer",
+            "Standard",
+            "Premium",
+            "Basic",
+            "Consumption",
+            "Isolated"
+          ],
+          "x-ms-enum": {
+            "name": "SkuType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Developer",
+                "description": "Developer SKU of Api Management."
+              },
+              {
+                "value": "Standard",
+                "description": "Standard SKU of Api Management."
+              },
+              {
+                "value": "Premium",
+                "description": "Premium SKU of Api Management."
+              },
+              {
+                "value": "Basic",
+                "description": "Basic SKU of Api Management."
+              },
+              {
+                "value": "Consumption",
+                "description": "Consumption SKU of Api Management."
+              },
+              {
+                "value": "Isolated",
+                "description": "Isolated SKU of Api Management."
+              }
+            ]
+          }
+        }
+      },
+      "description": "Describes an available API Management SKU."
+    },
+    "CertificateInformation": {
+      "properties": {
+        "expiry": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Expiration date of the certificate. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard."
+        },
+        "thumbprint": {
+          "type": "string",
+          "description": "Thumbprint of the certificate."
+        },
+        "subject": {
+          "type": "string",
+          "description": "Subject of the certificate."
+        }
+      },
+      "required": [
+        "expiry",
+        "thumbprint",
+        "subject"
+      ],
+      "description": "SSL certificate information."
+    },
+    "CertificateConfiguration": {
+      "properties": {
+        "encodedCertificate": {
+          "type": "string",
+          "description": "Base64 Encoded certificate."
+        },
+        "certificatePassword": {
+          "type": "string",
+          "description": "Certificate Password."
+        },
+        "storeName": {
+          "description": "The System.Security.Cryptography.x509certificates.StoreName certificate store location. Only Root and CertificateAuthority are valid locations.",
+          "type": "string",
+          "enum": [
+            "CertificateAuthority",
+            "Root"
+          ]
+        },
+        "certificate": {
+          "$ref": "#/definitions/CertificateInformation",
+          "description": "Certificate information."
+        }
+      },
+      "required": [
+        "storeName"
+      ],
+      "description": "Certificate configuration which consist of non-trusted intermediates and root certificates."
+    },
+    "HostnameConfiguration": {
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Hostname type.",
+          "enum": [
+            "Proxy",
+            "Portal",
+            "Management",
+            "Scm",
+            "DeveloperPortal"
+          ],
+          "x-ms-enum": {
+            "name": "HostnameType",
+            "modelAsString": true
+          }
+        },
+        "hostName": {
+          "type": "string",
+          "description": "Hostname to configure on the Api Management service."
+        },
+        "keyVaultId": {
+          "type": "string",
+          "description": "Url to the KeyVault Secret containing the Ssl Certificate. If absolute Url containing version is provided, auto-update of ssl certificate will not work. This requires Api Management service to be configured with aka.ms/apimmsi. The secret should be of type *application/x-pkcs12*"
+        },
+        "identityClientId": {
+          "type": "string",
+          "description": "System or User Assigned Managed identity clientId as generated by Azure AD, which has GET access to the keyVault containing the SSL certificate."
+        },
+        "encodedCertificate": {
+          "type": "string",
+          "description": "Base64 Encoded certificate."
+        },
+        "certificatePassword": {
+          "type": "string",
+          "description": "Certificate Password."
+        },
+        "defaultSslBinding": {
+          "type": "boolean",
+          "description": "Specify true to setup the certificate associated with this Hostname as the Default SSL Certificate. If a client does not send the SNI header, then this will be the certificate that will be challenged. The property is useful if a service has multiple custom hostname enabled and it needs to decide on the default ssl certificate. The setting only applied to Proxy Hostname Type.",
+          "default": false
+        },
+        "negotiateClientCertificate": {
+          "type": "boolean",
+          "description": "Specify true to always negotiate client certificate on the hostname. Default Value is false.",
+          "default": false
+        },
+        "certificate": {
+          "$ref": "#/definitions/CertificateInformation",
+          "description": "Certificate information."
+        },
+        "certificateSource": {
+          "type": "string",
+          "description": "Certificate Source.",
+          "enum": [
+            "Managed",
+            "KeyVault",
+            "Custom",
+            "BuiltIn"
+          ],
+          "x-ms-enum": {
+            "name": "CertificateSource",
+            "modelAsString": true
+          }
+        },
+        "certificateStatus": {
+          "type": "string",
+          "description": "Certificate Status.",
+          "enum": [
+            "Completed",
+            "Failed",
+            "InProgress"
+          ],
+          "x-ms-enum": {
+            "name": "CertificateStatus",
+            "modelAsString": true
+          }
+        }
+      },
+      "required": [
+        "type",
+        "hostName"
+      ],
+      "description": "Custom hostname configuration."
+    },
+    "VirtualNetworkConfiguration": {
+      "properties": {
+        "vnetid": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The virtual network ID. This is typically a GUID. Expect a null GUID by default."
+        },
+        "subnetname": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The name of the subnet."
+        },
+        "subnetResourceId": {
+          "type": "string",
+          "pattern": "^/subscriptions/[^/]*/resourceGroups/[^/]*/providers/Microsoft.(ClassicNetwork|Network)/virtualNetworks/[^/]*/subnets/[^/]*$",
+          "description": "The full resource ID of a subnet in a virtual network to deploy the API Management service in."
+        }
+      },
+      "description": "Configuration of a virtual network to which API Management service is deployed."
+    },
+    "AdditionalLocation": {
+      "properties": {
+        "location": {
+          "type": "string",
+          "description": "The location name of the additional region among Azure Data center regions."
+        },
+        "sku": {
+          "$ref": "#/definitions/ApiManagementServiceSkuProperties",
+          "description": "SKU properties of the API Management service."
+        },
+        "zones": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A list of availability zones denoting where the resource needs to come from."
+        },
+        "publicIPAddresses": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "readOnly": true,
+          "description": "Public Static Load Balanced IP addresses of the API Management service in the additional location. Available only for Basic, Standard, Premium and Isolated SKU."
+        },
+        "privateIPAddresses": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "readOnly": true,
+          "description": "Private Static Load Balanced IP addresses of the API Management service which is deployed in an Internal Virtual Network in a particular additional location. Available only for Basic, Standard, Premium and Isolated SKU."
+        },
+        "publicIpAddressId": {
+          "type": "string",
+          "description": "Public Standard SKU IP V4 based IP address to be associated with Virtual Network deployed service in the location. Supported only for Premium SKU being deployed in Virtual Network."
+        },
+        "virtualNetworkConfiguration": {
+          "$ref": "#/definitions/VirtualNetworkConfiguration",
+          "description": "Virtual network configuration for the location."
+        },
+        "gatewayRegionalUrl": {
+          "type": "string",
+          "description": "Gateway URL of the API Management service in the Region.",
+          "readOnly": true
+        },
+        "disableGateway": {
+          "type": "boolean",
+          "description": "Property only valid for an Api Management service deployed in multiple locations. This can be used to disable the gateway in this additional location.",
+          "default": false
+        },
+        "platformVersion": {
+          "type": "string",
+          "description": "Compute Platform Version running the service.",
+          "readOnly": true,
+          "enum": [
+            "undetermined",
+            "stv1",
+            "stv2",
+            "mtv1"
+          ],
+          "x-ms-enum": {
+            "name": "PlatformVersion",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "undetermined",
+                "description": "Platform version cannot be determined, as compute platform is not deployed."
+              },
+              {
+                "value": "stv1",
+                "description": "Platform running the service on Single Tenant V1 platform."
+              },
+              {
+                "value": "stv2",
+                "description": "Platform running the service on Single Tenant V2 platform."
+              },
+              {
+                "value": "mtv1",
+                "description": "Platform running the service on Multi Tenant V1 platform."
+              }
+            ]
+          }
+        }
+      },
+      "required": [
+        "location",
+        "sku"
+      ],
+      "description": "Description of an additional API Management resource location."
+    },
+    "ApiManagementServiceBackupRestoreParameters": {
+      "properties": {
+        "storageAccount": {
+          "type": "string",
+          "description": "The name of the Azure storage account (used to place/retrieve the backup)."
+        },
+        "containerName": {
+          "type": "string",
+          "description": "The name of the blob container (used to place/retrieve the backup)."
+        },
+        "backupName": {
+          "type": "string",
+          "description": "The name of the backup file to create/retrieve."
+        },
+        "accessType": {
+          "type": "string",
+          "description": "The type of access to be used for the storage account.",
+          "default": "AccessKey",
+          "enum": [
+            "AccessKey",
+            "SystemAssignedManagedIdentity",
+            "UserAssignedManagedIdentity"
+          ],
+          "x-ms-enum": {
+            "name": "AccessType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "AccessKey",
+                "description": "Use access key."
+              },
+              {
+                "value": "SystemAssignedManagedIdentity",
+                "description": "Use system assigned managed identity."
+              },
+              {
+                "value": "UserAssignedManagedIdentity",
+                "description": "Use user assigned managed identity."
+              }
+            ]
+          }
+        },
+        "accessKey": {
+          "type": "string",
+          "description": "Storage account access key. Required only if `accessType` is set to `AccessKey`."
+        },
+        "clientId": {
+          "type": "string",
+          "description": "The Client ID of user assigned managed identity. Required only if `accessType` is set to `UserAssignedManagedIdentity`."
+        }
+      },
+      "required": [
+        "storageAccount",
+        "containerName",
+        "backupName"
+      ],
+      "description": "Parameters supplied to the Backup/Restore of an API Management service operation."
+    },
+    "ApiManagementServiceProperties": {
+      "properties": {
+        "publisherEmail": {
+          "type": "string",
+          "description": "Publisher email.",
+          "maxLength": 100
+        },
+        "publisherName": {
+          "type": "string",
+          "description": "Publisher name.",
+          "maxLength": 100
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApiManagementServiceBaseProperties"
+        }
+      ],
+      "required": [
+        "publisherEmail",
+        "publisherName"
+      ],
+      "description": "Properties of an API Management service resource description."
+    },
+    "ApiManagementServiceUpdateProperties": {
+      "properties": {
+        "publisherEmail": {
+          "type": "string",
+          "description": "Publisher email.",
+          "maxLength": 100
+        },
+        "publisherName": {
+          "type": "string",
+          "description": "Publisher name.",
+          "maxLength": 100
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApiManagementServiceBaseProperties"
+        }
+      ],
+      "description": "Properties of an API Management service resource description."
+    },
+    "ApiManagementServiceBaseProperties": {
+      "properties": {
+        "notificationSenderEmail": {
+          "type": "string",
+          "description": "Email address from which the notification will be sent.",
+          "maxLength": 100
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "The current provisioning state of the API Management service which can be one of the following: Created/Activating/Succeeded/Updating/Failed/Stopped/Terminating/TerminationFailed/Deleted.",
+          "readOnly": true
+        },
+        "targetProvisioningState": {
+          "type": "string",
+          "description": "The provisioning state of the API Management service, which is targeted by the long running operation started on the service.",
+          "readOnly": true
+        },
+        "createdAtUtc": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Creation UTC date of the API Management service.The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.",
+          "readOnly": true
+        },
+        "gatewayUrl": {
+          "type": "string",
+          "description": "Gateway URL of the API Management service.",
+          "readOnly": true
+        },
+        "gatewayRegionalUrl": {
+          "type": "string",
+          "description": "Gateway URL of the API Management service in the Default Region.",
+          "readOnly": true
+        },
+        "portalUrl": {
+          "type": "string",
+          "description": "Publisher portal endpoint Url of the API Management service.",
+          "readOnly": true
+        },
+        "managementApiUrl": {
+          "type": "string",
+          "description": "Management API endpoint URL of the API Management service.",
+          "readOnly": true
+        },
+        "scmUrl": {
+          "type": "string",
+          "description": "SCM endpoint URL of the API Management service.",
+          "readOnly": true
+        },
+        "developerPortalUrl": {
+          "type": "string",
+          "description": "DEveloper Portal endpoint URL of the API Management service.",
+          "readOnly": true
+        },
+        "hostnameConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/HostnameConfiguration"
+          },
+          "description": "Custom hostname configuration of the API Management service."
+        },
+        "publicIPAddresses": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "readOnly": true,
+          "description": "Public Static Load Balanced IP addresses of the API Management service in Primary region. Available only for Basic, Standard, Premium and Isolated SKU."
+        },
+        "privateIPAddresses": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "readOnly": true,
+          "description": "Private Static Load Balanced IP addresses of the API Management service in Primary region which is deployed in an Internal Virtual Network. Available only for Basic, Standard, Premium and Isolated SKU."
+        },
+        "publicIpAddressId": {
+          "type": "string",
+          "description": "Public Standard SKU IP V4 based IP address to be associated with Virtual Network deployed service in the region. Supported only for Developer and Premium SKU being deployed in Virtual Network."
+        },
+        "publicNetworkAccess": {
+          "description": "Whether or not public endpoint access is allowed for this API Management service.  Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled'",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "PublicNetworkAccess",
+            "modelAsString": true
+          }
+        },
+        "virtualNetworkConfiguration": {
+          "$ref": "#/definitions/VirtualNetworkConfiguration",
+          "description": "Virtual network configuration of the API Management service."
+        },
+        "additionalLocations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AdditionalLocation"
+          },
+          "description": "Additional datacenter locations of the API Management service."
+        },
+        "customProperties": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Custom properties of the API Management service.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to disable just TLS 1.1 for communications with backends.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to disable TLS 1.0 for communications with backends.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on PATCH operation will reset omitted properties' values to their defaults. For all the settings except Http2 the default value is `True` if the service was created on or before April 1st 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable any of next ciphers by using settings `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA. For example, `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. The default value is `true` for them.  Note: next ciphers can't be disabled since they are required by Azure CloudService internal components: TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384"
+        },
+        "certificates": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CertificateConfiguration"
+          },
+          "description": "List of Certificates that need to be installed in the API Management service. Max supported certificates that can be installed is 10."
+        },
+        "enableClientCertificate": {
+          "type": "boolean",
+          "description": "Property only meant to be used for Consumption SKU Service. This enforces a client certificate to be presented on each request to the gateway. This also enables the ability to authenticate the certificate in the policy on the gateway.",
+          "default": false
+        },
+        "disableGateway": {
+          "type": "boolean",
+          "description": "Property only valid for an Api Management service deployed in multiple locations. This can be used to disable the gateway in master region.",
+          "default": false
+        },
+        "virtualNetworkType": {
+          "type": "string",
+          "description": "The type of VPN in which API Management service needs to be configured in. None (Default Value) means the API Management service is not part of any Virtual Network, External means the API Management deployment is set up inside a Virtual Network having an Internet Facing Endpoint, and Internal means that API Management deployment is setup inside a Virtual Network having an Intranet Facing Endpoint only.",
+          "default": "None",
+          "enum": [
+            "None",
+            "External",
+            "Internal"
+          ],
+          "x-ms-enum": {
+            "name": "VirtualNetworkType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "None",
+                "description": "The service is not part of any Virtual Network."
+              },
+              {
+                "value": "External",
+                "description": "The service is part of Virtual Network and it is accessible from Internet."
+              },
+              {
+                "value": "Internal",
+                "description": "The service is part of Virtual Network and it is only accessible from within the virtual network."
+              }
+            ]
+          }
+        },
+        "apiVersionConstraint": {
+          "$ref": "#/definitions/ApiVersionConstraint",
+          "description": "Control Plane Apis version constraint for the API Management service."
+        },
+        "restore": {
+          "type": "boolean",
+          "description": "Undelete Api Management Service if it was previously soft-deleted. If this flag is specified and set to True all other properties will be ignored.",
+          "default": false
+        },
+        "privateEndpointConnections": {
+          "type": "array",
+          "items": {
+            "$ref": "./definitions.json#/definitions/RemotePrivateEndpointConnectionWrapper"
+          },
+          "description": "List of Private Endpoint Connections of this service."
+        },
+        "platformVersion": {
+          "type": "string",
+          "description": "Compute Platform Version running the service in this location.",
+          "readOnly": true,
+          "enum": [
+            "undetermined",
+            "stv1",
+            "stv2",
+            "mtv1"
+          ],
+          "x-ms-enum": {
+            "name": "PlatformVersion",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "undetermined",
+                "description": "Platform version cannot be determined, as compute platform is not deployed."
+              },
+              {
+                "value": "stv1",
+                "description": "Platform running the service on Single Tenant V1 platform."
+              },
+              {
+                "value": "stv2",
+                "description": "Platform running the service on Single Tenant V2 platform."
+              },
+              {
+                "value": "mtv1",
+                "description": "Platform running the service on Multi Tenant V1 platform."
+              }
+            ]
+          }
+        }
+      },
+      "description": "Base Properties of an API Management service resource description."
+    },
+    "ApiVersionConstraint": {
+      "properties": {
+        "minApiVersion": {
+          "type": "string",
+          "description": "Limit control plane API calls to API Management service with version equal to or newer than this value.",
+          "example": "2019-01-01"
+        }
+      },
+      "description": "Control Plane Apis version constraint for the API Management service."
+    },
+    "ApiManagementServiceSkuProperties": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the Sku.",
+          "externalDocs": {
+            "url": "https://azure.microsoft.com/en-us/pricing/details/api-management/"
+          },
+          "enum": [
+            "Developer",
+            "Standard",
+            "Premium",
+            "Basic",
+            "Consumption",
+            "Isolated"
+          ],
+          "x-ms-enum": {
+            "name": "SkuType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Developer",
+                "description": "Developer SKU of Api Management."
+              },
+              {
+                "value": "Standard",
+                "description": "Standard SKU of Api Management."
+              },
+              {
+                "value": "Premium",
+                "description": "Premium SKU of Api Management."
+              },
+              {
+                "value": "Basic",
+                "description": "Basic SKU of Api Management."
+              },
+              {
+                "value": "Consumption",
+                "description": "Consumption SKU of Api Management."
+              },
+              {
+                "value": "Isolated",
+                "description": "Isolated SKU of Api Management."
+              }
+            ]
+          }
+        },
+        "capacity": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Capacity of the SKU (number of deployed units of the SKU). For Consumption SKU capacity must be specified as 0."
+        }
+      },
+      "required": [
+        "name",
+        "capacity"
+      ],
+      "description": "API Management service resource SKU properties."
+    },
+    "ApiManagementServiceResource": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApiManagementServiceProperties",
+          "description": "Properties of the API Management service."
+        },
+        "sku": {
+          "$ref": "#/definitions/ApiManagementServiceSkuProperties",
+          "description": "SKU properties of the API Management service."
+        },
+        "identity": {
+          "$ref": "#/definitions/ApiManagementServiceIdentity",
+          "description": "Managed service identity of the Api Management service."
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "description": "Metadata pertaining to creation and last modification of the resource.",
+          "readOnly": true
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location.",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "ETag of the resource.",
+          "readOnly": true
+        },
+        "zones": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A list of availability zones denoting where the resource needs to come from."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApimResource"
+        }
+      ],
+      "required": [
+        "location",
+        "sku",
+        "properties"
+      ],
+      "description": "A single API Management service resource in List or Get response."
+    },
+    "ApimResource": {
+      "description": "The Resource definition.",
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource ID."
+        },
+        "name": {
+          "type": "string",
+          "description": "Resource name.",
+          "readOnly": true
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource type for API Management resource is set to Microsoft.ApiManagement."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags."
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "ApiManagementServiceUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApiManagementServiceUpdateProperties",
+          "description": "Properties of the API Management service."
+        },
+        "sku": {
+          "$ref": "#/definitions/ApiManagementServiceSkuProperties",
+          "description": "SKU properties of the API Management service."
+        },
+        "identity": {
+          "$ref": "#/definitions/ApiManagementServiceIdentity",
+          "description": "Managed service identity of the Api Management service."
+        },
+        "etag": {
+          "type": "string",
+          "description": "ETag of the resource.",
+          "readOnly": true
+        },
+        "zones": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A list of availability zones denoting where the resource needs to come from."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApimResource"
+        }
+      ],
+      "description": "Parameter supplied to Update Api Management Service."
+    },
+    "ApiManagementServiceListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApiManagementServiceResource"
+          },
+          "description": "Result of the List API Management services operation."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Link to the next set of results. Not empty if Value contains incomplete list of API Management services."
+        }
+      },
+      "required": [
+        "value"
+      ],
+      "description": "The response of the List API Management services operation."
+    },
+    "ApiManagementServiceGetSsoTokenResult": {
+      "properties": {
+        "redirectUri": {
+          "type": "string",
+          "description": "Redirect URL to the Publisher Portal containing the SSO token."
+        }
+      },
+      "description": "The response of the GetSsoToken operation."
+    },
+    "ApiManagementServiceCheckNameAvailabilityParameters": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name to check for availability."
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "Parameters supplied to the CheckNameAvailability operation."
+    },
+    "ApiManagementServiceNameAvailabilityResult": {
+      "properties": {
+        "nameAvailable": {
+          "type": "boolean",
+          "description": "True if the name is available and can be used to create a new API Management service; otherwise false.",
+          "readOnly": true
+        },
+        "message": {
+          "type": "string",
+          "description": "If reason == invalid, provide the user with the reason why the given name is invalid, and provide the resource naming requirements so that the user can select a valid name. If reason == AlreadyExists, explain that <resourceName> is already in use, and direct them to select a different name.",
+          "readOnly": true
+        },
+        "reason": {
+          "type": "string",
+          "description": "Invalid indicates the name provided does not match the resource provider’s naming requirements (incorrect length, unsupported characters, etc.)  AlreadyExists indicates that the name is already in use and is therefore unavailable.",
+          "enum": [
+            "Valid",
+            "Invalid",
+            "AlreadyExists"
+          ],
+          "x-ms-enum": {
+            "name": "NameAvailabilityReason",
+            "modelAsString": false
+          }
+        }
+      },
+      "description": "Response of the CheckNameAvailability operation."
+    },
+    "ApiManagementServiceGetDomainOwnershipIdentifierResult": {
+      "properties": {
+        "domainOwnershipIdentifier": {
+          "type": "string",
+          "description": "The domain ownership identifier value.",
+          "readOnly": true
+        }
+      },
+      "description": "Response of the GetDomainOwnershipIdentifier operation."
+    },
+    "ApiManagementServiceApplyNetworkConfigurationParameters": {
+      "properties": {
+        "location": {
+          "type": "string",
+          "description": "Location of the Api Management service to update for a multi-region service. For a service deployed in a single region, this parameter is not required."
+        }
+      },
+      "description": "Parameter supplied to the Apply Network configuration operation."
+    },
+    "ApiManagementServiceIdentity": {
+      "description": "Identity properties of the Api Management service resource.",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "The type of identity used for the resource. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the service.",
+          "enum": [
+            "SystemAssigned",
+            "UserAssigned",
+            "SystemAssigned, UserAssigned",
+            "None"
+          ],
+          "x-ms-enum": {
+            "name": "ApimIdentityType",
+            "modelAsString": true
+          }
+        },
+        "principalId": {
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true,
+          "description": "The principal id of the identity."
+        },
+        "tenantId": {
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true,
+          "description": "The client tenant id of the identity."
+        },
+        "userAssignedIdentities": {
+          "description": "The list of user identities associated with the resource. The user identity \r\ndictionary key references will be ARM resource ids in the form: \r\n'/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/\r\n    providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/UserIdentityProperties"
+          }
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "UserIdentityProperties": {
+      "type": "object",
+      "properties": {
+        "principalId": {
+          "description": "The principal id of user assigned identity.",
+          "type": "string"
+        },
+        "clientId": {
+          "description": "The client id of user assigned identity.",
+          "type": "string"
+        }
+      }
+    },
+    "Operation": {
+      "description": "REST API operation",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Operation name: {provider}/{resource}/{operation}",
+          "type": "string"
+        },
+        "display": {
+          "description": "The object that describes the operation.",
+          "properties": {
+            "provider": {
+              "description": "Friendly name of the resource provider",
+              "type": "string"
+            },
+            "operation": {
+              "description": "Operation type: read, write, delete, listKeys/action, etc.",
+              "type": "string"
+            },
+            "resource": {
+              "description": "Resource type on which the operation is performed.",
+              "type": "string"
+            },
+            "description": {
+              "description": "Friendly name of the operation",
+              "type": "string"
+            }
+          }
+        },
+        "origin": {
+          "type": "string",
+          "description": "The operation origin."
+        },
+        "properties": {
+          "type": "object",
+          "x-ms-client-flatten": true,
+          "description": "The operation properties."
+        }
+      }
+    },
+    "OperationListResult": {
+      "description": "Result of the request to list REST API operations. It contains a list of operations and a URL nextLink to get the next set of results.",
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Operation"
+          },
+          "description": "List of operations supported by the resource provider."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "URL to get the next set of operation list results if there are any."
+        }
+      }
+    }
+  },
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdiagnostics.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdiagnostics.json
new file mode 100644
index 000000000000..65202508cc83
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdiagnostics.json
@@ -0,0 +1,376 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Diagnostic entity associated with your Azure API Management deployment. Diagnostics are used to log requests/responses in the APIM proxy.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics": {
+      "get": {
+        "tags": [
+          "Diagnostic"
+        ],
+        "operationId": "Diagnostic_ListByService",
+        "description": "Lists all diagnostics of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementListDiagnostics": {
+            "$ref": "./examples/ApiManagementListDiagnostics.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Paged Result response of diagnostics.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/DiagnosticContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}": {
+      "head": {
+        "tags": [
+          "Diagnostic"
+        ],
+        "operationId": "Diagnostic_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the Diagnostic specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadDiagnostic": {
+            "$ref": "./examples/ApiManagementHeadDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the entity tag of the diagnostic",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Diagnostic"
+        ],
+        "operationId": "Diagnostic_Get",
+        "description": "Gets the details of the Diagnostic specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetDiagnostic": {
+            "$ref": "./examples/ApiManagementGetDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Diagnostic entity.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Diagnostic"
+        ],
+        "operationId": "Diagnostic_CreateOrUpdate",
+        "description": "Creates a new Diagnostic or updates an existing one.",
+        "x-ms-examples": {
+          "ApiManagementCreateDiagnostic": {
+            "$ref": "./examples/ApiManagementCreateDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Diagnostic was successfully created.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            }
+          },
+          "200": {
+            "description": "Diagnostic successfully updated",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Diagnostic"
+        ],
+        "operationId": "Diagnostic_Update",
+        "description": "Updates the details of the Diagnostic specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateDiagnostic": {
+            "$ref": "./examples/ApiManagementUpdateDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "description": "Diagnostic Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Diagnostic successfully updated",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DiagnosticContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Diagnostic"
+        ],
+        "operationId": "Diagnostic_Delete",
+        "description": "Deletes the specified Diagnostic.",
+        "x-ms-examples": {
+          "ApiManagementDeleteDiagnostic": {
+            "$ref": "./examples/ApiManagementDeleteDiagnostic.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/DiagnosticIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The Diagnostic was successfully deleted."
+          },
+          "204": {
+            "description": "The Diagnostic was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimemailtemplates.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimemailtemplates.json
new file mode 100644
index 000000000000..10f0449f0bc0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimemailtemplates.json
@@ -0,0 +1,363 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Email Templates associated with your Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates": {
+      "get": {
+        "tags": [
+          "EmailTemplate"
+        ],
+        "operationId": "EmailTemplate_ListByService",
+        "description": "Gets all email templates",
+        "x-ms-examples": {
+          "ApiManagementListTemplates": {
+            "$ref": "./examples/ApiManagementListTemplates.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A Collection of the Email Template for the specified API Management service instance.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/EmailTemplateCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}": {
+      "head": {
+        "tags": [
+          "EmailTemplates"
+        ],
+        "operationId": "EmailTemplate_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the email template specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadEmailTemplate": {
+            "$ref": "./examples/ApiManagementHeadEmailTemplate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TemplateNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified email template entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "EmailTemplates"
+        ],
+        "operationId": "EmailTemplate_Get",
+        "description": "Gets the details of the email template specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetTemplate": {
+            "$ref": "./examples/ApiManagementGetTemplate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TemplateNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Email template.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/EmailTemplateContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "EmailTemplates"
+        ],
+        "operationId": "EmailTemplate_CreateOrUpdate",
+        "description": "Updates an Email Template.",
+        "x-ms-examples": {
+          "ApiManagementCreateTemplate": {
+            "$ref": "./examples/ApiManagementCreateTemplate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TemplateNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/EmailTemplateUpdateParameters"
+            },
+            "description": "Email Template update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Email Template was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/EmailTemplateContract"
+            }
+          },
+          "200": {
+            "description": "Email Template was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/EmailTemplateContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "EmailTemplates"
+        ],
+        "operationId": "EmailTemplate_Update",
+        "description": "Updates API Management email template",
+        "x-ms-examples": {
+          "ApiManagementUpdateTemplate": {
+            "$ref": "./examples/ApiManagementUpdateTemplate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TemplateNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/EmailTemplateUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "email template successfully updated",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/EmailTemplateContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "EmailTemplates"
+        ],
+        "operationId": "EmailTemplate_Delete",
+        "description": "Reset the Email Template to default template provided by the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementDeleteTemplate": {
+            "$ref": "./examples/ApiManagementDeleteTemplate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TemplateNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Email Template was successfully reset to default."
+          },
+          "204": {
+            "description": "Email Template was successfully reset to default."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimgateways.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimgateways.json
new file mode 100644
index 000000000000..c077bc0bd749
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimgateways.json
@@ -0,0 +1,1325 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Gateway entity in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways": {
+      "get": {
+        "tags": [
+          "Gateway"
+        ],
+        "operationId": "Gateway_ListByService",
+        "description": "Lists a collection of gateways registered with service instance.",
+        "x-ms-examples": {
+          "ApiManagementListGateways": {
+            "$ref": "./examples/ApiManagementListGateways.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| region | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Gateway entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/GatewayContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}": {
+      "head": {
+        "tags": [
+          "Gateway"
+        ],
+        "operationId": "Gateway_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the Gateway specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadGateway": {
+            "$ref": "./examples/ApiManagementHeadGateway.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified Gateway entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Gateway"
+        ],
+        "operationId": "Gateway_Get",
+        "description": "Gets the details of the Gateway specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetGateway": {
+            "$ref": "./examples/ApiManagementGetGateway.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Gateway entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Gateway"
+        ],
+        "operationId": "Gateway_CreateOrUpdate",
+        "description": "Creates or updates a Gateway to be used in Api Management instance.",
+        "x-ms-examples": {
+          "ApiManagementCreateGateway": {
+            "$ref": "./examples/ApiManagementCreateGateway.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayContract"
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The new Gateway was successfully added.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayContract"
+            }
+          },
+          "200": {
+            "description": "The Gateway details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Gateway"
+        ],
+        "operationId": "Gateway_Update",
+        "description": "Updates the details of the gateway specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateGateway": {
+            "$ref": "./examples/ApiManagementUpdateGateway.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayContract"
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The Gateway details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Gateway"
+        ],
+        "operationId": "Gateway_Delete",
+        "description": "Deletes specific Gateway.",
+        "x-ms-examples": {
+          "ApiManagementDeleteGateway": {
+            "$ref": "./examples/ApiManagementDeleteGateway.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The Gateway was successfully deleted."
+          },
+          "204": {
+            "description": "The Gateway was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/listKeys": {
+      "post": {
+        "tags": [
+          "GatewayListKeys"
+        ],
+        "operationId": "Gateway_ListKeys",
+        "description": "Retrieves gateway keys.",
+        "x-ms-examples": {
+          "ApiManagementGatewayListKeys": {
+            "$ref": "./examples/ApiManagementGatewayListKeys.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Gateway keys.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayKeysContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/regenerateKey": {
+      "post": {
+        "tags": [
+          "GatewayRegenerateKey"
+        ],
+        "operationId": "Gateway_RegenerateKey",
+        "description": "Regenerates specified gateway key invalidating any tokens created with it.",
+        "x-ms-examples": {
+          "ApiManagementGatewayRegenerateKey": {
+            "$ref": "./examples/ApiManagementGatewayRegenerateKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayKeyRegenerationRequestContract"
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Key successfully regenerated"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/generateToken": {
+      "post": {
+        "tags": [
+          "GatewayGenerateToken"
+        ],
+        "operationId": "Gateway_GenerateToken",
+        "description": "Gets the Shared Access Authorization Token for the gateway.",
+        "x-ms-examples": {
+          "ApiManagementGatewayGenerateToken": {
+            "$ref": "./examples/ApiManagementGatewayGenerateToken.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayTokenRequestContract"
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the authorization token for the gateway.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayTokenContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/hostnameConfigurations": {
+      "get": {
+        "tags": [
+          "GatewayHostnameConfiguration"
+        ],
+        "operationId": "GatewayHostnameConfiguration_ListByService",
+        "description": "Lists the collection of hostname configurations for the specified gateway.",
+        "x-ms-examples": {
+          "ApiManagementListGatewayHostnameConfigurations": {
+            "$ref": "./examples/ApiManagementListGatewayHostnameConfigurations.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| hostname | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Collection of hostname configuration entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayHostnameConfigurationCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/GatewayHostnameConfigurationContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/hostnameConfigurations/{hcId}": {
+      "head": {
+        "tags": [
+          "GatewayHostnameConfiguration"
+        ],
+        "operationId": "GatewayHostnameConfiguration_GetEntityTag",
+        "description": "Checks that hostname configuration entity specified by identifier exists for specified Gateway entity.",
+        "x-ms-examples": {
+          "ApiManagementHeadGatewayHostnameConfiguration": {
+            "$ref": "./examples/ApiManagementHeadGatewayHostnameConfiguration.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayHostnameConfigurationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified Gateway entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "GatewayHostnameConfiguration"
+        ],
+        "operationId": "GatewayHostnameConfiguration_Get",
+        "description": "Get details of a hostname configuration",
+        "x-ms-examples": {
+          "ApiManagementGetGatewayHostnameConfiguration": {
+            "$ref": "./examples/ApiManagementGetGatewayHostnameConfiguration.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayHostnameConfigurationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Gateway entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayHostnameConfigurationContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "GatewayHostnameConfiguration"
+        ],
+        "operationId": "GatewayHostnameConfiguration_CreateOrUpdate",
+        "description": "Creates of updates hostname configuration for a Gateway.",
+        "x-ms-examples": {
+          "ApiManagementCreateGatewayHostnameConfiguration": {
+            "$ref": "./examples/ApiManagementCreateGatewayHostnameConfiguration.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayHostnameConfigurationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayHostnameConfigurationContract"
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The new Gateway hostname configuration was successfully created.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayHostnameConfigurationContract"
+            }
+          },
+          "200": {
+            "description": "The Gateway hostname configuration details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayHostnameConfigurationContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "GatewayHostnameConfiguration"
+        ],
+        "operationId": "GatewayHostnameConfiguration_Delete",
+        "description": "Deletes the specified hostname configuration from the specified Gateway.",
+        "x-ms-examples": {
+          "ApiManagementDeleteGatewayHostnameConfiguration": {
+            "$ref": "./examples/ApiManagementDeleteGatewayHostnameConfiguration.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayHostnameConfigurationIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Hostname configuration was successfully removed from Gateway."
+          },
+          "204": {
+            "description": "Hostname configuration successfully removed by previous request or does not exist in Gateway."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/apis": {
+      "get": {
+        "tags": [
+          "GatewayApi"
+        ],
+        "operationId": "GatewayApi_ListByService",
+        "description": "Lists a collection of the APIs associated with a gateway.",
+        "x-ms-examples": {
+          "ApiManagementListGatewayApis": {
+            "$ref": "./examples/ApiManagementListGatewayApis.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains a collection of Api entities in the gateway.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ApiContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/apis/{apiId}": {
+      "head": {
+        "tags": [
+          "GatewayApi"
+        ],
+        "operationId": "GatewayApi_GetEntityTag",
+        "description": "Checks that API entity specified by identifier is associated with the Gateway entity.",
+        "x-ms-examples": {
+          "ApiManagementHeadGatewayApi": {
+            "$ref": "./examples/ApiManagementHeadGatewayApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified Gateway entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "GatewayApi"
+        ],
+        "operationId": "GatewayApi_CreateOrUpdate",
+        "description": "Adds an API to the specified Gateway.",
+        "x-ms-examples": {
+          "ApiManagementCreateGatewayApi": {
+            "$ref": "./examples/ApiManagementCreateGatewayApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AssociationContract"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The API was successfully added to the Gateway.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiContract"
+            }
+          },
+          "200": {
+            "description": "The specified API is already added to the Gateway.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "GatewayApi"
+        ],
+        "operationId": "GatewayApi_Delete",
+        "description": "Deletes the specified API from the specified Gateway.",
+        "x-ms-examples": {
+          "ApiManagementDeleteGatewayApi": {
+            "$ref": "./examples/ApiManagementDeleteGatewayApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "API was successfully removed from Gateway"
+          },
+          "204": {
+            "description": "API successfully removed by previous request or does not exist in Gateway"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/certificateAuthorities": {
+      "get": {
+        "tags": [
+          "GatewayCertificateAuthority"
+        ],
+        "operationId": "GatewayCertificateAuthority_ListByService",
+        "description": "Lists the collection of Certificate Authorities for the specified Gateway entity.",
+        "x-ms-examples": {
+          "ApiManagementListGatewaycertificateAuthorities": {
+            "$ref": "./examples/ApiManagementListGatewayCertificateAuthorities.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | eq, ne |  |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Collection of Gateway Certificate Authority entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayCertificateAuthorityCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/GatewayCertificateAuthorityContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/gateways/{gatewayId}/certificateAuthorities/{certificateId}": {
+      "head": {
+        "tags": [
+          "GatewayCertificateAuthority"
+        ],
+        "operationId": "GatewayCertificateAuthority_GetEntityTag",
+        "description": "Checks if Certificate entity is assigned to Gateway entity as Certificate Authority.",
+        "x-ms-examples": {
+          "ApiManagementHeadGatewayCertificateAuthority": {
+            "$ref": "./examples/ApiManagementHeadGatewayCertificateAuthority.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified Gateway Certificate Authority entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "GatewayCertificateAuthority"
+        ],
+        "operationId": "GatewayCertificateAuthority_Get",
+        "description": "Get assigned Gateway Certificate Authority details.",
+        "x-ms-examples": {
+          "ApiManagementGetGatewayCertificateAuthority": {
+            "$ref": "./examples/ApiManagementGetGatewayCertificateAuthority.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Gateway Certificate Authority entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayCertificateAuthorityContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "GatewayCertificateAuthority"
+        ],
+        "operationId": "GatewayCertificateAuthority_CreateOrUpdate",
+        "description": "Assign Certificate entity to Gateway entity as Certificate Authority.",
+        "x-ms-examples": {
+          "ApiManagementCreateGatewayCertificateAuthority": {
+            "$ref": "./examples/ApiManagementCreateGatewayCertificateAuthority.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayCertificateAuthorityContract"
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Certificate entity was successfully assigned to Gateway entity as Certificate Authority.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayCertificateAuthorityContract"
+            }
+          },
+          "200": {
+            "description": "Gateway Certificate Authority details were successfully updated",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GatewayCertificateAuthorityContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "GatewayCertificateAuthority"
+        ],
+        "operationId": "GatewayCertificateAuthority_Delete",
+        "description": "Remove relationship between Certificate Authority and Gateway entity.",
+        "x-ms-examples": {
+          "ApiManagementDeleteGatewayCertificateAuthority": {
+            "$ref": "./examples/ApiManagementDeleteGatewayCertificateAuthority.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GatewayIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/CertificateIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Certificate entity was successfully removed from Gateway entity as Certificate Authority."
+          },
+          "204": {
+            "description": "Certificate was successfully removed from Gateway entity as Certificate Authority by one of the previous requests or never assigned."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimgroups.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimgroups.json
new file mode 100644
index 000000000000..57cf50f02edb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimgroups.json
@@ -0,0 +1,590 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Group entity in your Azure API Management deployment. Groups are used to manage the visibility of products to developers. Each API Management service instance comes with the following immutable system groups whose membership is automatically managed by API Management.  - **Administrators** - Azure subscription administrators are members of this group. - **Developers** - Authenticated developer portal users fall into this group. - **Guests** - Unauthenticated developer portal users are placed into this group. In addition to these system groups, administrators can create custom groups or [leverage external groups in associated Azure Active Directory tenants](https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-aad#how-to-add-an-external-azure-active-directory-group). Custom and external groups can be used alongside system groups in giving developers visibility and access to API products. For example, you could create one custom group for developers affiliated with a specific partner organization and allow them access to the APIs from a product containing relevant APIs only. A user can be a member of more than one group.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups": {
+      "get": {
+        "tags": [
+          "Group"
+        ],
+        "operationId": "Group_ListByService",
+        "description": "Lists a collection of groups defined within a service instance.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-create-groups"
+        },
+        "x-ms-examples": {
+          "ApiManagementListGroups": {
+            "$ref": "./examples/ApiManagementListGroups.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| externalId | filter | eq |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Group entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/GroupContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}": {
+      "head": {
+        "tags": [
+          "Group"
+        ],
+        "operationId": "Group_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the group specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadGroup": {
+            "$ref": "./examples/ApiManagementHeadGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified group entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Group"
+        ],
+        "operationId": "Group_Get",
+        "description": "Gets the details of the group specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetGroup": {
+            "$ref": "./examples/ApiManagementGetGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Group entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Group"
+        ],
+        "operationId": "Group_CreateOrUpdate",
+        "description": "Creates or Updates a group.",
+        "x-ms-examples": {
+          "ApiManagementCreateGroup": {
+            "$ref": "./examples/ApiManagementCreateGroup.json"
+          },
+          "ApiManagementCreateGroupExternal": {
+            "$ref": "./examples/ApiManagementCreateGroupExternal.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupCreateParameters"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Group was created successfully.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Group already exists.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Group"
+        ],
+        "operationId": "Group_Update",
+        "description": "Updates the details of the group specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateGroup": {
+            "$ref": "./examples/ApiManagementUpdateGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The group details were successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Group"
+        ],
+        "operationId": "Group_Delete",
+        "description": "Deletes specific group of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementDeleteGroup": {
+            "$ref": "./examples/ApiManagementDeleteGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The group was successfully deleted."
+          },
+          "204": {
+            "description": "The group was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users": {
+      "get": {
+        "tags": [
+          "GroupUser"
+        ],
+        "operationId": "GroupUser_List",
+        "description": "Lists a collection of user entities associated with the group.",
+        "x-ms-examples": {
+          "ApiManagementListGroupUsers": {
+            "$ref": "./examples/ApiManagementListGroupUsers.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| firstName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| lastName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| email | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| registrationDate | filter | ge, le, eq, ne, gt, lt |     |</br>| note | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of user entities associated with the group.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/UserContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}": {
+      "head": {
+        "tags": [
+          "GroupUser"
+        ],
+        "operationId": "GroupUser_CheckEntityExists",
+        "description": "Checks that user entity specified by identifier is associated with the group entity.",
+        "x-ms-examples": {
+          "ApiManagementHeadGroupUser": {
+            "$ref": "./examples/ApiManagementHeadGroupUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Entity exists"
+          },
+          "404": {
+            "description": "Entity does not exists."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "GroupUser"
+        ],
+        "operationId": "GroupUser_Create",
+        "description": "Add existing user to existing group",
+        "x-ms-examples": {
+          "ApiManagementCreateGroupUser": {
+            "$ref": "./examples/ApiManagementCreateGroupUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The user was successfully added to the group.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserContract"
+            }
+          },
+          "200": {
+            "description": "The specified user is already a member of the specified group.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "GroupUser"
+        ],
+        "operationId": "GroupUser_Delete",
+        "description": "Remove existing user from existing group.",
+        "x-ms-examples": {
+          "ApiManagementDeleteGroupUser": {
+            "$ref": "./examples/ApiManagementDeleteGroupUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The user was successfully removed from the group."
+          },
+          "204": {
+            "description": "The user was successfully removed from the group."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimidentityprovider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimidentityprovider.json
new file mode 100644
index 000000000000..76d51ee0417a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimidentityprovider.json
@@ -0,0 +1,416 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Identity Provider entity associated with your Azure API Management deployment. Setting up an external Identity Provider for authentication can help you manage the developer portal logins using the OAuth2 flow.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders": {
+      "get": {
+        "tags": [
+          "IdentityProvider"
+        ],
+        "operationId": "IdentityProvider_ListByService",
+        "description": "Lists a collection of Identity Provider configured in the specified service instance.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-aad#how-to-authorize-developer-accounts-using-azure-active-directory"
+        },
+        "x-ms-examples": {
+          "ApiManagementListIdentityProviders": {
+            "$ref": "./examples/ApiManagementListIdentityProviders.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Identity Providers.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IdentityProviderList"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}": {
+      "head": {
+        "tags": [
+          "IdentityProvider"
+        ],
+        "operationId": "IdentityProvider_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the identityProvider specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadIdentityProvider": {
+            "$ref": "./examples/ApiManagementHeadIdentityProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IdentityProviderNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified identity provider entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "IdentityProvider"
+        ],
+        "operationId": "IdentityProvider_Get",
+        "description": "Gets the configuration details of the identity Provider configured in specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementGetIdentityProvider": {
+            "$ref": "./examples/ApiManagementGetIdentityProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IdentityProviderNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified IdentityProvider entity configuration details.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IdentityProviderContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "IdentityProvider"
+        ],
+        "operationId": "IdentityProvider_CreateOrUpdate",
+        "description": "Creates or Updates the IdentityProvider configuration.",
+        "x-ms-examples": {
+          "ApiManagementCreateIdentityProvider": {
+            "$ref": "./examples/ApiManagementCreateIdentityProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IdentityProviderNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IdentityProviderCreateContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "IdentityProvider configuration were successfully created.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IdentityProviderContract"
+            }
+          },
+          "200": {
+            "description": "The existing Identity Provider was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IdentityProviderContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "IdentityProvider"
+        ],
+        "operationId": "IdentityProvider_Update",
+        "description": "Updates an existing IdentityProvider configuration.",
+        "x-ms-examples": {
+          "ApiManagementUpdateIdentityProvider": {
+            "$ref": "./examples/ApiManagementUpdateIdentityProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IdentityProviderNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IdentityProviderUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The existing Identity Provider was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IdentityProviderContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "IdentityProvider"
+        ],
+        "operationId": "IdentityProvider_Delete",
+        "description": "Deletes the specified identity provider configuration.",
+        "x-ms-examples": {
+          "ApiManagementDeleteIdentityProvider": {
+            "$ref": "./examples/ApiManagementDeleteIdentityProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IdentityProviderNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The identity provider configuration was successfully deleted."
+          },
+          "204": {
+            "description": "The identity provider configuration was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}/listSecrets": {
+      "post": {
+        "tags": [
+          "IdentityProvider"
+        ],
+        "operationId": "IdentityProvider_ListSecrets",
+        "description": "Gets the client secret details of the Identity Provider.",
+        "x-ms-examples": {
+          "ApiManagementIdentityProviderListSecrets": {
+            "$ref": "./examples/ApiManagementIdentityProviderListSecrets.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IdentityProviderNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the client secret.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ClientSecretContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimissues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimissues.json
new file mode 100644
index 000000000000..f9f2d921e3f8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimissues.json
@@ -0,0 +1,150 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use this REST API to get all the issues across an Azure Api Management service.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues": {
+      "get": {
+        "tags": [
+          "Issue"
+        ],
+        "operationId": "Issue_ListByService",
+        "description": "Lists a collection of issues in the specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementListIssues": {
+            "$ref": "./examples/ApiManagementListIssues.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| title | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| authorName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Issue entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/IssueContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues/{issueId}": {
+      "get": {
+        "tags": [
+          "Issue"
+        ],
+        "operationId": "Issue_Get",
+        "description": "Gets API Management issue details",
+        "x-ms-examples": {
+          "ApiManagementGetIssue": {
+            "$ref": "./examples/ApiManagementGetIssue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IssueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Get the details of the issue.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/IssueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimloggers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimloggers.json
new file mode 100644
index 000000000000..7e86f17907ab
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimloggers.json
@@ -0,0 +1,382 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on logger entity Azure API Management deployment.The Logger entity in API Management represents an event sink that you can use to log API Management events. Currently the Logger entity supports logging API Management events to Azure EventHub.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers": {
+      "get": {
+        "tags": [
+          "Logger"
+        ],
+        "operationId": "Logger_ListByService",
+        "description": "Lists a collection of loggers in the specified service instance.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-log-event-hubs"
+        },
+        "x-ms-examples": {
+          "ApiManagementListLoggers": {
+            "$ref": "./examples/ApiManagementListLoggers.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| loggerType | filter | eq |     |</br>| resourceId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Logger entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/LoggerCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/LoggerContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}": {
+      "head": {
+        "tags": [
+          "Logger"
+        ],
+        "operationId": "Logger_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the logger specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadLogger": {
+            "$ref": "./examples/ApiManagementHeadLogger.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/LoggerIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified logger entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Logger"
+        ],
+        "operationId": "Logger_Get",
+        "description": "Gets the details of the logger specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetLogger": {
+            "$ref": "./examples/ApiManagementGetLogger.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/LoggerIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Logger entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/LoggerContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Logger"
+        ],
+        "operationId": "Logger_CreateOrUpdate",
+        "description": "Creates or Updates a logger.",
+        "x-ms-examples": {
+          "ApiManagementCreateEHLogger": {
+            "$ref": "./examples/ApiManagementCreateEHLogger.json"
+          },
+          "ApiManagementCreateAILogger": {
+            "$ref": "./examples/ApiManagementCreateAILogger.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/LoggerIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/LoggerContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Logger was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/LoggerContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "The existing logger was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/LoggerContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Logger"
+        ],
+        "operationId": "Logger_Update",
+        "description": "Updates an existing logger.",
+        "x-ms-examples": {
+          "ApiManagementUpdateLogger": {
+            "$ref": "./examples/ApiManagementUpdateLogger.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/LoggerIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/LoggerUpdateContract"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The existing logger was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/LoggerContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Logger"
+        ],
+        "operationId": "Logger_Delete",
+        "description": "Deletes the specified logger.",
+        "x-ms-examples": {
+          "ApiManagementDeleteLogger": {
+            "$ref": "./examples/ApiManagementDeleteLogger.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/LoggerIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The logger was successfully deleted."
+          },
+          "204": {
+            "description": "The logger was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnamedvalues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnamedvalues.json
new file mode 100644
index 000000000000..482ff411e0a1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnamedvalues.json
@@ -0,0 +1,515 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on NamedValue entity associated with your Azure API Management deployment. API Management policies are a powerful capability of the system that allow the publisher to change the behavior of the API through configuration. Policies are a collection of statements that are executed sequentially on the request or response of an API. Policy statements can be constructed using literal text values, policy expressions, and NamedValues. Each API Management service instance has a NamedValues collection of key/value pairs that are global to the service instance. These NamedValues can be used to manage constant string values across all API configuration and policies.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/namedValues": {
+      "get": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_ListByService",
+        "description": "Lists a collection of named values defined within a service instance.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-properties"
+        },
+        "x-ms-examples": {
+          "ApiManagementListNamedValues": {
+            "$ref": "./examples/ApiManagementListNamedValues.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| tags | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith, any, all |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "isKeyVaultRefreshFailed",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "When set to true, the response contains only named value entities which failed refresh."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A Collection of the named value entities for the specified API Management service instance.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/NamedValueContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/namedValues/{namedValueId}": {
+      "head": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the named value specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadNamedValue": {
+            "$ref": "./examples/ApiManagementHeadNamedValue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NamedValueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified named value entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_Get",
+        "description": "Gets the details of the named value specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetNamedValue": {
+            "$ref": "./examples/ApiManagementGetNamedValue.json"
+          },
+          "ApiManagementGetNamedValueWithKeyVault": {
+            "$ref": "./examples/ApiManagementGetNamedValueWithKeyVault.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NamedValueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified named value entity. No secrets included",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_CreateOrUpdate",
+        "description": "Creates or updates named value.",
+        "x-ms-examples": {
+          "ApiManagementCreateNamedValue": {
+            "$ref": "./examples/ApiManagementCreateNamedValue.json"
+          },
+          "ApiManagementCreateNamedValueWithKeyVault": {
+            "$ref": "./examples/ApiManagementCreateNamedValueWithKeyVault.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NamedValueIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueCreateContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Request to create or update named value was accepted."
+          },
+          "201": {
+            "description": "Named value was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Named value was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      },
+      "patch": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_Update",
+        "description": "Updates the specific named value.",
+        "x-ms-examples": {
+          "ApiManagementUpdateNamedValue": {
+            "$ref": "./examples/ApiManagementUpdateNamedValue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NamedValueIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Request to create or update named value was accepted."
+          },
+          "200": {
+            "description": "Named value was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      },
+      "delete": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_Delete",
+        "description": "Deletes specific named value from the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementDeleteNamedValue": {
+            "$ref": "./examples/ApiManagementDeleteNamedValue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NamedValueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Named value was successfully deleted."
+          },
+          "204": {
+            "description": "Named value was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/namedValues/{namedValueId}/listValue": {
+      "post": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_ListValue",
+        "description": "Gets the secret of the named value specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementNamedValueListValue": {
+            "$ref": "./examples/ApiManagementNamedValueListValue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NamedValueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified named value secret.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueSecretContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/namedValues/{namedValueId}/refreshSecret": {
+      "post": {
+        "tags": [
+          "NamedValue"
+        ],
+        "operationId": "NamedValue_RefreshSecret",
+        "description": "Refresh the secret of the named value specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementRefreshNamedValue": {
+            "$ref": "./examples/ApiManagementRefreshNamedValue.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NamedValueIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Request to refresh secret was accepted."
+          },
+          "200": {
+            "description": "Named value was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NamedValueContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnetworkstatus.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnetworkstatus.json
new file mode 100644
index 000000000000..f2f018e37b6a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnetworkstatus.json
@@ -0,0 +1,222 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for getting the network connectivity status of your Azure API Management deployment. When the API Management service is deployed inside a Virtual Network, it needs to have access to other Azure resources it depends on. This also gives details about the DNS Servers visible to Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/networkstatus": {
+      "get": {
+        "tags": [
+          "NetworkStatus"
+        ],
+        "operationId": "NetworkStatus_ListByService",
+        "description": "Gets the Connectivity Status to the external resources on which the Api Management service depends from inside the Cloud Service. This also returns the DNS Servers as visible to the CloudService.",
+        "x-ms-examples": {
+          "ApiManagementServiceGetNetworkStatus": {
+            "$ref": "./examples/ApiManagementServiceGetNetworkStatus.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the list Network status details for all regions in which service is deployed.",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NetworkStatusContractByLocation"
+              },
+              "description": "List of Network Status values."
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/locations/{locationName}/networkstatus": {
+      "get": {
+        "tags": [
+          "NetworkStatus"
+        ],
+        "operationId": "NetworkStatus_ListByLocation",
+        "description": "Gets the Connectivity Status to the external resources on which the Api Management service depends from inside the Cloud Service. This also returns the DNS Servers as visible to the CloudService.",
+        "x-ms-examples": {
+          "ApiManagementServiceGetNetworkStatusByLocation": {
+            "$ref": "./examples/ApiManagementServiceGetNetworkStatusByLocation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/LocationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the Network status details.",
+            "schema": {
+              "$ref": "#/definitions/NetworkStatusContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "ConnectivityStatusContract": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The hostname of the resource which the service depends on. This can be the database, storage or any other azure resource on which the service depends upon.",
+          "minLength": 1
+        },
+        "status": {
+          "type": "string",
+          "enum": [
+            "initializing",
+            "success",
+            "failure"
+          ],
+          "x-ms-enum": {
+            "name": "ConnectivityStatusType",
+            "modelAsString": true
+          },
+          "description": "Resource Connectivity Status Type identifier."
+        },
+        "error": {
+          "type": "string",
+          "description": "Error details of the connectivity to the resource."
+        },
+        "lastUpdated": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The date when the resource connectivity status was last updated. This status should be updated every 15 minutes. If this status has not been updated, then it means that the service has lost network connectivity to the resource, from inside the Virtual Network.The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "lastStatusChange": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The date when the resource connectivity status last Changed from success to failure or vice-versa. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "resourceType": {
+          "type": "string",
+          "description": "Resource Type."
+        },
+        "isOptional": {
+          "type": "boolean",
+          "description": "Whether this is optional."
+        }
+      },
+      "required": [
+        "name",
+        "status",
+        "lastUpdated",
+        "lastStatusChange",
+        "resourceType",
+        "isOptional"
+      ],
+      "description": "Details about connectivity to a resource."
+    },
+    "NetworkStatusContractByLocation": {
+      "properties": {
+        "location": {
+          "type": "string",
+          "description": "Location of service",
+          "minLength": 1
+        },
+        "networkStatus": {
+          "$ref": "#/definitions/NetworkStatusContract",
+          "description": "Network status in Location"
+        }
+      },
+      "description": "Network Status in the Location"
+    },
+    "NetworkStatusContract": {
+      "properties": {
+        "dnsServers": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets the list of DNS servers IPV4 addresses."
+        },
+        "connectivityStatus": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ConnectivityStatusContract"
+          },
+          "description": "Gets the list of Connectivity Status to the Resources on which the service depends upon."
+        }
+      },
+      "required": [
+        "dnsServers",
+        "connectivityStatus"
+      ],
+      "description": "Network Status details."
+    }
+  },
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnotifications.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnotifications.json
new file mode 100644
index 000000000000..de3b16ae279c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimnotifications.json
@@ -0,0 +1,564 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on who is going to receive notifications associated with your Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications": {
+      "get": {
+        "tags": [
+          "Notification"
+        ],
+        "operationId": "Notification_ListByService",
+        "description": "Lists a collection of properties defined within a service instance.",
+        "x-ms-examples": {
+          "ApiManagementListNotifications": {
+            "$ref": "./examples/ApiManagementListNotifications.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A Collection of the Notification for the specified API Management service instance.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NotificationCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}": {
+      "get": {
+        "tags": [
+          "Notification"
+        ],
+        "operationId": "Notification_Get",
+        "description": "Gets the details of the Notification specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetNotification": {
+            "$ref": "./examples/ApiManagementGetNotification.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Notification.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NotificationContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Notification"
+        ],
+        "operationId": "Notification_CreateOrUpdate",
+        "description": "Create or Update API Management publisher notification.",
+        "x-ms-examples": {
+          "ApiManagementCreateNotification": {
+            "$ref": "./examples/ApiManagementCreateNotification.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Notification was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/NotificationContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers": {
+      "get": {
+        "tags": [
+          "NotificationRecipientUser"
+        ],
+        "operationId": "NotificationRecipientUser_ListByNotification",
+        "description": "Gets the list of the Notification Recipient User subscribed to the notification.",
+        "x-ms-examples": {
+          "ApiManagementListNotificationRecipientUsers": {
+            "$ref": "./examples/ApiManagementListNotificationRecipientUsers.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the Recipient User collection for the notification.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/RecipientUserCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}": {
+      "head": {
+        "tags": [
+          "NotificationRecipientUser"
+        ],
+        "operationId": "NotificationRecipientUser_CheckEntityExists",
+        "description": "Determine if the Notification Recipient User is subscribed to the notification.",
+        "x-ms-examples": {
+          "ApiManagementHeadNotificationRecipientUser": {
+            "$ref": "./examples/ApiManagementHeadNotificationRecipientUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The User is subscribed to receive the notification."
+          },
+          "404": {
+            "description": "Entity does not exists."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "NotificationRecipientUser"
+        ],
+        "operationId": "NotificationRecipientUser_CreateOrUpdate",
+        "description": "Adds the API Management User to the list of Recipients for the Notification.",
+        "x-ms-examples": {
+          "ApiManagementCreateNotificationRecipientUser": {
+            "$ref": "./examples/ApiManagementCreateNotificationRecipientUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Recipient User was successfully added to the notification list.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/RecipientUserContract"
+            }
+          },
+          "200": {
+            "description": "Recipient User is already part of the notification list.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/RecipientUserContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "NotificationRecipientUser"
+        ],
+        "operationId": "NotificationRecipientUser_Delete",
+        "description": "Removes the API Management user from the list of Notification.",
+        "x-ms-examples": {
+          "ApiManagementDeleteNotificationRecipientUser": {
+            "$ref": "./examples/ApiManagementDeleteNotificationRecipientUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Recipient User was successfully removed from the notification list."
+          },
+          "204": {
+            "description": "Recipient User was successfully removed from the notification list."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails": {
+      "get": {
+        "tags": [
+          "NotificationRecipientEmail"
+        ],
+        "operationId": "NotificationRecipientEmail_ListByNotification",
+        "description": "Gets the list of the Notification Recipient Emails subscribed to a notification.",
+        "x-ms-examples": {
+          "ApiManagementListNotificationRecipientEmails": {
+            "$ref": "./examples/ApiManagementListNotificationRecipientEmails.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the Recipient Email collection subscribed to the notification.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/RecipientEmailCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}": {
+      "head": {
+        "tags": [
+          "NotificationRecipientEmail"
+        ],
+        "operationId": "NotificationRecipientEmail_CheckEntityExists",
+        "description": "Determine if Notification Recipient Email subscribed to the notification.",
+        "x-ms-examples": {
+          "ApiManagementHeadNotificationRecipientEmail": {
+            "$ref": "./examples/ApiManagementHeadNotificationRecipientEmail.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/EmailParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The Users is subscribed to receive the notification."
+          },
+          "404": {
+            "description": "The Users is not subscribed to receive the notification."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "NotificationRecipientEmail"
+        ],
+        "operationId": "NotificationRecipientEmail_CreateOrUpdate",
+        "description": "Adds the Email address to the list of Recipients for the Notification.",
+        "x-ms-examples": {
+          "ApiManagementCreateNotificationRecipientEmail": {
+            "$ref": "./examples/ApiManagementCreateNotificationRecipientEmail.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/EmailParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Recipient Email was successfully added to the notification list.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/RecipientEmailContract"
+            }
+          },
+          "200": {
+            "description": "Recipient Email is already part of the notification list.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/RecipientEmailContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "NotificationRecipientEmail"
+        ],
+        "operationId": "NotificationRecipientEmail_Delete",
+        "description": "Removes the email from the list of Notification.",
+        "x-ms-examples": {
+          "ApiManagementDeleteNotificationRecipientEmail": {
+            "$ref": "./examples/ApiManagementDeleteNotificationRecipientEmail.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotificationNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/EmailParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Recipient Email was successfully removed to the notification list."
+          },
+          "204": {
+            "description": "Recipient Email was successfully removed to the notification list."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimopenidconnectproviders.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimopenidconnectproviders.json
new file mode 100644
index 000000000000..21d2bcc48eac
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimopenidconnectproviders.json
@@ -0,0 +1,427 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on OpenId Connect Provider entity associated with your Azure API Management deployment. API Management allows you to access APIs secured with token from [OpenID Connect Provider ](http://openid.net/connect/) to be accessed from the Developer Console.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders": {
+      "get": {
+        "tags": [
+          "OpenidConnectProvider"
+        ],
+        "operationId": "OpenIdConnectProvider_ListByService",
+        "description": "Lists of all the OpenId Connect Providers.",
+        "x-ms-examples": {
+          "ApiManagementListOpenIdConnectProviders": {
+            "$ref": "./examples/ApiManagementListOpenIdConnectProviders.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists of all the OpenId Connect Providers.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OpenIdConnectProviderCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/OpenidConnectProviderContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}": {
+      "head": {
+        "tags": [
+          "OpenidConnectProvider"
+        ],
+        "operationId": "OpenIdConnectProvider_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the openIdConnectProvider specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadOpenIdConnectProvider": {
+            "$ref": "./examples/ApiManagementHeadOpenIdConnectProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OpenIdConnectIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified openidConnectProvider entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "OpenidConnectProvider"
+        ],
+        "operationId": "OpenIdConnectProvider_Get",
+        "description": "Gets specific OpenID Connect Provider without secrets.",
+        "x-ms-examples": {
+          "ApiManagementGetOpenIdConnectProvider": {
+            "$ref": "./examples/ApiManagementGetOpenIdConnectProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OpenIdConnectIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified OpenId Connect Provider entity without secrets.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OpenidConnectProviderContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "OpenidConnectProvider"
+        ],
+        "operationId": "OpenIdConnectProvider_CreateOrUpdate",
+        "description": "Creates or updates the OpenID Connect Provider.",
+        "x-ms-examples": {
+          "ApiManagementCreateOpenIdConnectProvider": {
+            "$ref": "./examples/ApiManagementCreateOpenIdConnectProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OpenIdConnectIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OpenidConnectProviderContract"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "OpenIdConnect Provider was successfully created.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OpenidConnectProviderContract"
+            }
+          },
+          "200": {
+            "description": "OpenIdConnect Provider was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OpenidConnectProviderContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "OpenidConnectProvider"
+        ],
+        "operationId": "OpenIdConnectProvider_Update",
+        "description": "Updates the specific OpenID Connect Provider.",
+        "x-ms-examples": {
+          "ApiManagementUpdateOpenIdConnectProvider": {
+            "$ref": "./examples/ApiManagementUpdateOpenIdConnectProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OpenIdConnectIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OpenidConnectProviderUpdateContract"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OpenIdConnect Provider was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OpenidConnectProviderContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "OpenidConnectProvider"
+        ],
+        "operationId": "OpenIdConnectProvider_Delete",
+        "description": "Deletes specific OpenID Connect Provider of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementDeleteOpenIdConnectProvider": {
+            "$ref": "./examples/ApiManagementDeleteOpenIdConnectProvider.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OpenIdConnectIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OpenId Connect Provider was successfully deleted."
+          },
+          "204": {
+            "description": "OpenId Connect Provider was successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}/listSecrets": {
+      "post": {
+        "tags": [
+          "OpenidConnectProvider"
+        ],
+        "operationId": "OpenIdConnectProvider_ListSecrets",
+        "description": "Gets the client secret details of the OpenID Connect Provider.",
+        "x-ms-examples": {
+          "ApiManagementOpenidConnectProviderListSecrets": {
+            "$ref": "./examples/ApiManagementOpenidConnectProviderListSecrets.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/OpenIdConnectIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified OpenId Connect Provider secrets.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ClientSecretContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimoutbounddependency.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimoutbounddependency.json
new file mode 100644
index 000000000000..9a589eb667bb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimoutbounddependency.json
@@ -0,0 +1,153 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for getting the outbound network dependency of your Azure API Management deployment. When the API Management service is deployed inside a Virtual Network, it needs to have access to other Azure resources it depends on. This also gives details about the DNS Servers visible to Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/outboundNetworkDependenciesEndpoints": {
+      "get": {
+        "tags": [
+          "OutboundNetworkDependenciesEndpoints"
+        ],
+        "operationId": "OutboundNetworkDependenciesEndpoints_ListByService",
+        "description": "Gets the network endpoints of all outbound dependencies of a ApiManagement service.",
+        "x-ms-examples": {
+          "ApiManagementServiceGetOutboundNetworkDependenciesEndpoints": {
+            "$ref": "./examples/ApiManagementServiceGetOutboundNetworkDependenciesEndpoints.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/OutboundEnvironmentEndpointList"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "OutboundEnvironmentEndpointList": {
+      "description": "Collection of Outbound Environment Endpoints",
+      "required": [
+        "value"
+      ],
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/OutboundEnvironmentEndpoint"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "OutboundEnvironmentEndpoint": {
+      "description": "Endpoints accessed for a common purpose that the Api Management Service requires outbound network access to.",
+      "type": "object",
+      "properties": {
+        "category": {
+          "description": "The type of service accessed by the Api Management Service, e.g., Azure Storage, Azure SQL Database, and Azure Active Directory.",
+          "type": "string"
+        },
+        "endpoints": {
+          "description": "The endpoints that the Api Management Service reaches the service at.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/EndpointDependency"
+          }
+        }
+      }
+    },
+    "EndpointDependency": {
+      "description": "A domain name that a service is reached at.",
+      "type": "object",
+      "properties": {
+        "domainName": {
+          "description": "The domain name of the dependency.",
+          "type": "string"
+        },
+        "endpointDetails": {
+          "description": "The Ports used when connecting to DomainName.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/EndpointDetail"
+          }
+        }
+      }
+    },
+    "EndpointDetail": {
+      "description": "Current TCP connectivity information from the Api Management Service to a single endpoint.",
+      "type": "object",
+      "properties": {
+        "port": {
+          "format": "int32",
+          "description": "The port an endpoint is connected to.",
+          "type": "integer"
+        },
+        "region": {
+          "description": "The region of the dependency.",
+          "type": "string"
+        }
+      }
+    }
+  },
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimpolicies.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimpolicies.json
new file mode 100644
index 000000000000..bc1d479e1840
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimpolicies.json
@@ -0,0 +1,304 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Global Policies in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies": {
+      "get": {
+        "tags": [
+          "Policy"
+        ],
+        "operationId": "Policy_ListByService",
+        "description": "Lists all the Global Policy definitions of the Api Management service.",
+        "x-ms-examples": {
+          "ApiManagementListPolicies": {
+            "$ref": "./examples/ApiManagementListPolicies.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns an array of Policy Contracts.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}": {
+      "head": {
+        "tags": [
+          "Policy"
+        ],
+        "operationId": "Policy_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the Global policy definition in the Api Management service.",
+        "x-ms-examples": {
+          "ApiManagementHeadPolicy": {
+            "$ref": "./examples/ApiManagementHeadPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Policy"
+        ],
+        "operationId": "Policy_Get",
+        "description": "Get the Global policy definition of the Api Management service.",
+        "x-ms-examples": {
+          "ApiManagementGetPolicy": {
+            "$ref": "./examples/ApiManagementGetPolicy.json"
+          },
+          "ApiManagementGetPolicyFormat": {
+            "$ref": "./examples/ApiManagementGetPolicyFormat.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyExportFormat"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Get the Global policy definition of the Api Management service.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Policy"
+        ],
+        "operationId": "Policy_CreateOrUpdate",
+        "description": "Creates or updates the global policy configuration of the Api Management service.",
+        "x-ms-examples": {
+          "ApiManagementCreatePolicy": {
+            "$ref": "./examples/ApiManagementCreatePolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "description": "The policy contents to apply."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Global policy configuration was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Global policy configuration of the Api Management service was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Policy"
+        ],
+        "operationId": "Policy_Delete",
+        "description": "Deletes the global policy configuration of the Api Management Service.",
+        "x-ms-examples": {
+          "ApiManagementDeletePolicy": {
+            "$ref": "./examples/ApiManagementDeletePolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Policy was successfully removed"
+          },
+          "204": {
+            "description": "Policy successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimpolicydescriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimpolicydescriptions.json
new file mode 100644
index 000000000000..b95f40c356b7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimpolicydescriptions.json
@@ -0,0 +1,100 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing retrieving a collection of policy snippets available in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policyDescriptions": {
+      "get": {
+        "tags": [
+          "PolicyDescription"
+        ],
+        "operationId": "PolicyDescription_ListByService",
+        "description": "Lists all policy descriptions.",
+        "x-ms-examples": {
+          "ApiManagementListPolicyDescriptions": {
+            "$ref": "./examples/ApiManagementListPolicyDescriptions.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "scope",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Policy scope.",
+            "enum": [
+              "Tenant",
+              "Product",
+              "Api",
+              "Operation",
+              "All"
+            ],
+            "x-ms-enum": {
+              "name": "PolicyScopeContract",
+              "modelAsString": false
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns an array of policy descriptions.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyDescriptionCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimportalrevisions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimportalrevisions.json
new file mode 100644
index 000000000000..9d2a8fa1d87e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimportalrevisions.json
@@ -0,0 +1,326 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalRevisions": {
+      "get": {
+        "tags": [
+          "PortalRevision"
+        ],
+        "operationId": "PortalRevision_ListByService",
+        "description": "Lists developer portal's revisions.",
+        "x-ms-examples": {
+          "ApiManagementListPortalRevisions": {
+            "$ref": "./examples/ApiManagementListPortalRevisions.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "| Field       | Supported operators    | Supported functions               |\n|-------------|------------------------|-----------------------------------|\n\r\n|name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|\n|description | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|\n|isCurrent | eq, ne |    |\n"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists portal's revisions.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalRevisionCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalRevisions/{portalRevisionId}": {
+      "head": {
+        "tags": [
+          "PortalRevision"
+        ],
+        "operationId": "PortalRevision_GetEntityTag",
+        "description": "Gets the developer portal revision specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadPortalRevision": {
+            "$ref": "./examples/ApiManagementHeadPortalRevision.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PortalRevisionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The specified portal revision entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "PortalRevision"
+        ],
+        "operationId": "PortalRevision_Get",
+        "description": "Gets the developer portal's revision specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetPortalRevision": {
+            "$ref": "./examples/ApiManagementGetPortalRevision.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PortalRevisionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the specified portal's revision.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "PortalRevision"
+        ],
+        "operationId": "PortalRevision_CreateOrUpdate",
+        "description": "Creates a new developer portal's revision by running the portal's publishing. The `isCurrent` property indicates if the revision is publicly accessible.",
+        "x-ms-examples": {
+          "ApiManagementCreatePortalRevision": {
+            "$ref": "./examples/ApiManagementCreatePortalRevision.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PortalRevisionIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Request to create a developer portal revision was accepted."
+          },
+          "201": {
+            "description": "The developer portal revision was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      },
+      "patch": {
+        "tags": [
+          "PortalRevision"
+        ],
+        "operationId": "PortalRevision_Update",
+        "description": "Updates the description of specified portal revision or makes it current.",
+        "x-ms-examples": {
+          "ApiManagementUpdatePortalRevision": {
+            "$ref": "./examples/ApiManagementUpdatePortalRevision.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PortalRevisionIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+            }
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Request to update developer portal revision was accepted."
+          },
+          "200": {
+            "description": "Developer portal revision was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalRevisionContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimportalsettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimportalsettings.json
new file mode 100644
index 000000000000..25a5a75f79c2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimportalsettings.json
@@ -0,0 +1,699 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on PortalSettings entity associated with your Azure API Management deployment. Using this entity you can manage settings for a Developer Portal.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings": {
+      "get": {
+        "tags": [
+          "PortalSettings"
+        ],
+        "operationId": "PortalSettings_ListByService",
+        "description": "Lists a collection of portalsettings defined within a service instance..",
+        "x-ms-examples": {
+          "ApiManagementListPortalSettings": {
+            "$ref": "./examples/ApiManagementListPortalSettings.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Portal Settings entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSettingsCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin": {
+      "head": {
+        "tags": [
+          "SignInSettings"
+        ],
+        "operationId": "SignInSettings_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the SignInSettings.",
+        "x-ms-examples": {
+          "ApiManagementHeadSignInSettings": {
+            "$ref": "./examples/ApiManagementHeadSignInSettings.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "SignInSettings"
+        ],
+        "operationId": "SignInSettings_Get",
+        "description": "Get Sign In Settings for the Portal",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsGetSignIn": {
+            "$ref": "./examples/ApiManagementPortalSettingsGetSignIn.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Sign-In settings.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSigninSettings"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "SignInSettings"
+        ],
+        "operationId": "SignInSettings_Update",
+        "description": "Update Sign-In settings.",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsUpdateSignIn": {
+            "$ref": "./examples/ApiManagementPortalSettingsUpdateSignIn.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSigninSettings"
+            },
+            "description": "Update Sign-In settings."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Sign-In settings was updated successfully."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "SignInSettings"
+        ],
+        "operationId": "SignInSettings_CreateOrUpdate",
+        "description": "Create or Update Sign-In settings.",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsUpdateSignIn": {
+            "$ref": "./examples/ApiManagementPortalSettingsPutSignIn.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSigninSettings"
+            },
+            "description": "Create or update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Sign-In settings was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSigninSettings"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup": {
+      "head": {
+        "tags": [
+          "SignUpSettings"
+        ],
+        "operationId": "SignUpSettings_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the SignUpSettings.",
+        "x-ms-examples": {
+          "ApiManagementHeadSignUpSettings": {
+            "$ref": "./examples/ApiManagementHeadSignUpSettings.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "SignUpSettings"
+        ],
+        "operationId": "SignUpSettings_Get",
+        "description": "Get Sign Up Settings for the Portal",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsGetSignUp": {
+            "$ref": "./examples/ApiManagementPortalSettingsGetSignUp.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Sign-Up settings.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSignupSettings"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "SignUpSettings"
+        ],
+        "operationId": "SignUpSettings_Update",
+        "description": "Update Sign-Up settings.",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsUpdateSignUp": {
+            "$ref": "./examples/ApiManagementPortalSettingsUpdateSignUp.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSignupSettings"
+            },
+            "description": "Update Sign-Up settings."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Sign-Up settings was updated successfully."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "SignUpSettings"
+        ],
+        "operationId": "SignUpSettings_CreateOrUpdate",
+        "description": "Create or Update Sign-Up settings.",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsUpdateSignUp": {
+            "$ref": "./examples/ApiManagementPortalSettingsPutSignUp.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSignupSettings"
+            },
+            "description": "Create or update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Sign-Up settings was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSignupSettings"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation": {
+      "head": {
+        "tags": [
+          "DelegationSettings"
+        ],
+        "operationId": "DelegationSettings_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the DelegationSettings.",
+        "x-ms-examples": {
+          "ApiManagementHeadDelegationSettings": {
+            "$ref": "./examples/ApiManagementHeadDelegationSettings.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "DelegationSettings"
+        ],
+        "operationId": "DelegationSettings_Get",
+        "description": "Get Delegation Settings for the Portal.",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsGetDelegation": {
+            "$ref": "./examples/ApiManagementPortalSettingsGetDelegation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Delegation settings.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalDelegationSettings"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "DelegationSettings"
+        ],
+        "operationId": "DelegationSettings_Update",
+        "description": "Update Delegation settings.",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsUpdateDelegation": {
+            "$ref": "./examples/ApiManagementPortalSettingsUpdateDelegation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalDelegationSettings"
+            },
+            "description": "Update Delegation settings."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Delegation settings was updated successfully."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "DelegationSettings"
+        ],
+        "operationId": "DelegationSettings_CreateOrUpdate",
+        "description": "Create or Update Delegation settings.",
+        "x-ms-examples": {
+          "ApiManagementPortalSettingsUpdateDelegation": {
+            "$ref": "./examples/ApiManagementPortalSettingsPutDelegation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalDelegationSettings"
+            },
+            "description": "Create or update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Delegation settings was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalDelegationSettings"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation/listSecrets": {
+      "post": {
+        "tags": [
+          "DelegationSettings"
+        ],
+        "operationId": "DelegationSettings_ListSecrets",
+        "description": "Gets the secret validation key of the DelegationSettings.",
+        "x-ms-examples": {
+          "ApiManagementListSecretsPortalSettings": {
+            "$ref": "./examples/ApiManagementListSecretsPortalSettingsValidationKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the validation key.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PortalSettingValidationKeyContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimprivatelink.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimprivatelink.json
new file mode 100644
index 000000000000..c3e4167612f1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimprivatelink.json
@@ -0,0 +1,335 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Private Endpoint Connection in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/privateEndpointConnections": {
+      "get": {
+        "tags": [
+          "PrivateEndpointConnections"
+        ],
+        "operationId": "PrivateEndpointConnection_ListByService",
+        "description": "Lists all private endpoint connections of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementListPrivateEndpointConnections": {
+            "$ref": "./examples/ApiManagementListPrivateEndpointConnections.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "../../../../../common-types/resource-management/v2/privatelinks.json#/definitions/PrivateEndpointConnectionListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/privateEndpointConnections/{privateEndpointConnectionName}": {
+      "get": {
+        "tags": [
+          "PrivateEndpointConnections"
+        ],
+        "operationId": "PrivateEndpointConnection_GetByName",
+        "description": "Gets the details of the Private Endpoint Connection specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetPrivateEndpointConnection": {
+            "$ref": "./examples/ApiManagementGetPrivateEndpointConnection.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "privateEndpointConnectionName",
+            "in": "path",
+            "description": "Name of the private endpoint connection.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "../../../../../common-types/resource-management/v2/privatelinks.json#/definitions/PrivateEndpointConnection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "PrivateEndpointConnections"
+        ],
+        "operationId": "PrivateEndpointConnection_CreateOrUpdate",
+        "description": "Creates a new Private Endpoint Connection or updates an existing one.",
+        "x-ms-examples": {
+          "ApiManagementApproveOrRejectPrivateEndpointConnection": {
+            "$ref": "./examples/ApiManagementApproveOrRejectPrivateEndpointConnection.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "privateEndpointConnectionName",
+            "in": "path",
+            "description": "Name of the private endpoint connection.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "privateEndpointConnectionRequest",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PrivateEndpointConnectionRequest"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Request to approve or reject private endpoint connection. Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "200": {
+            "description": "Private Endpoint Connection Request was completed.",
+            "schema": {
+              "$ref": "../../../../../common-types/resource-management/v2/privatelinks.json#/definitions/PrivateEndpointConnection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "PrivateEndpointConnections"
+        ],
+        "operationId": "PrivateEndpointConnection_Delete",
+        "description": "Deletes the specified Private Endpoint Connection.",
+        "x-ms-examples": {
+          "ApiManagementDeletePrivateEndpointConnection": {
+            "$ref": "./examples/ApiManagementDeletePrivateEndpointConnection.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "privateEndpointConnectionName",
+            "in": "path",
+            "description": "Name of the private endpoint connection.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The Private Endpoint Connection was successfully deleted."
+          },
+          "202": {
+            "description": "Request to delete API was accepted. Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "204": {
+            "description": "Private endpoint connection does not exist."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/privateLinkResources": {
+      "get": {
+        "tags": [
+          "PrivateEndpointConnections"
+        ],
+        "description": "Description for Gets the private link resources",
+        "operationId": "PrivateEndpointConnection_ListPrivateLinkResources",
+        "x-ms-examples": {
+          "ApiManagementListPrivateLinkGroupResources": {
+            "$ref": "./examples/ApiManagementListPrivateLinkGroupResources.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "../../../../../common-types/resource-management/v2/privatelinks.json#/definitions/PrivateLinkResourceListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/privateLinkResources/{privateLinkSubResourceName}": {
+      "get": {
+        "tags": [
+          "PrivateEndpointConnections"
+        ],
+        "description": "Description for Gets the private link resources",
+        "operationId": "PrivateEndpointConnection_GetPrivateLinkResource",
+        "x-ms-examples": {
+          "ApiManagementGetPrivateLinkGroupResource": {
+            "$ref": "./examples/ApiManagementGetPrivateLinkGroupResource.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "privateLinkSubResourceName",
+            "in": "path",
+            "description": "Name of the private link resource.",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "../../../../../common-types/resource-management/v2/privatelinks.json#/definitions/PrivateLinkResource"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimproducts.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimproducts.json
new file mode 100644
index 000000000000..861bccb1a3a6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimproducts.json
@@ -0,0 +1,1408 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Product entity associated with your Azure API Management deployment. The Product entity represents a product in API Management. Products include one or more APIs and their associated terms of use. Once a product is published, developers can subscribe to the product and begin to use the product’s APIs.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products": {
+      "get": {
+        "tags": [
+          "Product"
+        ],
+        "operationId": "Product_ListByService",
+        "description": "Lists a collection of products in the specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementListProducts": {
+            "$ref": "./examples/ApiManagementListProducts.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| terms | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq |     |</br>| groups | expand |     |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "expandGroups",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "When set to true, the response contains an array of groups that have visibility to the product. The default is false."
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Products which are part of a specific tag."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A Collection of the Product entities for the specified API Management service instance.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ProductCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ProductContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}": {
+      "head": {
+        "tags": [
+          "Product"
+        ],
+        "operationId": "Product_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the product specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadProduct": {
+            "$ref": "./examples/ApiManagementHeadProduct.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified Product entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Product"
+        ],
+        "operationId": "Product_Get",
+        "description": "Gets the details of the product specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetProduct": {
+            "$ref": "./examples/ApiManagementGetProduct.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Product entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ProductContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Product"
+        ],
+        "operationId": "Product_CreateOrUpdate",
+        "description": "Creates or Updates a product.",
+        "x-ms-examples": {
+          "ApiManagementCreateProduct": {
+            "$ref": "./examples/ApiManagementCreateProduct.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ProductContract"
+            },
+            "description": "Create or update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Product was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ProductContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Product was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ProductContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Product"
+        ],
+        "operationId": "Product_Update",
+        "description": "Update existing product details.",
+        "x-ms-examples": {
+          "ApiManagementUpdateProduct": {
+            "$ref": "./examples/ApiManagementUpdateProduct.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ProductUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Product was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ProductContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Product"
+        ],
+        "operationId": "Product_Delete",
+        "description": "Delete product.",
+        "x-ms-examples": {
+          "ApiManagementDeleteProduct": {
+            "$ref": "./examples/ApiManagementDeleteProduct.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "name": "deleteSubscriptions",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Delete existing subscriptions associated with the product or not."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Product was successfully removed."
+          },
+          "204": {
+            "description": "Product was successfully removed by previous request or does not exist."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis": {
+      "get": {
+        "tags": [
+          "ProductApi"
+        ],
+        "operationId": "ProductApi_ListByProduct",
+        "description": "Lists a collection of the APIs associated with a product.",
+        "x-ms-examples": {
+          "ApiManagementListProductApis": {
+            "$ref": "./examples/ApiManagementListProductApis.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| path | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains a collection of Api entities in the product.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ApiContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}": {
+      "head": {
+        "tags": [
+          "ProductApi"
+        ],
+        "operationId": "ProductApi_CheckEntityExists",
+        "description": "Checks that API entity specified by identifier is associated with the Product entity.",
+        "x-ms-examples": {
+          "ApiManagementHeadProductApi": {
+            "$ref": "./examples/ApiManagementHeadProductApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Entity exists"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ProductApi"
+        ],
+        "operationId": "ProductApi_CreateOrUpdate",
+        "description": "Adds an API to the specified product.",
+        "x-ms-examples": {
+          "ApiManagementCreateProductApi": {
+            "$ref": "./examples/ApiManagementCreateProductApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The API was successfully added to the product.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiContract"
+            }
+          },
+          "200": {
+            "description": "The specified API is already added to the product.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ApiContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ProductApi"
+        ],
+        "operationId": "ProductApi_Delete",
+        "description": "Deletes the specified API from the specified product.",
+        "x-ms-examples": {
+          "ApiManagementDeleteProductApi": {
+            "$ref": "./examples/ApiManagementDeleteProductApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiIdRevParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "API was successfully removed from product"
+          },
+          "204": {
+            "description": "API successfully removed by previous request or does not exist in product"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups": {
+      "get": {
+        "tags": [
+          "ProductGroup"
+        ],
+        "operationId": "ProductGroup_ListByProduct",
+        "description": "Lists the collection of developer groups associated with the specified product.",
+        "x-ms-examples": {
+          "ApiManagementListProductGroups": {
+            "$ref": "./examples/ApiManagementListProductGroups.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt |     |</br>| displayName | filter | eq, ne |     |</br>| description | filter | eq, ne |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Group entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/GroupContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}": {
+      "head": {
+        "tags": [
+          "ProductGroup"
+        ],
+        "operationId": "ProductGroup_CheckEntityExists",
+        "description": "Checks that Group entity specified by identifier is associated with the Product entity.",
+        "x-ms-examples": {
+          "ApiManagementHeadProductGroup": {
+            "$ref": "./examples/ApiManagementHeadProductGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The Group is associated with the Product."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ProductGroup"
+        ],
+        "operationId": "ProductGroup_CreateOrUpdate",
+        "description": "Adds the association between the specified developer group with the specified product.",
+        "x-ms-examples": {
+          "ApiManagementCreateProductGroup": {
+            "$ref": "./examples/ApiManagementCreateProductGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The group was successfully associated with the product.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupContract"
+            }
+          },
+          "200": {
+            "description": "The specified group is already associated with the product.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ProductGroup"
+        ],
+        "operationId": "ProductGroup_Delete",
+        "description": "Deletes the association between the specified group and product.",
+        "x-ms-examples": {
+          "ApiManagementDeleteProductGroup": {
+            "$ref": "./examples/ApiManagementDeleteProductGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/GroupIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The group was successfully disassociated with the product."
+          },
+          "204": {
+            "description": "The group was successfully disassociated with the product."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/subscriptions": {
+      "get": {
+        "tags": [
+          "ProductSubscription"
+        ],
+        "operationId": "ProductSubscriptions_List",
+        "description": "Lists the collection of subscriptions to the specified product.",
+        "x-ms-examples": {
+          "ApiManagementListProductSubscriptions": {
+            "$ref": "./examples/ApiManagementListProductSubscriptions.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| stateComment | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| ownerId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| scope | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| productId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq |     |</br>| user | expand |     |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of subscription entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/SubscriptionContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies": {
+      "get": {
+        "tags": [
+          "ProductPolicy"
+        ],
+        "operationId": "ProductPolicy_ListByProduct",
+        "description": "Get the policy configuration at the Product level.",
+        "x-ms-examples": {
+          "ApiManagementListProductPolicies": {
+            "$ref": "./examples/ApiManagementListProductPolicies.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Product Policy information.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}": {
+      "head": {
+        "tags": [
+          "ProductPolicy"
+        ],
+        "operationId": "ProductPolicy_GetEntityTag",
+        "description": "Get the ETag of the policy configuration at the Product level.",
+        "x-ms-examples": {
+          "ApiManagementHeadProductPolicy": {
+            "$ref": "./examples/ApiManagementHeadProductPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Product Policy Etag information.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ProductPolicy"
+        ],
+        "operationId": "ProductPolicy_Get",
+        "description": "Get the policy configuration at the Product level.",
+        "x-ms-examples": {
+          "ApiManagementGetProductPolicy": {
+            "$ref": "./examples/ApiManagementGetProductPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyExportFormat"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Product Policy information.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ProductPolicy"
+        ],
+        "operationId": "ProductPolicy_CreateOrUpdate",
+        "description": "Creates or updates policy configuration for the Product.",
+        "x-ms-examples": {
+          "ApiManagementCreateProductPolicy": {
+            "$ref": "./examples/ApiManagementCreateProductPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "description": "The policy contents to apply."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Product policy configuration was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "Product policy configuration of the tenant was successfully updated.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/PolicyContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ProductPolicy"
+        ],
+        "operationId": "ProductPolicy_Delete",
+        "description": "Deletes the policy configuration at the Product.",
+        "x-ms-examples": {
+          "ApiManagementDeleteProductPolicy": {
+            "$ref": "./examples/ApiManagementDeleteProductPolicy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully deleted the policy configuration at the Product level."
+          },
+          "204": {
+            "description": "Successfully deleted the policy configuration at the Product level."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags": {
+      "get": {
+        "tags": [
+          "ProductTag"
+        ],
+        "operationId": "Tag_ListByProduct",
+        "description": "Lists all Tags associated with the Product.",
+        "x-ms-examples": {
+          "ApiManagementListProductTags": {
+            "$ref": "./examples/ApiManagementListProductTags.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation returns a collection of tags associated with the Product entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}": {
+      "head": {
+        "tags": [
+          "ProductTag"
+        ],
+        "operationId": "Tag_GetEntityStateByProduct",
+        "description": "Gets the entity state version of the tag specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadProductTag": {
+            "$ref": "./examples/ApiManagementHeadProductTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Empty response body, ETag header entity state version.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ProductTag"
+        ],
+        "operationId": "Tag_GetByProduct",
+        "description": "Get tag associated with the Product.",
+        "x-ms-examples": {
+          "ApiManagementGetProductTag": {
+            "$ref": "./examples/ApiManagementGetProductTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the details of the tag specified by its identifier.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ProductTag"
+        ],
+        "operationId": "Tag_AssignToProduct",
+        "description": "Assign tag to the Product.",
+        "x-ms-examples": {
+          "ApiManagementCreateProductTag": {
+            "$ref": "./examples/ApiManagementCreateProductTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Tag was assigned to the Product.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            }
+          },
+          "200": {
+            "description": "Tag is already assigned to the Product.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ProductTag"
+        ],
+        "operationId": "Tag_DetachFromProduct",
+        "description": "Detach the tag from the Product.",
+        "x-ms-examples": {
+          "ApiManagementDeleteProductTag": {
+            "$ref": "./examples/ApiManagementDeleteProductTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ProductIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully detached the tag from the Product."
+          },
+          "204": {
+            "description": "Successfully detached the tag from the Product."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimproductsByTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimproductsByTags.json
new file mode 100644
index 000000000000..3d58f9863385
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimproductsByTags.json
@@ -0,0 +1,106 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations to retrieve Products by Tags in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/productsByTags": {
+      "get": {
+        "tags": [
+          "ProductsByTag"
+        ],
+        "operationId": "Product_ListByTags",
+        "description": "Lists a collection of products associated with tags.",
+        "x-ms-examples": {
+          "ApiManagementListProductsByTags": {
+            "$ref": "./examples/ApiManagementListProductsByTags.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| terms | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "includeNotTaggedProducts",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Include not tagged Products."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of TagResource entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagResourceCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagResourceContract"
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimquotas.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimquotas.json
new file mode 100644
index 000000000000..f5f3663e8227
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimquotas.json
@@ -0,0 +1,248 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Quota entity associated with your Azure API Management deployment. To configure call rate limit and quota policies refer to [how to configure call rate limit and quota](https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-product-with-rules#a-namepolicies-ato-configure-call-rate-limit-and-quota-policies).",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}": {
+      "get": {
+        "tags": [
+          "QuotaByCounterKeys"
+        ],
+        "operationId": "QuotaByCounterKeys_ListByService",
+        "description": "Lists a collection of current quota counter periods associated with the counter-key configured in the policy on the specified service instance. The api does not support paging yet.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-product-with-rules#a-namepolicies-ato-configure-call-rate-limit-and-quota-policies",
+          "description": "Document describing how to configure the quota policies."
+        },
+        "x-ms-examples": {
+          "ApiManagementGetQuotaCounterKeys": {
+            "$ref": "./examples/ApiManagementGetQuotaCounterKeys.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/QuotaCounterKeyParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of the quota counter values.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/QuotaCounterCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "QuotaByCounterKeys"
+        ],
+        "operationId": "QuotaByCounterKeys_Update",
+        "description": "Updates all the quota counter values specified with the existing quota counter key to a value in the specified service instance. This should be used for reset of the quota counter values.",
+        "x-ms-examples": {
+          "ApiManagementUpdateQuotaCounterKey": {
+            "$ref": "./examples/ApiManagementUpdateQuotaCounterKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/QuotaCounterKeyParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/QuotaCounterValueUpdateContract"
+            },
+            "description": "The value of the quota counter to be applied to all quota counter periods."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Updated Quota Counter Values.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/QuotaCounterCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}": {
+      "get": {
+        "tags": [
+          "QuotaByPeriodKeys"
+        ],
+        "operationId": "QuotaByPeriodKeys_Get",
+        "description": "Gets the value of the quota counter associated with the counter-key in the policy for the specific period in service instance.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/azure/api-management/api-management-howto-product-with-rules#a-namepolicies-ato-configure-call-rate-limit-and-quota-policies",
+          "description": "Document describing how to configure the quota policies."
+        },
+        "x-ms-examples": {
+          "ApiManagementGetQuotaCounterKeysByQuotaPeriod": {
+            "$ref": "./examples/ApiManagementGetQuotaCounterKeysByQuotaPeriod.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/QuotaCounterKeyParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/QuotaPeriodKeyParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the Quota counter details for the specified period.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/QuotaCounterContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "QuotaByPeriodKeys"
+        ],
+        "operationId": "QuotaByPeriodKeys_Update",
+        "description": "Updates an existing quota counter value in the specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementUpdateQuotaCounterKeyByQuotaPeriod": {
+            "$ref": "./examples/ApiManagementUpdateQuotaCounterKeyByQuotaPeriod.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/QuotaCounterKeyParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/QuotaPeriodKeyParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/QuotaCounterValueUpdateContract"
+            },
+            "description": "The value of the Quota counter to be applied on the specified period."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the Quota counter details for the specified period.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/QuotaCounterContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimregions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimregions.json
new file mode 100644
index 000000000000..5e24acf2bf20
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimregions.json
@@ -0,0 +1,85 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations in Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/regions": {
+      "get": {
+        "tags": [
+          "Region"
+        ],
+        "operationId": "Region_ListByService",
+        "description": "Lists all azure regions in which the service exists.",
+        "x-ms-examples": {
+          "ApiManagementListRegions": {
+            "$ref": "./examples/ApiManagementListRegions.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists of Regions in which the service is deployed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/RegionListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimreports.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimreports.json
new file mode 100644
index 000000000000..cc2b1ebba4d0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimreports.json
@@ -0,0 +1,562 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs to get the analytics reports associated with your Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byApi": {
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "Reports_ListByApi",
+        "description": "Lists report records by API.",
+        "x-ms-examples": {
+          "ApiManagementGetReportsByApi": {
+            "$ref": "./examples/ApiManagementGetReportsByApi.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "The filter to apply on the operation."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "$orderby",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "OData order by query option."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Report record.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ReportCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ReportRecordContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byUser": {
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "Reports_ListByUser",
+        "description": "Lists report records by User.",
+        "x-ms-examples": {
+          "ApiManagementGetReportsByUser": {
+            "$ref": "./examples/ApiManagementGetReportsByUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "|   Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| timestamp | filter | ge, le |     | </br>| displayName | select, orderBy |     |     | </br>| userId | select, filter | eq |     | </br>| apiRegion | filter | eq |     | </br>| productId | filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>| apiId | filter | eq |     | </br>| operationId | filter | eq |     | </br>| callCountSuccess | select, orderBy |     |     | </br>| callCountBlocked | select, orderBy |     |     | </br>| callCountFailed | select, orderBy |     |     | </br>| callCountOther | select, orderBy |     |     | </br>| callCountTotal | select, orderBy |     |     | </br>| bandwidth | select, orderBy |     |     | </br>| cacheHitsCount | select |     |     | </br>| cacheMissCount | select |     |     | </br>| apiTimeAvg | select, orderBy |     |     | </br>| apiTimeMin | select |     |     | </br>| apiTimeMax | select |     |     | </br>| serviceTimeAvg | select |     |     | </br>| serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "$orderby",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "OData order by query option."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Report record.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ReportCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ReportRecordContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byOperation": {
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "Reports_ListByOperation",
+        "description": "Lists report records by API Operations.",
+        "x-ms-examples": {
+          "ApiManagementGetReportsByOperation": {
+            "$ref": "./examples/ApiManagementGetReportsByOperation.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "|   Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| timestamp | filter | ge, le |     | </br>| displayName | select, orderBy |     |     | </br>| apiRegion | filter | eq |     | </br>| userId | filter | eq |     | </br>| productId | filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>| apiId | filter | eq |     | </br>| operationId | select, filter | eq |     | </br>| callCountSuccess | select, orderBy |     |     | </br>| callCountBlocked | select, orderBy |     |     | </br>| callCountFailed | select, orderBy |     |     | </br>| callCountOther | select, orderBy |     |     | </br>| callCountTotal | select, orderBy |     |     | </br>| bandwidth | select, orderBy |     |     | </br>| cacheHitsCount | select |     |     | </br>| cacheMissCount | select |     |     | </br>| apiTimeAvg | select, orderBy |     |     | </br>| apiTimeMin | select |     |     | </br>| apiTimeMax | select |     |     | </br>| serviceTimeAvg | select |     |     | </br>| serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "$orderby",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "OData order by query option."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Report record.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ReportCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ReportRecordContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byProduct": {
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "Reports_ListByProduct",
+        "description": "Lists report records by Product.",
+        "x-ms-examples": {
+          "ApiManagementGetReportsByProduct": {
+            "$ref": "./examples/ApiManagementGetReportsByProduct.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "|   Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| timestamp | filter | ge, le |     | </br>| displayName | select, orderBy |     |     | </br>| apiRegion | filter | eq |     | </br>| userId | filter | eq |     | </br>| productId | select, filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>| callCountSuccess | select, orderBy |     |     | </br>| callCountBlocked | select, orderBy |     |     | </br>| callCountFailed | select, orderBy |     |     | </br>| callCountOther | select, orderBy |     |     | </br>| callCountTotal | select, orderBy |     |     | </br>| bandwidth | select, orderBy |     |     | </br>| cacheHitsCount | select |     |     | </br>| cacheMissCount | select |     |     | </br>| apiTimeAvg | select, orderBy |     |     | </br>| apiTimeMin | select |     |     | </br>| apiTimeMax | select |     |     | </br>| serviceTimeAvg | select |     |     | </br>| serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "$orderby",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "OData order by query option."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Report record.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ReportCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ReportRecordContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byGeo": {
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "Reports_ListByGeo",
+        "description": "Lists report records by geography.",
+        "x-ms-examples": {
+          "ApiManagementGetReportsByGeo": {
+            "$ref": "./examples/ApiManagementGetReportsByGeo.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "|   Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| timestamp | filter | ge, le |     | </br>| country | select |     |     | </br>| region | select |     |     | </br>| zip | select |     |     | </br>| apiRegion | filter | eq |     | </br>| userId | filter | eq |     | </br>| productId | filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>| apiId | filter | eq |     | </br>| operationId | filter | eq |     | </br>| callCountSuccess | select |     |     | </br>| callCountBlocked | select |     |     | </br>| callCountFailed | select |     |     | </br>| callCountOther | select |     |     | </br>| bandwidth | select, orderBy |     |     | </br>| cacheHitsCount | select |     |     | </br>| cacheMissCount | select |     |     | </br>| apiTimeAvg | select |     |     | </br>| apiTimeMin | select |     |     | </br>| apiTimeMax | select |     |     | </br>| serviceTimeAvg | select |     |     | </br>| serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Report record.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ReportCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ReportRecordContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/bySubscription": {
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "Reports_ListBySubscription",
+        "description": "Lists report records by subscription.",
+        "x-ms-examples": {
+          "ApiManagementGetReportsBySubscription": {
+            "$ref": "./examples/ApiManagementGetReportsBySubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "|   Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| timestamp | filter | ge, le |     | </br>| displayName | select, orderBy |     |     | </br>| apiRegion | filter | eq |     | </br>| userId | select, filter | eq |     | </br>| productId | select, filter | eq |     | </br>| subscriptionId | select, filter | eq |     | </br>| callCountSuccess | select, orderBy |     |     | </br>| callCountBlocked | select, orderBy |     |     | </br>| callCountFailed | select, orderBy |     |     | </br>| callCountOther | select, orderBy |     |     | </br>| callCountTotal | select, orderBy |     |     | </br>| bandwidth | select, orderBy |     |     | </br>| cacheHitsCount | select |     |     | </br>| cacheMissCount | select |     |     | </br>| apiTimeAvg | select, orderBy |     |     | </br>| apiTimeMin | select |     |     | </br>| apiTimeMax | select |     |     | </br>| serviceTimeAvg | select |     |     | </br>| serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "$orderby",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "OData order by query option."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Report record.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ReportCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ReportRecordContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byTime": {
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "Reports_ListByTime",
+        "description": "Lists report records by Time.",
+        "x-ms-examples": {
+          "ApiManagementGetReportsByTime": {
+            "$ref": "./examples/ApiManagementGetReportsByTime.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "|   Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| timestamp | filter, select | ge, le |     | </br>| interval | select |     |     | </br>| apiRegion | filter | eq |     | </br>| userId | filter | eq |     | </br>| productId | filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>| apiId | filter | eq |     | </br>| operationId | filter | eq |     | </br>| callCountSuccess | select |     |     | </br>| callCountBlocked | select |     |     | </br>| callCountFailed | select |     |     | </br>| callCountOther | select |     |     | </br>| bandwidth | select, orderBy |     |     | </br>| cacheHitsCount | select |     |     | </br>| cacheMissCount | select |     |     | </br>| apiTimeAvg | select |     |     | </br>| apiTimeMin | select |     |     | </br>| apiTimeMax | select |     |     | </br>| serviceTimeAvg | select |     |     | </br>| serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "$orderby",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "OData order by query option."
+          },
+          {
+            "name": "interval",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "format": "duration",
+            "description": "By time interval. Interval must be multiple of 15 minutes and may not be zero. The value should be in ISO  8601 format (http://en.wikipedia.org/wiki/ISO_8601#Durations).This code can be used to convert TimeSpan to a valid interval string: XmlConvert.ToString(new TimeSpan(hours, minutes, seconds))."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Report record.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/ReportCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/ReportRecordContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byRequest": {
+      "get": {
+        "tags": [
+          "Reports"
+        ],
+        "operationId": "Reports_ListByRequest",
+        "description": "Lists report records by Request.",
+        "x-ms-examples": {
+          "ApiManagementGetReportsByRequest": {
+            "$ref": "./examples/ApiManagementGetReportsByRequest.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "|   Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| timestamp | filter | ge, le |     | </br>| apiId | filter | eq |     | </br>| operationId | filter | eq |     | </br>| productId | filter | eq |     | </br>| userId | filter | eq |     | </br>| apiRegion | filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Report record.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/RequestReportCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
+        "x-ms-odata": "./definitions.json#/definitions/RequestReportRecordContract"
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimsettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimsettings.json
new file mode 100644
index 000000000000..dc4a30b96003
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimsettings.json
@@ -0,0 +1,144 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on settings entity associated with your Azure API Management deployment. Using this entity you can manage properties and configuration that apply to the entire API Management service instance.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/settings": {
+      "get": {
+        "tags": [
+          "TenantSettings"
+        ],
+        "operationId": "TenantSettings_ListByService",
+        "description": "Public settings.",
+        "x-ms-examples": {
+          "ApiManagementListTenantSettings": {
+            "$ref": "./examples/ApiManagementListTenantSettings.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Not used"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of TenantSettings entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TenantSettingsCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TenantSettingsContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/settings/{settingsType}": {
+      "get": {
+        "tags": [
+          "TenantSettings"
+        ],
+        "operationId": "TenantSettings_Get",
+        "description": "Get tenant settings.",
+        "x-ms-examples": {
+          "ApiManagementGetTenantSettings": {
+            "$ref": "./examples/ApiManagementGetTenantSettings.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SettingsParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tenant Settings.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TenantSettingsContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimskus.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimskus.json
new file mode 100644
index 000000000000..79b5fdf46b0a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimskus.json
@@ -0,0 +1,371 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "SKUs available for Microsoft.ApiManagement",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/skus": {
+      "get": {
+        "tags": [
+          "Skus"
+        ],
+        "operationId": "ApiManagementSkus_List",
+        "description": "Gets the list of Microsoft.ApiManagement SKUs available for your Subscription.",
+        "x-ms-examples": {
+          "Lists all available Resource SKUs": {
+            "$ref": "./examples/ApiManagementListSku.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementSkusResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    }
+  },
+  "definitions": {
+    "ApiManagementSkuCapacity": {
+      "properties": {
+        "minimum": {
+          "type": "integer",
+          "readOnly": true,
+          "format": "int32",
+          "description": "The minimum capacity."
+        },
+        "maximum": {
+          "type": "integer",
+          "readOnly": true,
+          "format": "int32",
+          "description": "The maximum capacity that can be set."
+        },
+        "default": {
+          "type": "integer",
+          "readOnly": true,
+          "format": "int32",
+          "description": "The default capacity."
+        },
+        "scaleType": {
+          "type": "string",
+          "readOnly": true,
+          "description": "The scale type applicable to the sku.",
+          "enum": [
+            "Automatic",
+            "Manual",
+            "None"
+          ],
+          "x-ms-enum": {
+            "name": "ApiManagementSkuCapacityScaleType",
+            "modelAsString": false
+          }
+        }
+      },
+      "description": "Describes scaling information of a SKU."
+    },
+    "ApiManagementSkuCosts": {
+      "properties": {
+        "meterID": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Used for querying price from commerce."
+        },
+        "quantity": {
+          "type": "integer",
+          "readOnly": true,
+          "format": "int64",
+          "description": "The multiplier is needed to extend the base metered cost."
+        },
+        "extendedUnit": {
+          "type": "string",
+          "readOnly": true,
+          "description": "An invariant to show the extended unit."
+        }
+      },
+      "description": "Describes metadata for retrieving price info."
+    },
+    "ApiManagementSkuCapabilities": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "readOnly": true,
+          "description": "An invariant to describe the feature."
+        },
+        "value": {
+          "type": "string",
+          "readOnly": true,
+          "description": "An invariant if the feature is measured by quantity."
+        }
+      },
+      "description": "Describes The SKU capabilities object."
+    },
+    "ApiManagementSkuZoneDetails": {
+      "properties": {
+        "name": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "type": "string"
+          },
+          "description": "The set of zones that the SKU is available in with the specified capabilities."
+        },
+        "capabilities": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ApiManagementSkuCapabilities"
+          },
+          "description": "A list of capabilities that are available for the SKU in the specified list of zones."
+        }
+      },
+      "description": "Describes The zonal capabilities of a SKU."
+    },
+    "ApiManagementSkuRestrictions": {
+      "properties": {
+        "type": {
+          "type": "string",
+          "readOnly": true,
+          "description": "The type of restrictions.",
+          "enum": [
+            "Location",
+            "Zone"
+          ],
+          "x-ms-enum": {
+            "name": "ApiManagementSkuRestrictionsType",
+            "modelAsString": false
+          }
+        },
+        "values": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "type": "string"
+          },
+          "description": "The value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted."
+        },
+        "restrictionInfo": {
+          "$ref": "#/definitions/ApiManagementSkuRestrictionInfo",
+          "readOnly": true,
+          "description": "The information about the restriction where the SKU cannot be used."
+        },
+        "reasonCode": {
+          "type": "string",
+          "readOnly": true,
+          "description": "The reason for restriction.",
+          "enum": [
+            "QuotaId",
+            "NotAvailableForSubscription"
+          ],
+          "x-ms-enum": {
+            "name": "ApiManagementSkuRestrictionsReasonCode",
+            "modelAsString": false
+          }
+        }
+      },
+      "description": "Describes scaling information of a SKU."
+    },
+    "ApiManagementSku": {
+      "properties": {
+        "resourceType": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The type of resource the SKU applies to."
+        },
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The name of SKU."
+        },
+        "tier": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Specifies the tier of virtual machines in a scale set.<br /><br /> Possible Values:<br /><br /> **Standard**<br /><br /> **Basic**"
+        },
+        "size": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The Size of the SKU."
+        },
+        "family": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The Family of this particular SKU."
+        },
+        "kind": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The Kind of resources that are supported in this SKU."
+        },
+        "capacity": {
+          "$ref": "#/definitions/ApiManagementSkuCapacity",
+          "readOnly": true,
+          "description": "Specifies the number of virtual machines in the scale set."
+        },
+        "locations": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "type": "string"
+          },
+          "description": "The set of locations that the SKU is available."
+        },
+        "locationInfo": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ApiManagementSkuLocationInfo"
+          },
+          "description": "A list of locations and availability zones in those locations where the SKU is available."
+        },
+        "apiVersions": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "type": "string"
+          },
+          "description": "The api versions that support this SKU."
+        },
+        "costs": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ApiManagementSkuCosts"
+          },
+          "description": "Metadata for retrieving price info."
+        },
+        "capabilities": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ApiManagementSkuCapabilities"
+          },
+          "description": "A name value pair to describe the capability."
+        },
+        "restrictions": {
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ApiManagementSkuRestrictions"
+          },
+          "description": "The restrictions because of which SKU cannot be used. This is empty if there are no restrictions."
+        }
+      },
+      "description": "Describes an available ApiManagement SKU."
+    },
+    "ApiManagementSkuLocationInfo": {
+      "properties": {
+        "location": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Location of the SKU"
+        },
+        "zones": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of availability zones where the SKU is supported."
+        },
+        "zoneDetails": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApiManagementSkuZoneDetails"
+          },
+          "description": "Details of capabilities available to a SKU in specific zones."
+        }
+      }
+    },
+    "ApiManagementSkuRestrictionInfo": {
+      "properties": {
+        "locations": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Locations where the SKU is restricted"
+        },
+        "zones": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of availability zones where the SKU is restricted."
+        }
+      }
+    },
+    "ApiManagementSkusResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApiManagementSku"
+          },
+          "description": "The list of skus available for the subscription."
+        },
+        "nextLink": {
+          "type": "string",
+          "readOnly": true,
+          "description": "The URI to fetch the next page of Resource Skus. Call ListNext() with this URI to fetch the next page of Resource Skus"
+        }
+      },
+      "required": [
+        "value"
+      ],
+      "description": "The List Resource Skus operation response."
+    }
+  },
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimsubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimsubscriptions.json
new file mode 100644
index 000000000000..4884a0105b12
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimsubscriptions.json
@@ -0,0 +1,523 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Subscription entity associated with your Azure API Management deployment. The Subscription entity represents the association between a user and a product in API Management. Products contain one or more APIs, and once a product is published, developers can subscribe to the product and begin to use the product’s APIs.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions": {
+      "get": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_List",
+        "description": "Lists all subscriptions of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementListSubscriptions": {
+            "$ref": "./examples/ApiManagementListSubscriptions.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| stateComment | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| ownerId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| scope | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| productId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq |     |</br>| user | expand |     |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A collection of the Subscription entities for the specified API Management service instance.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/SubscriptionContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}": {
+      "head": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the apimanagement subscription specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadSubscription": {
+            "$ref": "./examples/ApiManagementHeadSubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified apimanagement subscription entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_Get",
+        "description": "Gets the specified Subscription entity.",
+        "x-ms-examples": {
+          "ApiManagementGetSubscription": {
+            "$ref": "./examples/ApiManagementGetSubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Subscription entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_CreateOrUpdate",
+        "description": "Creates or updates the subscription of specified user to the specified product.",
+        "x-ms-examples": {
+          "ApiManagementCreateSubscription": {
+            "$ref": "./examples/ApiManagementCreateSubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionCreateParameters"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotifySubscriptionStateChangeParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AppTypeParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "The user was successfully subscribed to the product.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionContract"
+            }
+          },
+          "200": {
+            "description": "The user already subscribed to the product.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_Update",
+        "description": "Updates the details of a subscription specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateSubscription": {
+            "$ref": "./examples/ApiManagementUpdateSubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/NotifySubscriptionStateChangeParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AppTypeParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The subscription details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_Delete",
+        "description": "Deletes the specified subscription.",
+        "x-ms-examples": {
+          "ApiManagementDeleteSubscription": {
+            "$ref": "./examples/ApiManagementDeleteSubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The subscription details were successfully deleted."
+          },
+          "204": {
+            "description": "The subscription details were successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regeneratePrimaryKey": {
+      "post": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_RegeneratePrimaryKey",
+        "description": "Regenerates primary key of existing subscription of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementSubscriptionRegeneratePrimaryKey": {
+            "$ref": "./examples/ApiManagementSubscriptionRegeneratePrimaryKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The primary key was successfully regenerated."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regenerateSecondaryKey": {
+      "post": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_RegenerateSecondaryKey",
+        "description": "Regenerates secondary key of existing subscription of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementSubscriptionRegenerateSecondaryKey": {
+            "$ref": "./examples/ApiManagementSubscriptionRegenerateSecondaryKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The secondary key was successfully regenerated."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/listSecrets": {
+      "post": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_ListSecrets",
+        "description": "Gets the specified Subscription keys.",
+        "x-ms-examples": {
+          "ApiManagementSubscriptionListSecrets": {
+            "$ref": "./examples/ApiManagementSubscriptionListSecrets.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains subscription keys.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionKeysContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtagresources.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtagresources.json
new file mode 100644
index 000000000000..0a754f7b5e96
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtagresources.json
@@ -0,0 +1,99 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for querying APIs. Operations and Products by tags in your Azure API Management deployment.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tagResources": {
+      "get": {
+        "tags": [
+          "TagResource"
+        ],
+        "operationId": "TagResource_ListByService",
+        "description": "Lists a collection of resources associated with tags.",
+        "x-ms-examples": {
+          "ApiManagementListTagResources": {
+            "$ref": "./examples/ApiManagementListTagResources.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| aid | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiRevision | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| path | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| method | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| terms | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq |     |</br>| isCurrent | filter | eq |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of TagResource entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagResourceCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagResourceContract"
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtags.json
new file mode 100644
index 000000000000..78e6f0e3831c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtags.json
@@ -0,0 +1,383 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on Tag entity in your Azure API Management deployment. Tags can be assigned to APIs, Operations and Products.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags": {
+      "get": {
+        "tags": [
+          "Tag"
+        ],
+        "operationId": "Tag_ListByService",
+        "description": "Lists a collection of tags defined within a service instance.",
+        "x-ms-examples": {
+          "ApiManagementListTags": {
+            "$ref": "./examples/ApiManagementListTags.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "scope",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Scope like 'apis', 'products' or 'apis/{apiId}"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Tag entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/TagContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}": {
+      "head": {
+        "tags": [
+          "Tag"
+        ],
+        "operationId": "Tag_GetEntityState",
+        "description": "Gets the entity state version of the tag specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadTag": {
+            "$ref": "./examples/ApiManagementHeadTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Empty response body, ETag header entity state version.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Tag"
+        ],
+        "operationId": "Tag_Get",
+        "description": "Gets the details of the tag specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetTag": {
+            "$ref": "./examples/ApiManagementGetTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Tag entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Tag"
+        ],
+        "operationId": "Tag_CreateOrUpdate",
+        "description": "Creates a tag.",
+        "x-ms-examples": {
+          "ApiManagementCreateTag": {
+            "$ref": "./examples/ApiManagementCreateTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagCreateUpdateParameters"
+            },
+            "description": "Create parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Tag was created successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            }
+          },
+          "200": {
+            "description": "Tag already exists.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Tag"
+        ],
+        "operationId": "Tag_Update",
+        "description": "Updates the details of the tag specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateTag": {
+            "$ref": "./examples/ApiManagementUpdateTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagCreateUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The tag details were successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TagContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Tag"
+        ],
+        "operationId": "Tag_Delete",
+        "description": "Deletes specific tag of the API Management service instance.",
+        "x-ms-examples": {
+          "ApiManagementDeleteTag": {
+            "$ref": "./examples/ApiManagementDeleteTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TagIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tag successfully removed"
+          },
+          "204": {
+            "description": "Tag successfully removed by previous request or does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtenant.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtenant.json
new file mode 100644
index 000000000000..43b8912a3453
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimtenant.json
@@ -0,0 +1,770 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on tenant entity associated with your Azure API Management deployment. Using this entity you can manage properties and configuration that apply to the entire API Management service instance.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant": {
+      "get": {
+        "tags": [
+          "TenantAccess"
+        ],
+        "operationId": "TenantAccess_ListByService",
+        "description": "Returns list of access infos - for Git and Management endpoints.",
+        "x-ms-examples": {
+          "ApiManagementListTenantAccess": {
+            "$ref": "./examples/ApiManagementListTenantAccess.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Not used"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of TenantAccessInfo entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AccessInformationCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/AccessInformationContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}": {
+      "head": {
+        "tags": [
+          "TenantAccess"
+        ],
+        "operationId": "TenantAccess_GetEntityTag",
+        "description": "Tenant access metadata",
+        "x-ms-examples": {
+          "ApiManagementHeadTenantAccess": {
+            "$ref": "./examples/ApiManagementHeadTenantAccess.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "TenantAccess"
+        ],
+        "operationId": "TenantAccess_Get",
+        "description": "Get tenant access information details without secrets.",
+        "x-ms-examples": {
+          "ApiManagementGetTenantAccess": {
+            "$ref": "./examples/ApiManagementGetTenantAccess.json"
+          },
+          "ApiManagementGetTenantGitAccess": {
+            "$ref": "./examples/ApiManagementGetTenantGitAccess.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tenant Access information.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AccessInformationContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "TenantAccess"
+        ],
+        "operationId": "TenantAccess_Create",
+        "description": "Update tenant access information details.",
+        "x-ms-examples": {
+          "ApiManagementCreateTenantAccess": {
+            "$ref": "./examples/ApiManagementCreateTenantAccess.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AccessInformationCreateParameters"
+            },
+            "description": "Parameters supplied to retrieve the Tenant Access Information."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tenant Access information was updated successfully.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AccessInformationContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "TenantAccess"
+        ],
+        "operationId": "TenantAccess_Update",
+        "description": "Update tenant access information details.",
+        "x-ms-examples": {
+          "ApiManagementUpdateTenantAccess": {
+            "$ref": "./examples/ApiManagementUpdateTenantAccess.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AccessInformationUpdateParameters"
+            },
+            "description": "Parameters supplied to retrieve the Tenant Access Information."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tenant Access information was updated successfully.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AccessInformationContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regeneratePrimaryKey": {
+      "post": {
+        "tags": [
+          "TenantAccess"
+        ],
+        "operationId": "TenantAccess_RegeneratePrimaryKey",
+        "description": "Regenerate primary access key",
+        "x-ms-examples": {
+          "ApiManagementTenantAccessRegenerateKey": {
+            "$ref": "./examples/ApiManagementTenantAccessRegenerateKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The primary key was successfully regenerated."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regenerateSecondaryKey": {
+      "post": {
+        "tags": [
+          "TenantAccess"
+        ],
+        "operationId": "TenantAccess_RegenerateSecondaryKey",
+        "description": "Regenerate secondary access key",
+        "x-ms-examples": {
+          "ApiManagementTenantAccessRegenerateKey": {
+            "$ref": "./examples/ApiManagementTenantAccessRegenerateKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The secondary key was successfully regenerated."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/listSecrets": {
+      "post": {
+        "tags": [
+          "TenantAccess"
+        ],
+        "operationId": "TenantAccess_ListSecrets",
+        "description": "Get tenant access information details.",
+        "x-ms-examples": {
+          "ApiManagementListSecretsTenantAccess": {
+            "$ref": "./examples/ApiManagementListSecretsTenantAccess.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Tenant Access information.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/AccessInformationSecretsContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regeneratePrimaryKey": {
+      "post": {
+        "tags": [
+          "TenantAccessGit"
+        ],
+        "operationId": "TenantAccessGit_RegeneratePrimaryKey",
+        "description": "Regenerate primary access key for GIT.",
+        "x-ms-examples": {
+          "ApiManagementTenantAccessRegenerateKey": {
+            "$ref": "./examples/ApiManagementTenantAccessRegenerateKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The primary key was successfully regenerated."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regenerateSecondaryKey": {
+      "post": {
+        "tags": [
+          "TenantAccessGit"
+        ],
+        "operationId": "TenantAccessGit_RegenerateSecondaryKey",
+        "description": "Regenerate secondary access key for GIT.",
+        "x-ms-examples": {
+          "ApiManagementTenantAccessRegenerateKey": {
+            "$ref": "./examples/ApiManagementTenantAccessRegenerateKey.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AccessParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The secondary key was successfully regenerated."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/deploy": {
+      "post": {
+        "tags": [
+          "TenantConfiguration"
+        ],
+        "operationId": "TenantConfiguration_Deploy",
+        "description": "This operation applies changes from the specified Git branch to the configuration database. This is a long running operation and could take several minutes to complete.",
+        "externalDocs": {
+          "description": "To deploy any service configuration changes to the API Management service instance",
+          "url": "https://azure.microsoft.com/en-us/documentation/articles/api-management-configuration-repository-git/#to-deploy-any-service-configuration-changes-to-the-api-management-service-instance"
+        },
+        "x-ms-examples": {
+          "ApiManagementTenantConfigurationDeploy": {
+            "$ref": "./examples/ApiManagementTenantConfigurationDeploy.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DeployConfigurationParameters"
+            },
+            "description": "Deploy Configuration parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ConfigurationParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted: Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "200": {
+            "description": "Result of applying changes from Git branch to database.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationResultContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/save": {
+      "post": {
+        "tags": [
+          "TenantConfiguration"
+        ],
+        "operationId": "TenantConfiguration_Save",
+        "description": "This operation creates a commit with the current configuration snapshot to the specified branch in the repository. This is a long running operation and could take several minutes to complete.",
+        "externalDocs": {
+          "description": "To save the service configuration to the Git repository",
+          "url": "https://azure.microsoft.com/en-us/documentation/articles/api-management-configuration-repository-git/#to-save-the-service-configuration-to-the-git-repository"
+        },
+        "x-ms-examples": {
+          "ApiManagementTenantConfigurationSave": {
+            "$ref": "./examples/ApiManagementTenantConfigurationSave.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SaveConfigurationParameter"
+            },
+            "description": "Save Configuration parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ConfigurationParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted: Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "200": {
+            "description": "Result of creating a commit in the repository.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationResultContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/validate": {
+      "post": {
+        "tags": [
+          "TenantConfiguration"
+        ],
+        "operationId": "TenantConfiguration_Validate",
+        "description": "This operation validates the changes in the specified Git branch. This is a long running operation and could take several minutes to complete.",
+        "x-ms-examples": {
+          "ApiManagementTenantConfigurationValidate": {
+            "$ref": "./examples/ApiManagementTenantConfigurationValidate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/DeployConfigurationParameters"
+            },
+            "description": "Validate Configuration parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ConfigurationParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted: Location header contains the URL where the status of the long running operation can be checked."
+          },
+          "200": {
+            "description": "Result of validating the changes in the specified Git branch.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/OperationResultContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/syncState": {
+      "get": {
+        "tags": [
+          "TenantConfigurationSyncState"
+        ],
+        "operationId": "TenantConfiguration_GetSyncState",
+        "description": "Gets the status of the most recent synchronization between the configuration database and the Git repository.",
+        "x-ms-examples": {
+          "ApiManagementTenantAccessSyncState": {
+            "$ref": "./examples/ApiManagementTenantAccessSyncState.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ConfigurationParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Sync state result.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/TenantConfigurationSyncStateContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimusers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimusers.json
new file mode 100644
index 000000000000..4154dfe2402f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimusers.json
@@ -0,0 +1,778 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ApiManagementClient",
+    "description": "Use these REST APIs for performing operations on User entity in Azure API Management deployment. The User entity in API Management represents the developers that call the APIs of the products to which they are subscribed.",
+    "version": "2021-04-01-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users": {
+      "get": {
+        "tags": [
+          "User"
+        ],
+        "operationId": "User_ListByService",
+        "description": "Lists a collection of registered users in the specified service instance.",
+        "x-ms-examples": {
+          "ApiManagementListUsers": {
+            "$ref": "./examples/ApiManagementListUsers.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| firstName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| lastName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| email | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq |     |</br>| registrationDate | filter | ge, le, eq, ne, gt, lt |     |</br>| note | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| groups | expand |     |     |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "name": "expandGroups",
+            "in": "query",
+            "type": "boolean",
+            "description": "Detailed Group in response."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of User entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/UserContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}": {
+      "head": {
+        "tags": [
+          "User"
+        ],
+        "operationId": "User_GetEntityTag",
+        "description": "Gets the entity state (Etag) version of the user specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementHeadUser": {
+            "$ref": "./examples/ApiManagementHeadUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Specified user entity exists and current entity state version is present in the ETag header.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "User"
+        ],
+        "operationId": "User_Get",
+        "description": "Gets the details of the user specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementGetUser": {
+            "$ref": "./examples/ApiManagementGetUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Gets the specified user entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "User"
+        ],
+        "operationId": "User_CreateOrUpdate",
+        "description": "Creates or Updates a user.",
+        "x-ms-examples": {
+          "ApiManagementCreateUser": {
+            "$ref": "./examples/ApiManagementCreateUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserCreateParameters"
+            },
+            "description": "Create or update parameters."
+          },
+          {
+            "name": "notify",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Send an Email notification to the User."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchOptionalParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "User was successfully created.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "200": {
+            "description": "User was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "User"
+        ],
+        "operationId": "User_Update",
+        "description": "Updates the details of the user specified by its identifier.",
+        "x-ms-examples": {
+          "ApiManagementUpdateUser": {
+            "$ref": "./examples/ApiManagementUpdateUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserUpdateParameters"
+            },
+            "description": "Update parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "User was successfully updated.",
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            },
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserContract"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "User"
+        ],
+        "operationId": "User_Delete",
+        "description": "Deletes specific user.",
+        "x-ms-examples": {
+          "ApiManagementDeleteUser": {
+            "$ref": "./examples/ApiManagementDeleteUser.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "name": "deleteSubscriptions",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Whether to delete user's subscription or not."
+          },
+          {
+            "name": "notify",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "description": "Send an Account Closed Email notification to the User."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/IfMatchRequiredParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AppTypeParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The user details were successfully deleted."
+          },
+          "204": {
+            "description": "The user details were successfully deleted."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/generateSsoUrl": {
+      "post": {
+        "tags": [
+          "Users"
+        ],
+        "operationId": "User_GenerateSsoUrl",
+        "description": "Retrieves a redirection URL containing an authentication token for signing a given user into the developer portal.",
+        "x-ms-examples": {
+          "ApiManagementUserGenerateSsoUrl": {
+            "$ref": "./examples/ApiManagementUserGenerateSsoUrl.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the single sign-on URL.",
+            "schema": {
+              "x-ms-client-flatten": true,
+              "$ref": "./definitions.json#/definitions/GenerateSsoUrlResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/groups": {
+      "get": {
+        "tags": [
+          "UserGroup"
+        ],
+        "operationId": "UserGroup_List",
+        "description": "Lists all user groups.",
+        "x-ms-examples": {
+          "ApiManagementListUserGroups": {
+            "$ref": "./examples/ApiManagementListUserGroups.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "|     Field     |     Usage     |     Supported operators     |     Supported functions     |</br>|-------------|------------------------|-----------------------------------|</br>| name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Group entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/GroupCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/GroupContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/subscriptions": {
+      "get": {
+        "tags": [
+          "UserSubscription"
+        ],
+        "operationId": "UserSubscription_List",
+        "description": "Lists the collection of subscriptions of the specified user.",
+        "x-ms-examples": {
+          "ApiManagementListUserSubscriptions": {
+            "$ref": "./examples/ApiManagementListUserSubscriptions.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "| Field     |     Usage     |     Supported operators    | Supported functions               |</br>|-------------|------------------------|-----------------------------------|</br>|name | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|stateComment | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|ownerId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|scope | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|productId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/TopQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SkipQueryParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists a collection of Subscription entities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "./definitions.json#/definitions/SubscriptionContract"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/subscriptions/{sid}": {
+      "get": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "UserSubscription_Get",
+        "description": "Gets the specified Subscription entity associated with a particular user.",
+        "x-ms-examples": {
+          "ApiManagementGetUserSubscription": {
+            "$ref": "./examples/ApiManagementGetUserSubscription.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionEntityIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the specified Subscription entity.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/SubscriptionContract"
+            },
+            "headers": {
+              "ETag": {
+                "description": "Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/identities": {
+      "get": {
+        "tags": [
+          "UserIdentity"
+        ],
+        "operationId": "UserIdentities_List",
+        "description": "List of all user identities.",
+        "x-ms-examples": {
+          "ApiManagementListUserIdentities": {
+            "$ref": "./examples/ApiManagementListUserIdentities.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Lists of User Identities.",
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserIdentityCollection"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/token": {
+      "post": {
+        "tags": [
+          "UserToken"
+        ],
+        "operationId": "User_GetSharedAccessToken",
+        "description": "Gets the Shared Access Authorization Token for the User.",
+        "x-ms-examples": {
+          "ApiManagementUserToken": {
+            "$ref": "./examples/ApiManagementUserToken.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "./definitions.json#/definitions/UserTokenParameters"
+            },
+            "description": "Create Authorization Token parameters."
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The response body contains the authorization token for the user.",
+            "schema": {
+              "x-ms-client-flatten": true,
+              "$ref": "./definitions.json#/definitions/UserTokenResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/confirmations/password/send": {
+      "post": {
+        "tags": [
+          "UserConfirmationPasswordSend"
+        ],
+        "operationId": "UserConfirmationPassword_Send",
+        "description": "Sends confirmation",
+        "x-ms-examples": {
+          "ApiManagementUserConfirmationPasswordSend": {
+            "$ref": "./examples/ApiManagementUserConfirmationPasswordSend.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "./apimanagement.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/UserIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "./apimanagement.json#/parameters/AppTypeParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Notification successfully sent"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "./apimanagement.json#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {},
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json
new file mode 100644
index 000000000000..41161235a43b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json
@@ -0,0 +1,6930 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2021-04-01-preview",
+    "description": "A spec file containing all the definitions",
+    "title": "Definitions file"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {},
+  "definitions": {
+    "AccessInformationCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AccessInformationContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged AccessInformation list representation."
+    },
+    "AccessInformationContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AccessInformationContractProperties",
+          "description": "AccessInformation entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Tenant Settings."
+    },
+    "AccessInformationContractProperties": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Access Information type ('access' or 'gitAccess')"
+        },
+        "principalId": {
+          "type": "string",
+          "description": "Principal (User) Identifier."
+        },
+        "enabled": {
+          "type": "boolean",
+          "description": "Determines whether direct access is enabled."
+        }
+      },
+      "description": "Tenant access information contract of the API Management service."
+    },
+    "AccessInformationSecretsContract": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Access Information type ('access' or 'gitAccess')"
+        },
+        "principalId": {
+          "type": "string",
+          "description": "Principal (User) Identifier."
+        },
+        "primaryKey": {
+          "type": "string",
+          "description": "Primary access key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
+        },
+        "secondaryKey": {
+          "type": "string",
+          "description": "Secondary access key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
+        },
+        "enabled": {
+          "type": "boolean",
+          "description": "Determines whether direct access is enabled."
+        }
+      },
+      "description": "Tenant access information contract of the API Management service."
+    },
+    "AccessInformationCreateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AccessInformationCreateParameterProperties",
+          "description": "Tenant access information update parameter properties."
+        }
+      },
+      "description": "Tenant access information update parameters."
+    },
+    "AccessInformationCreateParameterProperties": {
+      "properties": {
+        "principalId": {
+          "type": "string",
+          "description": "Principal (User) Identifier."
+        },
+        "primaryKey": {
+          "type": "string",
+          "description": "Primary access key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
+        },
+        "secondaryKey": {
+          "type": "string",
+          "description": "Secondary access key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
+        },
+        "enabled": {
+          "type": "boolean",
+          "description": "Determines whether direct access is enabled."
+        }
+      },
+      "description": "Tenant access information update parameters of the API Management service"
+    },
+    "AccessInformationUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AccessInformationUpdateParameterProperties",
+          "description": "Tenant access information update parameter properties."
+        }
+      },
+      "description": "Tenant access information update parameters."
+    },
+    "AccessInformationUpdateParameterProperties": {
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Determines whether direct access is enabled."
+        }
+      },
+      "description": "Tenant access information update parameters of the API Management service"
+    },
+    "TenantSettingsCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TenantSettingsContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged AccessInformation list representation."
+    },
+    "TenantSettingsContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/TenantSettingsContractProperties",
+          "description": "TenantSettings entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Tenant Settings."
+    },
+    "TenantSettingsContractProperties": {
+      "properties": {
+        "settings": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Tenant settings"
+        }
+      },
+      "description": "Tenant access information contract of the API Management service."
+    },
+    "ApiCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApiContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged API list representation."
+    },
+    "ApiContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApiContractProperties",
+          "description": "API entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "API details."
+    },
+    "ApiContractProperties": {
+      "properties": {
+        "sourceApiId": {
+          "type": "string",
+          "description": "API identifier of the source API."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "API name. Must be 1 to 300 characters long.",
+          "minLength": 1,
+          "maxLength": 300
+        },
+        "serviceUrl": {
+          "type": "string",
+          "description": "Absolute URL of the backend service implementing this API. Cannot be more than 2000 characters long.",
+          "minLength": 0,
+          "maxLength": 2000
+        },
+        "path": {
+          "type": "string",
+          "description": "Relative URL uniquely identifying this API and all of its resource paths within the API Management service instance. It is appended to the API endpoint base URL specified during the service instance creation to form a public URL for this API.",
+          "minLength": 0,
+          "maxLength": 400
+        },
+        "protocols": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "http",
+              "https",
+              "ws",
+              "wss"
+            ],
+            "x-ms-enum": {
+              "name": "Protocol",
+              "modelAsString": true
+            }
+          },
+          "description": "Describes on which protocols the operations in this API can be invoked."
+        },
+        "apiVersionSet": {
+          "description": "Version set details",
+          "$ref": "#/definitions/ApiVersionSetContractDetails"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApiEntityBaseContract"
+        }
+      ],
+      "required": [
+        "path"
+      ],
+      "description": "API Entity Properties"
+    },
+    "ApiCreateOrUpdateParameter": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApiCreateOrUpdateProperties",
+          "description": "API entity create of update properties."
+        }
+      },
+      "description": "API Create or Update Parameters."
+    },
+    "ApiCreateOrUpdateProperties": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "Content value when Importing an API."
+        },
+        "format": {
+          "type": "string",
+          "description": "Format of the Content in which the API is getting imported.",
+          "enum": [
+            "wadl-xml",
+            "wadl-link-json",
+            "swagger-json",
+            "swagger-link-json",
+            "wsdl",
+            "wsdl-link",
+            "openapi",
+            "openapi+json",
+            "openapi-link",
+            "openapi+json-link",
+            "graphql-link"
+          ],
+          "x-ms-enum": {
+            "name": "ContentFormat",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "wadl-xml",
+                "description": "The contents are inline and Content type is a WADL document."
+              },
+              {
+                "value": "wadl-link-json",
+                "description": "The WADL document is hosted on a publicly accessible internet address."
+              },
+              {
+                "value": "swagger-json",
+                "description": "The contents are inline and Content Type is a OpenAPI 2.0 JSON Document."
+              },
+              {
+                "value": "swagger-link-json",
+                "description": "The OpenAPI 2.0 JSON document is hosted on a publicly accessible internet address."
+              },
+              {
+                "value": "wsdl",
+                "description": "The contents are inline and the document is a WSDL/Soap document."
+              },
+              {
+                "value": "wsdl-link",
+                "description": "The WSDL document is hosted on a publicly accessible internet address."
+              },
+              {
+                "value": "openapi",
+                "description": "The contents are inline and Content Type is a OpenAPI 3.0 YAML Document."
+              },
+              {
+                "value": "openapi+json",
+                "description": "The contents are inline and Content Type is a OpenAPI 3.0 JSON Document."
+              },
+              {
+                "value": "openapi-link",
+                "description": "The OpenAPI 3.0 YAML document is hosted on a publicly accessible internet address."
+              },
+              {
+                "value": "openapi+json-link",
+                "description": "The OpenAPI 3.0 JSON document is hosted on a publicly accessible internet address."
+              },
+              {
+                "value": "graphql-link",
+                "description": "The GraphQL API endpoint hosted on a publicly accessible internet address."
+              }
+            ]
+          }
+        },
+        "wsdlSelector": {
+          "type": "object",
+          "description": "Criteria to limit import of WSDL to a subset of the document.",
+          "properties": {
+            "wsdlServiceName": {
+              "type": "string",
+              "description": "Name of service to import from WSDL"
+            },
+            "wsdlEndpointName": {
+              "type": "string",
+              "description": "Name of endpoint(port) to import from WSDL"
+            }
+          }
+        },
+        "apiType": {
+          "type": "string",
+          "description": "Type of API to create. \n * `http` creates a REST API \n * `soap` creates a SOAP pass-through API  \n * `websocket` creates websocket API \n * `graphql` creates GraphQL API.",
+          "enum": [
+            "http",
+            "soap",
+            "websocket",
+            "graphql"
+          ],
+          "x-ms-client-name": "SoapApiType",
+          "x-ms-enum": {
+            "name": "SoapApiType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "http",
+                "description": "Imports a SOAP API having a RESTful front end.",
+                "name": "SoapToRest"
+              },
+              {
+                "value": "soap",
+                "description": "Imports the SOAP API having a SOAP front end.",
+                "name": "SoapPassThrough"
+              },
+              {
+                "value": "websocket",
+                "description": "Imports the API having a Websocket front end.",
+                "name": "WebSocket"
+              },
+              {
+                "value": "graphql",
+                "description": "Imports the API having a GraphQL front end.",
+                "name": "GraphQL"
+              }
+            ]
+          }
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApiContractProperties"
+        }
+      ],
+      "description": "API Create or Update Properties."
+    },
+    "ApiEntityBaseContract": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Description of the API. May include HTML formatting tags."
+        },
+        "authenticationSettings": {
+          "$ref": "#/definitions/AuthenticationSettingsContract",
+          "description": "Collection of authentication settings included into this API."
+        },
+        "subscriptionKeyParameterNames": {
+          "$ref": "#/definitions/SubscriptionKeyParameterNamesContract",
+          "description": "Protocols over which API is made available."
+        },
+        "type": {
+          "type": "string",
+          "description": "Type of API.",
+          "enum": [
+            "http",
+            "soap",
+            "websocket",
+            "graphql"
+          ],
+          "x-ms-client-name": "ApiType",
+          "x-ms-enum": {
+            "name": "ApiType",
+            "modelAsString": true
+          }
+        },
+        "apiRevision": {
+          "type": "string",
+          "description": "Describes the revision of the API. If no value is provided, default revision 1 is created",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "apiVersion": {
+          "type": "string",
+          "description": "Indicates the version identifier of the API if the API is versioned",
+          "maxLength": 100
+        },
+        "isCurrent": {
+          "type": "boolean",
+          "description": "Indicates if API revision is current api revision."
+        },
+        "isOnline": {
+          "type": "boolean",
+          "description": "Indicates if API revision is accessible via the gateway.",
+          "readOnly": true
+        },
+        "apiRevisionDescription": {
+          "type": "string",
+          "description": "Description of the API Revision.",
+          "maxLength": 256
+        },
+        "apiVersionDescription": {
+          "type": "string",
+          "description": "Description of the API Version.",
+          "maxLength": 256
+        },
+        "apiVersionSetId": {
+          "type": "string",
+          "description": "A resource identifier for the related ApiVersionSet."
+        },
+        "subscriptionRequired": {
+          "type": "boolean",
+          "description": "Specifies whether an API or Product subscription is required for accessing the API."
+        },
+        "termsOfServiceUrl": {
+          "type": "string",
+          "description": " A URL to the Terms of Service for the API. MUST be in the format of a URL."
+        },
+        "contact": {
+          "$ref": "#/definitions/ApiContactInformation",
+          "description": "Contact information for the API."
+        },
+        "license": {
+          "$ref": "#/definitions/ApiLicenseInformation",
+          "description": "License information for the API."
+        }
+      },
+      "description": "API base contract details."
+    },
+    "ApiContactInformation": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The identifying name of the contact person/organization"
+        },
+        "url": {
+          "type": "string",
+          "description": "The URL pointing to the contact information. MUST be in the format of a URL"
+        },
+        "email": {
+          "type": "string",
+          "description": "The email address of the contact person/organization. MUST be in the format of an email address"
+        }
+      },
+      "description": "API contact information"
+    },
+    "ApiLicenseInformation": {
+      "type": "object",
+      "description": "API license information",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The license name used for the API"
+        },
+        "url": {
+          "type": "string",
+          "description": "A URL to the license used for the API. MUST be in the format of a URL"
+        }
+      }
+    },
+    "ApiExportResult": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "ResourceId of the API which was exported."
+        },
+        "format": {
+          "type": "string",
+          "enum": [
+            "swagger-link-json",
+            "wadl-link-json",
+            "wsdl-link+xml",
+            "openapi-link"
+          ],
+          "x-ms-client-name": "ExportResultFormat",
+          "x-ms-enum": {
+            "name": "ExportResultFormat",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "swagger-link-json",
+                "description": "The API Definition is exported in OpenAPI Specification 2.0 format to the Storage Blob.",
+                "name": "Swagger"
+              },
+              {
+                "value": "wsdl-link+xml",
+                "description": "The API Definition is exported in WSDL Schema to Storage Blob. This is only supported for APIs of Type `soap`",
+                "name": "Wsdl"
+              },
+              {
+                "value": "wadl-link-json",
+                "description": "Export the API Definition in WADL Schema to Storage Blob.",
+                "name": "Wadl"
+              },
+              {
+                "value": "openapi-link",
+                "description": "Export the API Definition in OpenAPI Specification 3.0 to Storage Blob.",
+                "name": "OpenApi"
+              }
+            ]
+          },
+          "description": "Format in which the API Details are exported to the Storage Blob with Sas Key valid for 5 minutes."
+        },
+        "value": {
+          "type": "object",
+          "description": "The object defining the schema of the exported API Detail",
+          "properties": {
+            "link": {
+              "type": "string",
+              "description": "Link to the Storage Blob containing the result of the export operation. The Blob Uri is only valid for 5 minutes."
+            }
+          }
+        }
+      },
+      "description": "API Export result."
+    },
+    "ApiReleaseCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApiReleaseContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged ApiRelease list representation."
+    },
+    "ApiReleaseContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApiReleaseContractProperties",
+          "description": "ApiRelease entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "ApiRelease details."
+    },
+    "ApiReleaseContractProperties": {
+      "properties": {
+        "apiId": {
+          "type": "string",
+          "description": "Identifier of the API the release belongs to."
+        },
+        "createdDateTime": {
+          "type": "string",
+          "readOnly": true,
+          "format": "date-time",
+          "description": "The time the API was released. The date conforms to the following format: yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard."
+        },
+        "updatedDateTime": {
+          "type": "string",
+          "readOnly": true,
+          "format": "date-time",
+          "description": "The time the API release was updated."
+        },
+        "notes": {
+          "type": "string",
+          "description": "Release Notes"
+        }
+      },
+      "description": "API Release details"
+    },
+    "ApiRevisionCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApiRevisionContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged API Revision list representation."
+    },
+    "ApiRevisionContract": {
+      "properties": {
+        "apiId": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Identifier of the API Revision."
+        },
+        "apiRevision": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 100,
+          "readOnly": true,
+          "description": "Revision number of API."
+        },
+        "createdDateTime": {
+          "type": "string",
+          "readOnly": true,
+          "format": "date-time",
+          "description": "The time the API Revision was created. The date conforms to the following format: yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard."
+        },
+        "updatedDateTime": {
+          "type": "string",
+          "readOnly": true,
+          "format": "date-time",
+          "description": "The time the API Revision were updated. The date conforms to the following format: yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard."
+        },
+        "description": {
+          "type": "string",
+          "readOnly": true,
+          "maxLength": 256,
+          "description": "Description of the API Revision."
+        },
+        "privateUrl": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Gateway URL for accessing the non-current API Revision."
+        },
+        "isOnline": {
+          "type": "boolean",
+          "readOnly": true,
+          "description": "Indicates if API revision is the current api revision."
+        },
+        "isCurrent": {
+          "type": "boolean",
+          "readOnly": true,
+          "description": "Indicates if API revision is accessible via the gateway."
+        }
+      },
+      "description": "Summary of revision metadata."
+    },
+    "ApiRevisionInfoContract": {
+      "description": "Object used to create an API Revision or Version based on an existing API Revision",
+      "properties": {
+        "sourceApiId": {
+          "type": "string",
+          "description": "Resource identifier of API to be used to create the revision from."
+        },
+        "apiVersionName": {
+          "type": "string",
+          "maxLength": 100,
+          "description": "Version identifier for the new API Version."
+        },
+        "apiRevisionDescription": {
+          "type": "string",
+          "maxLength": 256,
+          "description": "Description of new API Revision."
+        },
+        "apiVersionSet": {
+          "description": "Version set details",
+          "$ref": "#/definitions/ApiVersionSetContractDetails"
+        }
+      }
+    },
+    "ApiTagResourceContractProperties": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "API identifier in the form /apis/{apiId}."
+        },
+        "name": {
+          "type": "string",
+          "description": "API name.",
+          "minLength": 1,
+          "maxLength": 300
+        },
+        "serviceUrl": {
+          "type": "string",
+          "description": "Absolute URL of the backend service implementing this API.",
+          "minLength": 1,
+          "maxLength": 2000
+        },
+        "path": {
+          "type": "string",
+          "description": "Relative URL uniquely identifying this API and all of its resource paths within the API Management service instance. It is appended to the API endpoint base URL specified during the service instance creation to form a public URL for this API.",
+          "minLength": 0,
+          "maxLength": 400
+        },
+        "protocols": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "http",
+              "https",
+              "ws",
+              "wss"
+            ],
+            "x-ms-enum": {
+              "name": "Protocol",
+              "modelAsString": true
+            }
+          },
+          "description": "Describes on which protocols the operations in this API can be invoked."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./definitions.json#/definitions/ApiEntityBaseContract"
+        }
+      ],
+      "description": "API contract properties for the Tag Resources."
+    },
+    "ApiUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApiContractUpdateProperties",
+          "description": "Properties of the API entity that can be updated."
+        }
+      },
+      "description": "API update contract details."
+    },
+    "ApiContractUpdateProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "API name.",
+          "minLength": 1,
+          "maxLength": 300
+        },
+        "serviceUrl": {
+          "type": "string",
+          "description": "Absolute URL of the backend service implementing this API.",
+          "minLength": 1,
+          "maxLength": 2000
+        },
+        "path": {
+          "type": "string",
+          "description": "Relative URL uniquely identifying this API and all of its resource paths within the API Management service instance. It is appended to the API endpoint base URL specified during the service instance creation to form a public URL for this API.",
+          "minLength": 0,
+          "maxLength": 400
+        },
+        "protocols": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "http",
+              "https",
+              "ws",
+              "wss"
+            ],
+            "x-ms-enum": {
+              "name": "Protocol",
+              "modelAsString": true
+            }
+          },
+          "description": "Describes on which protocols the operations in this API can be invoked."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApiEntityBaseContract"
+        }
+      ],
+      "description": "API update contract properties."
+    },
+    "ApiVersionSetCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApiVersionSetContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged API Version Set list representation."
+    },
+    "ApiVersionSetContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApiVersionSetContractProperties",
+          "description": "API VersionSet contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "API Version Set Contract details."
+    },
+    "ApiVersionSetContractDetails": {
+      "description": "An API Version Set contains the common configuration for a set of API Versions relating ",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Identifier for existing API Version Set. Omit this value to create a new Version Set."
+        },
+        "name": {
+          "type": "string",
+          "description": "The display Name of the API Version Set."
+        },
+        "description": {
+          "type": "string",
+          "description": "Description of API Version Set."
+        },
+        "versioningScheme": {
+          "type": "string",
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request.",
+          "enum": [
+            "Segment",
+            "Query",
+            "Header"
+          ]
+        },
+        "versionQueryName": {
+          "type": "string",
+          "description": "Name of query parameter that indicates the API Version if versioningScheme is set to `query`."
+        },
+        "versionHeaderName": {
+          "type": "string",
+          "description": "Name of HTTP header parameter that indicates the API Version if versioningScheme is set to `header`."
+        }
+      }
+    },
+    "ApiVersionSetContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Name of API Version Set",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "versioningScheme": {
+          "type": "string",
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request.",
+          "enum": [
+            "Segment",
+            "Query",
+            "Header"
+          ],
+          "x-ms-enum": {
+            "name": "versioningScheme",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Segment",
+                "description": "The API Version is passed in a path segment."
+              },
+              {
+                "value": "Query",
+                "description": "The API Version is passed in a query parameter."
+              },
+              {
+                "value": "Header",
+                "description": "The API Version is passed in a HTTP header."
+              }
+            ]
+          }
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApiVersionSetEntityBase"
+        }
+      ],
+      "required": [
+        "displayName",
+        "versioningScheme"
+      ],
+      "description": "Properties of an API Version Set."
+    },
+    "ApiVersionSetEntityBase": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Description of API Version Set."
+        },
+        "versionQueryName": {
+          "type": "string",
+          "description": "Name of query parameter that indicates the API Version if versioningScheme is set to `query`.",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "versionHeaderName": {
+          "type": "string",
+          "description": "Name of HTTP header parameter that indicates the API Version if versioningScheme is set to `header`.",
+          "minLength": 1,
+          "maxLength": 100
+        }
+      },
+      "description": "API Version set base parameters"
+    },
+    "ApiVersionSetUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApiVersionSetUpdateParametersProperties",
+          "description": "Parameters to update or create an API Version Set Contract."
+        }
+      },
+      "description": "Parameters to update or create an API Version Set Contract."
+    },
+    "ApiVersionSetUpdateParametersProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Name of API Version Set",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "versioningScheme": {
+          "type": "string",
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request.",
+          "enum": [
+            "Segment",
+            "Query",
+            "Header"
+          ],
+          "x-ms-enum": {
+            "name": "versioningScheme",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Segment",
+                "description": "The API Version is passed in a path segment."
+              },
+              {
+                "value": "Query",
+                "description": "The API Version is passed in a query parameter."
+              },
+              {
+                "value": "Header",
+                "description": "The API Version is passed in a HTTP header."
+              }
+            ]
+          }
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ApiVersionSetEntityBase"
+        }
+      ],
+      "description": "Properties used to create or update an API Version Set."
+    },
+    "AuthenticationSettingsContract": {
+      "properties": {
+        "oAuth2": {
+          "$ref": "#/definitions/OAuth2AuthenticationSettingsContract",
+          "description": "OAuth2 Authentication settings"
+        },
+        "openid": {
+          "$ref": "#/definitions/OpenIdAuthenticationSettingsContract",
+          "description": "OpenID Connect Authentication Settings"
+        }
+      },
+      "description": "API Authentication Settings."
+    },
+    "AuthorizationServerCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AuthorizationServerContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged OAuth2 Authorization Servers list representation."
+    },
+    "AuthorizationServerContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AuthorizationServerContractProperties",
+          "description": "Properties of the External OAuth authorization server Contract."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "External OAuth authorization server settings."
+    },
+    "AuthorizationServerContractBaseProperties": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Description of the authorization server. Can contain HTML formatting tags."
+        },
+        "authorizationMethods": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "HEAD",
+              "OPTIONS",
+              "TRACE",
+              "GET",
+              "POST",
+              "PUT",
+              "PATCH",
+              "DELETE"
+            ],
+            "x-ms-enum": {
+              "name": "AuthorizationMethod",
+              "modelAsString": false
+            }
+          },
+          "description": "HTTP verbs supported by the authorization endpoint. GET must be always present. POST is optional."
+        },
+        "clientAuthenticationMethod": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Basic",
+              "Body"
+            ],
+            "x-ms-enum": {
+              "name": "ClientAuthenticationMethod",
+              "modelAsString": true,
+              "values": [
+                {
+                  "value": "Basic",
+                  "description": "Basic Client Authentication method."
+                },
+                {
+                  "value": "Body",
+                  "description": "Body based Authentication method."
+                }
+              ]
+            }
+          },
+          "description": "Method of authentication supported by the token endpoint of this authorization server. Possible values are Basic and/or Body. When Body is specified, client credentials and other parameters are passed within the request body in the application/x-www-form-urlencoded format."
+        },
+        "tokenBodyParameters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TokenBodyParameterContract"
+          },
+          "description": "Additional parameters required by the token endpoint of this authorization server represented as an array of JSON objects with name and value string properties, i.e. {\"name\" : \"name value\", \"value\": \"a value\"}."
+        },
+        "tokenEndpoint": {
+          "type": "string",
+          "description": "OAuth token endpoint. Contains absolute URI to entity being referenced.",
+          "externalDocs": {
+            "url": "http://tools.ietf.org/html/rfc6749#section-3.1"
+          }
+        },
+        "supportState": {
+          "type": "boolean",
+          "description": "If true, authorization server will include state parameter from the authorization request to its response. Client may use state parameter to raise protocol security.",
+          "externalDocs": {
+            "url": "http://tools.ietf.org/html/rfc6749#section-3.1"
+          }
+        },
+        "defaultScope": {
+          "type": "string",
+          "description": "Access token scope that is going to be requested by default. Can be overridden at the API level. Should be provided in the form of a string containing space-delimited values.",
+          "externalDocs": {
+            "url": "http://tools.ietf.org/html/rfc6749#section-3.3"
+          }
+        },
+        "bearerTokenSendingMethods": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "authorizationHeader",
+              "query"
+            ],
+            "x-ms-enum": {
+              "name": "BearerTokenSendingMethod",
+              "modelAsString": true
+            }
+          },
+          "description": "Specifies the mechanism by which access token is passed to the API. ",
+          "externalDocs": {
+            "url": "http://tools.ietf.org/html/rfc6749#section-4"
+          }
+        },
+        "resourceOwnerUsername": {
+          "type": "string",
+          "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner username."
+        },
+        "resourceOwnerPassword": {
+          "type": "string",
+          "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner password."
+        }
+      },
+      "description": "External OAuth authorization server Update settings contract."
+    },
+    "AuthorizationServerContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "User-friendly authorization server name.",
+          "minLength": 1,
+          "maxLength": 50
+        },
+        "clientRegistrationEndpoint": {
+          "type": "string",
+          "description": "Optional reference to a page where client or app registration for this authorization server is performed. Contains absolute URL to entity being referenced."
+        },
+        "authorizationEndpoint": {
+          "type": "string",
+          "description": "OAuth authorization endpoint. See http://tools.ietf.org/html/rfc6749#section-3.2."
+        },
+        "grantTypes": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "authorizationCode",
+              "implicit",
+              "resourceOwnerPassword",
+              "clientCredentials"
+            ],
+            "x-ms-enum": {
+              "name": "GrantType",
+              "modelAsString": true,
+              "values": [
+                {
+                  "value": "authorizationCode",
+                  "description": "Authorization Code Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.1."
+                },
+                {
+                  "value": "implicit",
+                  "description": "Implicit Code Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.2."
+                },
+                {
+                  "value": "resourceOwnerPassword",
+                  "description": "Resource Owner Password Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.3."
+                },
+                {
+                  "value": "clientCredentials",
+                  "description": "Client Credentials Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.4."
+                }
+              ]
+            }
+          },
+          "description": "Form of an authorization grant, which the client uses to request the access token.",
+          "externalDocs": {
+            "url": "http://tools.ietf.org/html/rfc6749#section-4"
+          }
+        },
+        "clientId": {
+          "type": "string",
+          "description": "Client or app id registered with this authorization server."
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client or app secret registered with this authorization server. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/AuthorizationServerContractBaseProperties"
+        }
+      ],
+      "required": [
+        "displayName",
+        "clientRegistrationEndpoint",
+        "authorizationEndpoint",
+        "clientId",
+        "grantTypes"
+      ],
+      "description": "External OAuth authorization server settings Properties."
+    },
+    "AuthorizationServerUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AuthorizationServerUpdateContractProperties",
+          "description": "Properties of the External OAuth authorization server update Contract."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "External OAuth authorization server settings."
+    },
+    "AuthorizationServerUpdateContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "User-friendly authorization server name.",
+          "minLength": 1,
+          "maxLength": 50
+        },
+        "clientRegistrationEndpoint": {
+          "type": "string",
+          "description": "Optional reference to a page where client or app registration for this authorization server is performed. Contains absolute URL to entity being referenced."
+        },
+        "authorizationEndpoint": {
+          "type": "string",
+          "description": "OAuth authorization endpoint. See http://tools.ietf.org/html/rfc6749#section-3.2."
+        },
+        "grantTypes": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "authorizationCode",
+              "implicit",
+              "resourceOwnerPassword",
+              "clientCredentials"
+            ],
+            "x-ms-enum": {
+              "name": "GrantType",
+              "modelAsString": true,
+              "values": [
+                {
+                  "value": "authorizationCode",
+                  "description": "Authorization Code Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.1."
+                },
+                {
+                  "value": "implicit",
+                  "description": "Implicit Code Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.2."
+                },
+                {
+                  "value": "resourceOwnerPassword",
+                  "description": "Resource Owner Password Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.3."
+                },
+                {
+                  "value": "clientCredentials",
+                  "description": "Client Credentials Grant flow as described https://tools.ietf.org/html/rfc6749#section-4.4."
+                }
+              ]
+            }
+          },
+          "description": "Form of an authorization grant, which the client uses to request the access token.",
+          "externalDocs": {
+            "url": "http://tools.ietf.org/html/rfc6749#section-4"
+          }
+        },
+        "clientId": {
+          "type": "string",
+          "description": "Client or app id registered with this authorization server."
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client or app secret registered with this authorization server. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/AuthorizationServerContractBaseProperties"
+        }
+      ],
+      "description": "External OAuth authorization server Update settings contract."
+    },
+    "AuthorizationServerSecretsContract": {
+      "properties": {
+        "clientSecret": {
+          "type": "string",
+          "description": "oAuth Authorization Server Secrets."
+        },
+        "resourceOwnerUsername": {
+          "type": "string",
+          "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner username."
+        },
+        "resourceOwnerPassword": {
+          "type": "string",
+          "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner password."
+        }
+      },
+      "description": "OAuth Server Secrets Contract."
+    },
+    "BackendAuthorizationHeaderCredentials": {
+      "properties": {
+        "scheme": {
+          "type": "string",
+          "description": "Authentication Scheme name.",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "parameter": {
+          "type": "string",
+          "description": "Authentication Parameter value.",
+          "minLength": 1,
+          "maxLength": 300
+        }
+      },
+      "required": [
+        "scheme",
+        "parameter"
+      ],
+      "description": "Authorization header information."
+    },
+    "BackendBaseParameters": {
+      "properties": {
+        "title": {
+          "type": "string",
+          "description": "Backend Title.",
+          "minLength": 1,
+          "maxLength": 300
+        },
+        "description": {
+          "type": "string",
+          "description": "Backend Description.",
+          "minLength": 1,
+          "maxLength": 2000
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Management Uri of the Resource in External System. This url can be the Arm Resource Id of Logic Apps, Function Apps or API Apps.",
+          "minLength": 1,
+          "maxLength": 2000
+        },
+        "properties": {
+          "$ref": "#/definitions/BackendProperties",
+          "description": "Backend Properties contract"
+        },
+        "credentials": {
+          "$ref": "#/definitions/BackendCredentialsContract",
+          "description": "Backend Credentials Contract Properties"
+        },
+        "proxy": {
+          "$ref": "#/definitions/BackendProxyContract",
+          "description": "Backend Proxy Contract Properties"
+        },
+        "tls": {
+          "$ref": "#/definitions/BackendTlsProperties",
+          "description": "Backend TLS Properties"
+        }
+      },
+      "description": "Backend entity base Parameter set."
+    },
+    "BackendCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BackendContract"
+          },
+          "description": "Backend values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Backend list representation."
+    },
+    "BackendContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/BackendContractProperties",
+          "description": "Backend entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Backend details."
+    },
+    "BackendContractProperties": {
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "Runtime Url of the Backend.",
+          "minLength": 1,
+          "maxLength": 2000
+        },
+        "protocol": {
+          "type": "string",
+          "enum": [
+            "http",
+            "soap"
+          ],
+          "x-ms-enum": {
+            "name": "BackendProtocol",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "http",
+                "description": "The Backend is a RESTful service."
+              },
+              {
+                "value": "soap",
+                "description": "The Backend is a SOAP service."
+              }
+            ]
+          },
+          "description": "Backend communication protocol."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/BackendBaseParameters"
+        }
+      ],
+      "required": [
+        "url",
+        "protocol"
+      ],
+      "description": "Parameters supplied to the Create Backend operation."
+    },
+    "BackendCredentialsContract": {
+      "properties": {
+        "certificateIds": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "maxItems": 32,
+          "description": "List of Client Certificate Ids."
+        },
+        "certificate": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "maxItems": 32,
+          "description": "List of Client Certificate Thumbprints. Will be ignored if certificatesIds are provided."
+        },
+        "query": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "description": "Query Parameter description."
+        },
+        "header": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "description": "Header Parameter description."
+        },
+        "authorization": {
+          "description": "Authorization header authentication",
+          "$ref": "#/definitions/BackendAuthorizationHeaderCredentials"
+        }
+      },
+      "description": "Details of the Credentials used to connect to Backend."
+    },
+    "BackendProperties": {
+      "properties": {
+        "serviceFabricCluster": {
+          "$ref": "#/definitions/BackendServiceFabricClusterProperties",
+          "description": "Backend Service Fabric Cluster Properties"
+        }
+      },
+      "description": "Properties specific to the Backend Type."
+    },
+    "BackendProxyContract": {
+      "externalDocs": {
+        "url": "https://msdn.microsoft.com/en-us/library/system.net.webproxy(v=vs.110).aspx",
+        "description": "Backend entity uses these details to connect to a WebProxy."
+      },
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "WebProxy Server AbsoluteUri property which includes the entire URI stored in the Uri instance, including all fragments and query strings.",
+          "minLength": 1,
+          "maxLength": 2000
+        },
+        "username": {
+          "type": "string",
+          "description": "Username to connect to the WebProxy server"
+        },
+        "password": {
+          "type": "string",
+          "description": "Password to connect to the WebProxy Server"
+        }
+      },
+      "required": [
+        "url"
+      ],
+      "description": "Details of the Backend WebProxy Server to use in the Request to Backend."
+    },
+    "BackendReconnectContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/BackendReconnectProperties",
+          "description": "Reconnect request properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Reconnect request parameters."
+    },
+    "BackendReconnectProperties": {
+      "properties": {
+        "after": {
+          "type": "string",
+          "format": "duration",
+          "description": "Duration in ISO8601 format after which reconnect will be initiated. Minimum duration of the Reconnect is PT2M."
+        }
+      },
+      "description": "Properties to control reconnect requests."
+    },
+    "BackendServiceFabricClusterProperties": {
+      "properties": {
+        "clientCertificateId": {
+          "description": "The client certificate id for the management endpoint.",
+          "type": "string"
+        },
+        "clientCertificatethumbprint": {
+          "description": "The client certificate thumbprint for the management endpoint. Will be ignored if certificatesIds are provided",
+          "type": "string"
+        },
+        "maxPartitionResolutionRetries": {
+          "description": "Maximum number of retries while attempting resolve the partition.",
+          "format": "int32",
+          "type": "integer"
+        },
+        "managementEndpoints": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "The cluster management endpoint."
+        },
+        "serverCertificateThumbprints": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Thumbprints of certificates cluster management service uses for tls communication"
+        },
+        "serverX509Names": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/X509CertificateName"
+          },
+          "description": "Server X509 Certificate Names Collection"
+        }
+      },
+      "required": [
+        "managementEndpoints"
+      ],
+      "description": "Properties of the Service Fabric Type Backend."
+    },
+    "BackendTlsProperties": {
+      "properties": {
+        "validateCertificateChain": {
+          "description": "Flag indicating whether SSL certificate chain validation should be done when using self-signed certificates for this backend host.",
+          "type": "boolean",
+          "default": true
+        },
+        "validateCertificateName": {
+          "description": "Flag indicating whether SSL certificate name validation should be done when using self-signed certificates for this backend host.",
+          "type": "boolean",
+          "default": true
+        }
+      },
+      "description": "Properties controlling TLS Certificate Validation."
+    },
+    "BackendUpdateParameterProperties": {
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "Runtime Url of the Backend.",
+          "minLength": 1,
+          "maxLength": 2000
+        },
+        "protocol": {
+          "type": "string",
+          "enum": [
+            "http",
+            "soap"
+          ],
+          "x-ms-enum": {
+            "name": "BackendProtocol",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "http",
+                "description": "The Backend is a RESTful service."
+              },
+              {
+                "value": "soap",
+                "description": "The Backend is a SOAP service."
+              }
+            ]
+          },
+          "description": "Backend communication protocol."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/BackendBaseParameters"
+        }
+      ],
+      "description": "Parameters supplied to the Update Backend operation."
+    },
+    "BackendUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/BackendUpdateParameterProperties",
+          "description": "Backend entity update contract properties."
+        }
+      },
+      "description": "Backend update parameters."
+    },
+    "BearerTokenSendingMethodsContract": {
+      "type": "string",
+      "description": "Form of an authorization grant, which the client uses to request the access token.",
+      "enum": [
+        "authorizationHeader",
+        "query"
+      ],
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "bearerTokenSendingMethods",
+        "values": [
+          {
+            "value": "authorizationHeader",
+            "description": "Access token will be transmitted in the Authorization header using Bearer schema"
+          },
+          {
+            "value": "query",
+            "description": "Access token will be transmitted as query parameters."
+          }
+        ]
+      }
+    },
+    "BodyDiagnosticSettings": {
+      "properties": {
+        "bytes": {
+          "type": "integer",
+          "format": "int32",
+          "maximum": 8192,
+          "description": "Number of request body bytes to log."
+        }
+      },
+      "description": "Body logging settings."
+    },
+    "CacheCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CacheContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Caches list representation."
+    },
+    "CacheContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/CacheContractProperties",
+          "description": "Cache properties details."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Cache details."
+    },
+    "CacheContractProperties": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Cache description",
+          "maxLength": 2000
+        },
+        "connectionString": {
+          "type": "string",
+          "description": "Runtime connection string to cache",
+          "maxLength": 300
+        },
+        "useFromLocation": {
+          "type": "string",
+          "description": "Location identifier to use cache from (should be either 'default' or valid Azure region identifier)",
+          "maxLength": 256
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Original uri of entity in external system cache points to",
+          "maxLength": 2000
+        }
+      },
+      "required": [
+        "connectionString",
+        "useFromLocation"
+      ],
+      "description": "Properties of the Cache contract."
+    },
+    "CacheUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/CacheUpdateProperties",
+          "description": "Cache update properties details."
+        }
+      },
+      "description": "Cache update details."
+    },
+    "CacheUpdateProperties": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Cache description",
+          "maxLength": 2000
+        },
+        "connectionString": {
+          "type": "string",
+          "description": "Runtime connection string to cache",
+          "maxLength": 300
+        },
+        "useFromLocation": {
+          "type": "string",
+          "description": "Location identifier to use cache from (should be either 'default' or valid Azure region identifier)",
+          "maxLength": 256
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Original uri of entity in external system cache points to",
+          "maxLength": 2000
+        }
+      },
+      "description": "Parameters supplied to the Update Cache operation."
+    },
+    "CertificateCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CertificateContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Certificates list representation."
+    },
+    "CertificateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/CertificateContractProperties",
+          "description": "Certificate properties details."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Certificate details."
+    },
+    "CertificateContractProperties": {
+      "properties": {
+        "subject": {
+          "type": "string",
+          "description": "Subject attribute of the certificate."
+        },
+        "thumbprint": {
+          "type": "string",
+          "description": "Thumbprint of the certificate."
+        },
+        "expirationDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Expiration date of the certificate. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "keyVault": {
+          "$ref": "#/definitions/KeyVaultContractProperties",
+          "description": "KeyVault location details of the certificate."
+        }
+      },
+      "required": [
+        "subject",
+        "thumbprint",
+        "expirationDate"
+      ],
+      "description": "Properties of the Certificate contract."
+    },
+    "CertificateCreateOrUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/CertificateCreateOrUpdateProperties",
+          "description": "Certificate create or update properties details."
+        }
+      },
+      "description": "Certificate create or update details."
+    },
+    "CertificateCreateOrUpdateProperties": {
+      "properties": {
+        "data": {
+          "type": "string",
+          "description": "Base 64 encoded certificate using the application/x-pkcs12 representation."
+        },
+        "password": {
+          "type": "string",
+          "description": "Password for the Certificate"
+        },
+        "keyVault": {
+          "$ref": "#/definitions/KeyVaultContractCreateProperties",
+          "description": "KeyVault location details of the certificate."
+        }
+      },
+      "description": "Parameters supplied to the CreateOrUpdate certificate operation."
+    },
+    "DataMasking": {
+      "properties": {
+        "queryParams": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DataMaskingEntity"
+          },
+          "description": "Masking settings for Url query parameters"
+        },
+        "headers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DataMaskingEntity"
+          },
+          "description": "Masking settings for headers"
+        }
+      }
+    },
+    "DataMaskingEntity": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "The name of an entity to mask (e.g. a name of a header or a query parameter)."
+        },
+        "mode": {
+          "type": "string",
+          "enum": [
+            "Mask",
+            "Hide"
+          ],
+          "x-ms-enum": {
+            "name": "DataMaskingMode",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Mask",
+                "description": "Mask the value of an entity."
+              },
+              {
+                "value": "Hide",
+                "description": "Hide the presence of an entity."
+              }
+            ]
+          },
+          "description": "Data masking mode."
+        }
+      }
+    },
+    "DeployConfigurationParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/DeployConfigurationParameterProperties",
+          "description": "Deploy Configuration Parameter contract properties."
+        }
+      },
+      "description": "Deploy Tenant Configuration Contract."
+    },
+    "DeployConfigurationParameterProperties": {
+      "properties": {
+        "branch": {
+          "type": "string",
+          "description": "The name of the Git branch from which the configuration is to be deployed to the configuration database."
+        },
+        "force": {
+          "type": "boolean",
+          "description": "The value enforcing deleting subscriptions to products that are deleted in this update."
+        }
+      },
+      "required": [
+        "branch"
+      ],
+      "description": "Parameters supplied to the Deploy Configuration operation."
+    },
+    "DiagnosticCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DiagnosticContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Diagnostic list representation."
+    },
+    "DiagnosticContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/DiagnosticContractProperties",
+          "description": "Diagnostic entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Diagnostic details."
+    },
+    "DiagnosticContractProperties": {
+      "properties": {
+        "alwaysLog": {
+          "type": "string",
+          "enum": [
+            "allErrors"
+          ],
+          "x-ms-enum": {
+            "name": "AlwaysLog",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "allErrors",
+                "description": "Always log all erroneous request regardless of sampling settings."
+              }
+            ]
+          },
+          "description": "Specifies for what type of messages sampling settings should not apply."
+        },
+        "loggerId": {
+          "type": "string",
+          "description": "Resource Id of a target logger."
+        },
+        "sampling": {
+          "$ref": "#/definitions/SamplingSettings",
+          "description": "Sampling settings for Diagnostic."
+        },
+        "frontend": {
+          "$ref": "#/definitions/PipelineDiagnosticSettings",
+          "description": "Diagnostic settings for incoming/outgoing HTTP messages to the Gateway."
+        },
+        "backend": {
+          "$ref": "#/definitions/PipelineDiagnosticSettings",
+          "description": "Diagnostic settings for incoming/outgoing HTTP messages to the Backend"
+        },
+        "logClientIp": {
+          "type": "boolean",
+          "description": "Log the ClientIP. Default is false."
+        },
+        "httpCorrelationProtocol": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Legacy",
+            "W3C"
+          ],
+          "x-ms-enum": {
+            "name": "HttpCorrelationProtocol",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "None",
+                "description": "Do not read and inject correlation headers."
+              },
+              {
+                "value": "Legacy",
+                "description": "Inject Request-Id and Request-Context headers with request correlation data. See https://github.com/dotnet/corefx/blob/master/src/System.Diagnostics.DiagnosticSource/src/HttpCorrelationProtocol.md."
+              },
+              {
+                "value": "W3C",
+                "description": "Inject Trace Context headers. See https://w3c.github.io/trace-context."
+              }
+            ]
+          },
+          "description": "Sets correlation protocol to use for Application Insights diagnostics."
+        },
+        "verbosity": {
+          "type": "string",
+          "enum": [
+            "verbose",
+            "information",
+            "error"
+          ],
+          "x-ms-enum": {
+            "name": "Verbosity",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "verbose",
+                "description": "All the traces emitted by trace policies will be sent to the logger attached to this diagnostic instance."
+              },
+              {
+                "value": "information",
+                "description": "Traces with 'severity' set to 'information' and 'error' will be sent to the logger attached to this diagnostic instance."
+              },
+              {
+                "value": "error",
+                "description": "Only traces with 'severity' set to 'error' will be sent to the logger attached to this diagnostic instance."
+              }
+            ]
+          },
+          "description": "The verbosity level applied to traces emitted by trace policies."
+        },
+        "operationNameFormat": {
+          "type": "string",
+          "enum": [
+            "Name",
+            "Url"
+          ],
+          "x-ms-enum": {
+            "name": "OperationNameFormat",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Name",
+                "description": "API_NAME;rev=API_REVISION - OPERATION_NAME"
+              },
+              {
+                "value": "Url",
+                "description": "HTTP_VERB URL"
+              }
+            ]
+          },
+          "description": "The format of the Operation Name for Application Insights telemetries. Default is Name."
+        }
+      },
+      "required": [
+        "loggerId"
+      ],
+      "description": "Diagnostic Entity Properties"
+    },
+    "EmailTemplateCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/EmailTemplateContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged email template list representation."
+    },
+    "EmailTemplateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/EmailTemplateContractProperties",
+          "description": "Email Template entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Email Template details."
+    },
+    "EmailTemplateContractProperties": {
+      "properties": {
+        "subject": {
+          "type": "string",
+          "description": "Subject of the Template.",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "body": {
+          "type": "string",
+          "description": "Email Template Body. This should be a valid XDocument",
+          "minLength": 1
+        },
+        "title": {
+          "type": "string",
+          "description": "Title of the Template."
+        },
+        "description": {
+          "type": "string",
+          "description": "Description of the Email Template."
+        },
+        "isDefault": {
+          "type": "boolean",
+          "description": "Whether the template is the default template provided by API Management or has been edited.",
+          "readOnly": true
+        },
+        "parameters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/EmailTemplateParametersContractProperties"
+          },
+          "description": "Email Template Parameter values."
+        }
+      },
+      "required": [
+        "body",
+        "subject"
+      ],
+      "description": "Email Template Contract properties."
+    },
+    "EmailTemplateParametersContractProperties": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Template parameter name.",
+          "minLength": 1,
+          "maxLength": 256,
+          "pattern": "^[A-Za-z0-9-._]+$"
+        },
+        "title": {
+          "type": "string",
+          "description": "Template parameter title.",
+          "minLength": 1,
+          "maxLength": 4096
+        },
+        "description": {
+          "type": "string",
+          "description": "Template parameter description.",
+          "minLength": 1,
+          "maxLength": 256,
+          "pattern": "^[A-Za-z0-9-._]+$"
+        }
+      },
+      "description": "Email Template Parameter contract."
+    },
+    "EmailTemplateUpdateParameterProperties": {
+      "properties": {
+        "subject": {
+          "type": "string",
+          "description": "Subject of the Template.",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "title": {
+          "type": "string",
+          "description": "Title of the Template."
+        },
+        "description": {
+          "type": "string",
+          "description": "Description of the Email Template."
+        },
+        "body": {
+          "type": "string",
+          "description": "Email Template Body. This should be a valid XDocument",
+          "minLength": 1
+        },
+        "parameters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/EmailTemplateParametersContractProperties"
+          },
+          "description": "Email Template Parameter values."
+        }
+      },
+      "description": "Email Template Update Contract properties."
+    },
+    "EmailTemplateUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/EmailTemplateUpdateParameterProperties",
+          "description": "Email Template Update contract properties."
+        }
+      },
+      "description": "Email Template update Parameters."
+    },
+    "GenerateSsoUrlResult": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "Redirect Url containing the SSO URL value."
+        }
+      },
+      "description": "Generate SSO Url operations response details."
+    },
+    "GroupCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/GroupContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Group list representation."
+    },
+    "GroupContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/GroupContractProperties",
+          "description": "Group entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Contract details."
+    },
+    "GroupContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Group name.",
+          "maxLength": 300,
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "description": "Group description. Can contain HTML formatting tags.",
+          "maxLength": 1000
+        },
+        "builtIn": {
+          "readOnly": true,
+          "type": "boolean",
+          "description": "true if the group is one of the three system groups (Administrators, Developers, or Guests); otherwise false."
+        },
+        "type": {
+          "type": "string",
+          "description": "Group type.",
+          "enum": [
+            "custom",
+            "system",
+            "external"
+          ],
+          "x-ms-enum": {
+            "name": "GroupType",
+            "modelAsString": false
+          }
+        },
+        "externalId": {
+          "type": "string",
+          "description": "For external groups, this property contains the id of the group from the external identity provider, e.g. for Azure Active Directory `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise the value is null."
+        }
+      },
+      "required": [
+        "displayName"
+      ],
+      "description": "Group contract Properties."
+    },
+    "GroupCreateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/GroupCreateParametersProperties",
+          "description": "Properties supplied to Create Group operation."
+        }
+      },
+      "description": "Parameters supplied to the Create Group operation."
+    },
+    "GroupCreateParametersProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Group name.",
+          "maxLength": 300,
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "description": "Group description."
+        },
+        "type": {
+          "type": "string",
+          "description": "Group type.",
+          "enum": [
+            "custom",
+            "system",
+            "external"
+          ],
+          "x-ms-enum": {
+            "name": "GroupType",
+            "modelAsString": false
+          }
+        },
+        "externalId": {
+          "type": "string",
+          "description": "Identifier of the external groups, this property contains the id of the group from the external identity provider, e.g. for Azure Active Directory `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise the value is null."
+        }
+      },
+      "required": [
+        "displayName"
+      ],
+      "description": "Parameters supplied to the Create Group operation."
+    },
+    "GroupUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/GroupUpdateParametersProperties",
+          "description": "Group entity update contract properties."
+        }
+      },
+      "description": "Parameters supplied to the Update Group operation."
+    },
+    "GroupUpdateParametersProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Group name.",
+          "maxLength": 300,
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "description": "Group description."
+        },
+        "type": {
+          "type": "string",
+          "description": "Group type.",
+          "enum": [
+            "custom",
+            "system",
+            "external"
+          ],
+          "x-ms-enum": {
+            "name": "GroupType",
+            "modelAsString": false
+          }
+        },
+        "externalId": {
+          "type": "string",
+          "description": "Identifier of the external groups, this property contains the id of the group from the external identity provider, e.g. for Azure Active Directory `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise the value is null."
+        }
+      },
+      "description": "Parameters supplied to the Update Group operation."
+    },
+    "HttpMessageDiagnostic": {
+      "properties": {
+        "headers": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Array of HTTP Headers to log."
+        },
+        "body": {
+          "$ref": "#/definitions/BodyDiagnosticSettings",
+          "description": "Body logging settings."
+        },
+        "dataMasking": {
+          "$ref": "#/definitions/DataMasking",
+          "description": "Data masking settings."
+        }
+      },
+      "description": "Http message diagnostic settings."
+    },
+    "IdentityProviderBaseParameters": {
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "facebook",
+            "google",
+            "microsoft",
+            "twitter",
+            "aad",
+            "aadB2C"
+          ],
+          "x-ms-enum": {
+            "name": "IdentityProviderType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "facebook",
+                "description": "Facebook as Identity provider."
+              },
+              {
+                "value": "google",
+                "description": "Google as Identity provider."
+              },
+              {
+                "value": "microsoft",
+                "description": "Microsoft Live as Identity provider."
+              },
+              {
+                "value": "twitter",
+                "description": "Twitter as Identity provider."
+              },
+              {
+                "value": "aad",
+                "description": "Azure Active Directory as Identity provider."
+              },
+              {
+                "value": "aadB2C",
+                "description": "Azure Active Directory B2C as Identity provider."
+              }
+            ]
+          },
+          "description": "Identity Provider Type identifier."
+        },
+        "signinTenant": {
+          "type": "string",
+          "description": "The TenantId to use instead of Common when logging into Active Directory"
+        },
+        "allowedTenants": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "maxItems": 32,
+          "description": "List of Allowed Tenants when configuring Azure Active Directory login."
+        },
+        "authority": {
+          "type": "string",
+          "description": "OpenID Connect discovery endpoint hostname for AAD or AAD B2C."
+        },
+        "signupPolicyName": {
+          "type": "string",
+          "description": "Signup Policy Name. Only applies to AAD B2C Identity Provider.",
+          "minLength": 1
+        },
+        "signinPolicyName": {
+          "type": "string",
+          "description": "Signin Policy Name. Only applies to AAD B2C Identity Provider.",
+          "minLength": 1
+        },
+        "profileEditingPolicyName": {
+          "type": "string",
+          "description": "Profile Editing Policy Name. Only applies to AAD B2C Identity Provider.",
+          "minLength": 1
+        },
+        "passwordResetPolicyName": {
+          "type": "string",
+          "description": "Password Reset Policy Name. Only applies to AAD B2C Identity Provider.",
+          "minLength": 1
+        }
+      },
+      "description": "Identity Provider Base Parameter Properties."
+    },
+    "IdentityProviderCreateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IdentityProviderCreateContractProperties",
+          "description": "Identity Provider contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Identity Provider details."
+    },
+    "IdentityProviderCreateContractProperties": {
+      "properties": {
+        "clientId": {
+          "type": "string",
+          "description": "Client Id of the Application in the external Identity Provider. It is App ID for Facebook login, Client ID for Google login, App ID for Microsoft.",
+          "minLength": 1
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client secret of the Application in external Identity Provider, used to authenticate login request. For example, it is App Secret for Facebook login, API Key for Google login, Public Key for Microsoft. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
+          "minLength": 1
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/IdentityProviderBaseParameters"
+        }
+      ],
+      "required": [
+        "clientId",
+        "clientSecret"
+      ],
+      "description": "The external Identity Providers like Facebook, Google, Microsoft, Twitter or Azure Active Directory which can be used to enable access to the API Management service developer portal for all users."
+    },
+    "IdentityProviderContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IdentityProviderContractProperties",
+          "description": "Identity Provider contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Identity Provider details."
+    },
+    "IdentityProviderContractProperties": {
+      "properties": {
+        "clientId": {
+          "type": "string",
+          "description": "Client Id of the Application in the external Identity Provider. It is App ID for Facebook login, Client ID for Google login, App ID for Microsoft.",
+          "minLength": 1
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client secret of the Application in external Identity Provider, used to authenticate login request. For example, it is App Secret for Facebook login, API Key for Google login, Public Key for Microsoft. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
+          "minLength": 1
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/IdentityProviderBaseParameters"
+        }
+      ],
+      "required": [
+        "clientId"
+      ],
+      "description": "The external Identity Providers like Facebook, Google, Microsoft, Twitter or Azure Active Directory which can be used to enable access to the API Management service developer portal for all users."
+    },
+    "IdentityProviderList": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/IdentityProviderContract"
+          },
+          "description": "Identity Provider configuration values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "List of all the Identity Providers configured on the service instance."
+    },
+    "IdentityProviderUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IdentityProviderUpdateProperties",
+          "description": "Identity Provider update properties."
+        }
+      },
+      "description": "Parameters supplied to update Identity Provider"
+    },
+    "IdentityProviderUpdateProperties": {
+      "properties": {
+        "clientId": {
+          "type": "string",
+          "description": "Client Id of the Application in the external Identity Provider. It is App ID for Facebook login, Client ID for Google login, App ID for Microsoft.",
+          "minLength": 1
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client secret of the Application in external Identity Provider, used to authenticate login request. For example, it is App Secret for Facebook login, API Key for Google login, Public Key for Microsoft.",
+          "minLength": 1
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/IdentityProviderBaseParameters"
+        }
+      ],
+      "description": "Parameters supplied to the Update Identity Provider operation."
+    },
+    "IssueAttachmentCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/IssueAttachmentContract"
+          },
+          "description": "Issue Attachment values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged Issue Attachment list representation."
+    },
+    "IssueAttachmentContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IssueAttachmentContractProperties",
+          "description": "Properties of the Issue Attachment."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Issue Attachment Contract details."
+    },
+    "IssueAttachmentContractProperties": {
+      "properties": {
+        "title": {
+          "type": "string",
+          "description": "Filename by which the binary data will be saved."
+        },
+        "contentFormat": {
+          "type": "string",
+          "description": "Either 'link' if content is provided via an HTTP link or the MIME type of the Base64-encoded binary data provided in the 'content' property."
+        },
+        "content": {
+          "type": "string",
+          "description": "An HTTP link or Base64-encoded binary data."
+        }
+      },
+      "required": [
+        "title",
+        "contentFormat",
+        "content"
+      ],
+      "description": "Issue Attachment contract Properties."
+    },
+    "IssueCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/IssueContract"
+          },
+          "description": "Issue values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged Issue list representation."
+    },
+    "IssueCommentCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/IssueCommentContract"
+          },
+          "description": "Issue Comment values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged Issue Comment list representation."
+    },
+    "IssueCommentContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IssueCommentContractProperties",
+          "description": "Properties of the Issue Comment."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Issue Comment Contract details."
+    },
+    "IssueCommentContractProperties": {
+      "properties": {
+        "text": {
+          "type": "string",
+          "description": "Comment text."
+        },
+        "createdDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Date and time when the comment was created."
+        },
+        "userId": {
+          "type": "string",
+          "description": "A resource identifier for the user who left the comment."
+        }
+      },
+      "required": [
+        "text",
+        "userId"
+      ],
+      "description": "Issue Comment contract Properties."
+    },
+    "IssueContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IssueContractProperties",
+          "description": "Properties of the Issue."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Issue Contract details."
+    },
+    "IssueContractBaseProperties": {
+      "properties": {
+        "createdDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Date and time when the issue was created."
+        },
+        "state": {
+          "type": "string",
+          "description": "Status of the issue.",
+          "enum": [
+            "proposed",
+            "open",
+            "removed",
+            "resolved",
+            "closed"
+          ],
+          "x-ms-enum": {
+            "name": "State",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "proposed",
+                "description": "The issue is proposed."
+              },
+              {
+                "value": "open",
+                "description": "The issue is opened."
+              },
+              {
+                "value": "removed",
+                "description": "The issue was removed."
+              },
+              {
+                "value": "resolved",
+                "description": "The issue is now resolved."
+              },
+              {
+                "value": "closed",
+                "description": "The issue was closed."
+              }
+            ]
+          }
+        },
+        "apiId": {
+          "type": "string",
+          "description": "A resource identifier for the API the issue was created for."
+        }
+      },
+      "description": "Issue contract Base Properties."
+    },
+    "IssueContractProperties": {
+      "properties": {
+        "title": {
+          "type": "string",
+          "description": "The issue title."
+        },
+        "description": {
+          "type": "string",
+          "description": "Text describing the issue."
+        },
+        "userId": {
+          "type": "string",
+          "description": "A resource identifier for the user created the issue."
+        }
+      },
+      "required": [
+        "title",
+        "description",
+        "userId"
+      ],
+      "allOf": [
+        {
+          "$ref": "#/definitions/IssueContractBaseProperties"
+        }
+      ],
+      "description": "Issue contract Properties."
+    },
+    "IssueUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IssueUpdateContractProperties",
+          "description": "Issue entity Update contract properties."
+        }
+      },
+      "description": "Issue update Parameters."
+    },
+    "IssueUpdateContractProperties": {
+      "properties": {
+        "title": {
+          "type": "string",
+          "description": "The issue title."
+        },
+        "description": {
+          "type": "string",
+          "description": "Text describing the issue."
+        },
+        "userId": {
+          "type": "string",
+          "description": "A resource identifier for the user created the issue."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/IssueContractBaseProperties"
+        }
+      ],
+      "description": "Issue contract Update Properties."
+    },
+    "KeyVaultContractCreateProperties": {
+      "properties": {
+        "secretIdentifier": {
+          "type": "string",
+          "description": "Key vault secret identifier for fetching secret. Providing a versioned secret will prevent auto-refresh. This requires API Management service to be configured with aka.ms/apimmsi"
+        },
+        "identityClientId": {
+          "type": "string",
+          "description": "SystemAssignedIdentity or UserAssignedIdentity Client Id which will be used to access key vault secret."
+        }
+      },
+      "description": "Create keyVault contract details."
+    },
+    "KeyVaultContractProperties": {
+      "properties": {
+        "lastStatus": {
+          "$ref": "#/definitions/KeyVaultLastAccessStatusContractProperties",
+          "description": "Last time sync and refresh status of secret from key vault."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/KeyVaultContractCreateProperties"
+        }
+      ],
+      "description": "KeyVault contract details."
+    },
+    "KeyVaultLastAccessStatusContractProperties": {
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "Last status code for sync and refresh of secret from key vault."
+        },
+        "message": {
+          "type": "string",
+          "description": "Details of the error else empty."
+        },
+        "timeStampUtc": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Last time secret was accessed. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        }
+      },
+      "description": "Issue contract Update Properties."
+    },
+    "LoggerCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LoggerContract"
+          },
+          "description": "Logger values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Logger list representation."
+    },
+    "LoggerContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/LoggerContractProperties",
+          "description": "Logger entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Logger details."
+    },
+    "LoggerContractProperties": {
+      "properties": {
+        "loggerType": {
+          "type": "string",
+          "description": "Logger type.",
+          "enum": [
+            "azureEventHub",
+            "applicationInsights",
+            "azureMonitor"
+          ],
+          "x-ms-enum": {
+            "name": "LoggerType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "azureEventHub",
+                "description": "Azure Event Hub as log destination."
+              },
+              {
+                "value": "applicationInsights",
+                "description": "Azure Application Insights as log destination."
+              },
+              {
+                "value": "azureMonitor",
+                "description": "Azure Monitor"
+              }
+            ]
+          }
+        },
+        "description": {
+          "type": "string",
+          "description": "Logger description.",
+          "maxLength": 256
+        },
+        "credentials": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "The name and SendRule connection string of the event hub for azureEventHub logger.\nInstrumentation key for applicationInsights logger.",
+          "example": {
+            "name": "apim",
+            "connectionString": "Endpoint=sb://contoso-ns.servicebus.windows.net/;SharedAccessKeyName=Sender;SharedAccessKey=..."
+          }
+        },
+        "isBuffered": {
+          "type": "boolean",
+          "description": "Whether records are buffered in the logger before publishing. Default is assumed to be true."
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Azure Resource Id of a log target (either Azure Event Hub resource or Azure Application Insights resource)."
+        }
+      },
+      "required": [
+        "loggerType"
+      ],
+      "description": "The Logger entity in API Management represents an event sink that you can use to log API Management events. Currently the Logger entity supports logging API Management events to Azure Event Hubs."
+    },
+    "LoggerUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/LoggerUpdateParameters",
+          "description": "Logger entity update contract properties."
+        }
+      },
+      "description": "Logger update contract."
+    },
+    "LoggerUpdateParameters": {
+      "properties": {
+        "loggerType": {
+          "type": "string",
+          "description": "Logger type.",
+          "enum": [
+            "azureEventHub",
+            "applicationInsights",
+            "azureMonitor"
+          ],
+          "x-ms-enum": {
+            "name": "LoggerType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "azureEventHub",
+                "description": "Azure Event Hub as log destination."
+              },
+              {
+                "value": "applicationInsights",
+                "description": "Azure Application Insights as log destination."
+              },
+              {
+                "value": "azureMonitor",
+                "description": "Azure Monitor"
+              }
+            ]
+          }
+        },
+        "description": {
+          "type": "string",
+          "description": "Logger description."
+        },
+        "credentials": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Logger credentials."
+        },
+        "isBuffered": {
+          "type": "boolean",
+          "description": "Whether records are buffered in the logger before publishing. Default is assumed to be true."
+        }
+      },
+      "description": "Parameters supplied to the Update Logger operation."
+    },
+    "NotificationCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NotificationContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Notification list representation."
+    },
+    "NotificationContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NotificationContractProperties",
+          "description": "Notification entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Notification details."
+    },
+    "NotificationContractProperties": {
+      "properties": {
+        "title": {
+          "type": "string",
+          "description": "Title of the Notification.",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "description": {
+          "type": "string",
+          "description": "Description of the Notification."
+        },
+        "recipients": {
+          "$ref": "#/definitions/RecipientsContractProperties",
+          "description": "Recipient Parameter values."
+        }
+      },
+      "required": [
+        "title"
+      ],
+      "description": "Notification Contract properties."
+    },
+    "OAuth2AuthenticationSettingsContract": {
+      "properties": {
+        "authorizationServerId": {
+          "type": "string",
+          "description": "OAuth authorization server identifier."
+        },
+        "scope": {
+          "type": "string",
+          "description": "operations scope."
+        }
+      },
+      "description": "API OAuth2 Authentication settings details."
+    },
+    "OpenIdAuthenticationSettingsContract": {
+      "properties": {
+        "openidProviderId": {
+          "type": "string",
+          "description": "OAuth authorization server identifier."
+        },
+        "bearerTokenSendingMethods": {
+          "description": "How to send token to the server.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BearerTokenSendingMethodsContract"
+          }
+        }
+      },
+      "description": "API OAuth2 Authentication settings details."
+    },
+    "OpenIdConnectProviderCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/OpenidConnectProviderContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged OpenIdProviders list representation."
+    },
+    "OpenidConnectProviderContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OpenidConnectProviderContractProperties",
+          "description": "OpenId Connect Provider contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "OpenId Connect Provider details."
+    },
+    "OpenidConnectProviderContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "User-friendly OpenID Connect Provider name.",
+          "maxLength": 50
+        },
+        "description": {
+          "type": "string",
+          "description": "User-friendly description of OpenID Connect Provider."
+        },
+        "metadataEndpoint": {
+          "type": "string",
+          "description": "Metadata endpoint URI."
+        },
+        "clientId": {
+          "type": "string",
+          "description": "Client ID of developer console which is the client application."
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client Secret of developer console which is the client application."
+        }
+      },
+      "required": [
+        "displayName",
+        "metadataEndpoint",
+        "clientId"
+      ],
+      "description": "OpenID Connect Providers Contract."
+    },
+    "OpenidConnectProviderUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OpenidConnectProviderUpdateContractProperties",
+          "description": "OpenId Connect Provider Update contract properties."
+        }
+      },
+      "description": "Parameters supplied to the Update OpenID Connect Provider operation."
+    },
+    "OpenidConnectProviderUpdateContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "User-friendly OpenID Connect Provider name.",
+          "maxLength": 50
+        },
+        "description": {
+          "type": "string",
+          "description": "User-friendly description of OpenID Connect Provider."
+        },
+        "metadataEndpoint": {
+          "type": "string",
+          "description": "Metadata endpoint URI."
+        },
+        "clientId": {
+          "type": "string",
+          "description": "Client ID of developer console which is the client application."
+        },
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Client Secret of developer console which is the client application."
+        }
+      },
+      "description": "Parameters supplied to the Update OpenID Connect Provider operation."
+    },
+    "OperationCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/OperationContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged Operation list representation."
+    },
+    "OperationContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OperationContractProperties",
+          "description": "Properties of the Operation Contract."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "API Operation details."
+    },
+    "OperationContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Operation Name.",
+          "minLength": 1,
+          "maxLength": 300
+        },
+        "method": {
+          "type": "string",
+          "description": "A Valid HTTP Operation Method. Typical Http Methods like GET, PUT, POST but not limited by only them.",
+          "externalDocs": {
+            "description": "As defined by RFC.",
+            "url": "http://www.rfc-editor.org/rfc/rfc7230.txt"
+          }
+        },
+        "urlTemplate": {
+          "type": "string",
+          "description": "Relative URL template identifying the target resource for this operation. May include parameters. Example: /customers/{cid}/orders/{oid}/?date={date}",
+          "minLength": 1,
+          "maxLength": 1000
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/OperationEntityBaseContract"
+        }
+      ],
+      "required": [
+        "displayName",
+        "method",
+        "urlTemplate"
+      ],
+      "description": "Operation Contract Properties"
+    },
+    "OperationEntityBaseContract": {
+      "properties": {
+        "templateParameters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ParameterContract"
+          },
+          "description": "Collection of URL template parameters."
+        },
+        "description": {
+          "type": "string",
+          "description": "Description of the operation. May include HTML formatting tags.",
+          "maxLength": 1000
+        },
+        "request": {
+          "$ref": "#/definitions/RequestContract",
+          "description": "An entity containing request details."
+        },
+        "responses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ResponseContract"
+          },
+          "description": "Array of Operation responses."
+        },
+        "policies": {
+          "type": "string",
+          "description": "Operation Policies"
+        }
+      },
+      "description": "API Operation Entity Base Contract details."
+    },
+    "OperationResultContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OperationResultContractProperties",
+          "description": "Properties of the Operation Contract."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Long Running Git Operation Results."
+    },
+    "OperationResultContractProperties": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Operation result identifier."
+        },
+        "status": {
+          "type": "string",
+          "description": "Status of an async operation.",
+          "enum": [
+            "Started",
+            "InProgress",
+            "Succeeded",
+            "Failed"
+          ],
+          "x-ms-enum": {
+            "name": "AsyncOperationStatus",
+            "modelAsString": false
+          }
+        },
+        "started": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Start time of an async operation. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "updated": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Last update time of an async operation. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "resultInfo": {
+          "type": "string",
+          "description": "Optional result info."
+        },
+        "error": {
+          "$ref": "./apimanagement.json#/definitions/ErrorResponseBody",
+          "description": "Error Body Contract"
+        },
+        "actionLog": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/OperationResultLogItemContract"
+          },
+          "readOnly": true,
+          "description": "This property if only provided as part of the TenantConfiguration_Validate operation. It contains the log the entities which will be updated/created/deleted as part of the TenantConfiguration_Deploy operation."
+        }
+      },
+      "description": "Operation Result."
+    },
+    "OperationResultLogItemContract": {
+      "properties": {
+        "objectType": {
+          "type": "string",
+          "description": "The type of entity contract."
+        },
+        "action": {
+          "type": "string",
+          "description": "Action like create/update/delete."
+        },
+        "objectKey": {
+          "type": "string",
+          "description": "Identifier of the entity being created/updated/deleted."
+        }
+      },
+      "description": "Log of the entity being created, updated or deleted."
+    },
+    "OperationTagResourceContractProperties": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Identifier of the operation in form /operations/{operationId}."
+        },
+        "name": {
+          "type": "string",
+          "description": "Operation name.",
+          "readOnly": true
+        },
+        "apiName": {
+          "type": "string",
+          "description": "API Name.",
+          "readOnly": true
+        },
+        "apiRevision": {
+          "type": "string",
+          "description": "API Revision.",
+          "readOnly": true
+        },
+        "apiVersion": {
+          "type": "string",
+          "description": "API Version.",
+          "readOnly": true
+        },
+        "description": {
+          "type": "string",
+          "description": "Operation Description.",
+          "readOnly": true
+        },
+        "method": {
+          "type": "string",
+          "description": "A Valid HTTP Operation Method. Typical Http Methods like GET, PUT, POST but not limited by only them.",
+          "externalDocs": {
+            "description": "As defined by RFC.",
+            "url": "http://www.rfc-editor.org/rfc/rfc7230.txt"
+          },
+          "readOnly": true
+        },
+        "urlTemplate": {
+          "type": "string",
+          "description": "Relative URL template identifying the target resource for this operation. May include parameters. Example: /customers/{cid}/orders/{oid}/?date={date}",
+          "readOnly": true
+        }
+      },
+      "description": "Operation Entity contract Properties."
+    },
+    "OperationUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OperationUpdateContractProperties",
+          "description": "Properties of the API Operation entity that can be updated."
+        }
+      },
+      "description": "API Operation Update Contract details."
+    },
+    "OperationUpdateContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Operation Name.",
+          "minLength": 1,
+          "maxLength": 300
+        },
+        "method": {
+          "type": "string",
+          "description": "A Valid HTTP Operation Method. Typical Http Methods like GET, PUT, POST but not limited by only them.",
+          "externalDocs": {
+            "description": "As defined by RFC.",
+            "url": "http://www.rfc-editor.org/rfc/rfc7230.txt"
+          }
+        },
+        "urlTemplate": {
+          "type": "string",
+          "description": "Relative URL template identifying the target resource for this operation. May include parameters. Example: /customers/{cid}/orders/{oid}/?date={date}",
+          "minLength": 1,
+          "maxLength": 1000
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/OperationEntityBaseContract"
+        }
+      ],
+      "description": "Operation Update Contract Properties."
+    },
+    "ParameterContract": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Parameter name."
+        },
+        "description": {
+          "type": "string",
+          "description": "Parameter description."
+        },
+        "type": {
+          "type": "string",
+          "description": "Parameter type."
+        },
+        "defaultValue": {
+          "type": "string",
+          "description": "Default parameter value."
+        },
+        "required": {
+          "type": "boolean",
+          "description": "Specifies whether parameter is required or not."
+        },
+        "values": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Parameter values."
+        },
+        "schemaId": {
+          "type": "string",
+          "description": "Schema identifier."
+        },
+        "typeName": {
+          "type": "string",
+          "description": "Type name defined by the schema."
+        },
+        "examples": {
+          "$ref": "#/definitions/ParameterExamplesContract",
+          "description": "Exampled defined for the parameter."
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ],
+      "description": "Operation parameters details."
+    },
+    "ParameterExamplesContract": {
+      "additionalProperties": {
+        "$ref": "#/definitions/ParameterExampleContract",
+        "description": "Parameter example."
+      },
+      "description": "Parameter examples."
+    },
+    "ParameterExampleContract": {
+      "description": "Parameter example.",
+      "properties": {
+        "summary": {
+          "type": "string",
+          "description": "Short description for the example"
+        },
+        "description": {
+          "type": "string",
+          "description": "Long description for the example"
+        },
+        "value": {
+          "description": "Example value. May be a primitive value, or an object."
+        },
+        "externalValue": {
+          "type": "string",
+          "description": "A URL that points to the literal example"
+        }
+      }
+    },
+    "PipelineDiagnosticSettings": {
+      "properties": {
+        "request": {
+          "$ref": "#/definitions/HttpMessageDiagnostic",
+          "description": "Diagnostic settings for request."
+        },
+        "response": {
+          "$ref": "#/definitions/HttpMessageDiagnostic",
+          "description": "Diagnostic settings for response."
+        }
+      },
+      "description": "Diagnostic settings for incoming/outgoing HTTP messages to the Gateway."
+    },
+    "PolicyCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PolicyContract"
+          },
+          "description": "Policy Contract value."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "The response of the list policy operation."
+    },
+    "PolicyContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PolicyContractProperties",
+          "description": "Properties of the Policy."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Policy Contract details."
+    },
+    "PolicyContractProperties": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "Contents of the Policy as defined by the format."
+        },
+        "format": {
+          "type": "string",
+          "description": "Format of the policyContent.",
+          "enum": [
+            "xml",
+            "xml-link",
+            "rawxml",
+            "rawxml-link"
+          ],
+          "x-ms-enum": {
+            "name": "PolicyContentFormat",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "xml",
+                "description": "The contents are inline and Content type is an XML document."
+              },
+              {
+                "value": "xml-link",
+                "description": "The policy XML document is hosted on a http endpoint accessible from the API Management service."
+              },
+              {
+                "value": "rawxml",
+                "description": "The contents are inline and Content type is a non XML encoded policy document."
+              },
+              {
+                "value": "rawxml-link",
+                "description": "The policy document is not Xml encoded and is hosted on a http endpoint accessible from the API Management service."
+              }
+            ]
+          },
+          "default": "xml"
+        }
+      },
+      "required": [
+        "value"
+      ],
+      "description": "Policy contract Properties."
+    },
+    "PolicyDescriptionContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PolicyDescriptionContractProperties",
+          "description": "Policy description contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Policy description details."
+    },
+    "PolicyDescriptionContractProperties": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Policy description.",
+          "readOnly": true
+        },
+        "scope": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Binary OR value of the Snippet scope.",
+          "readOnly": true
+        }
+      },
+      "description": "Policy description properties."
+    },
+    "PolicyDescriptionCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PolicyDescriptionContract"
+          },
+          "description": "Descriptions of APIM policies."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number."
+        }
+      },
+      "description": "Descriptions of APIM policies."
+    },
+    "PortalDelegationSettings": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PortalDelegationSettingsProperties",
+          "description": "Delegation settings contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Delegation settings for a developer portal."
+    },
+    "PortalDelegationSettingsProperties": {
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "A delegation Url."
+        },
+        "validationKey": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "A base64-encoded validation key to validate, that a request is coming from Azure API Management."
+        },
+        "subscriptions": {
+          "$ref": "#/definitions/SubscriptionsDelegationSettingsProperties",
+          "description": "Subscriptions delegation settings."
+        },
+        "userRegistration": {
+          "$ref": "#/definitions/RegistrationDelegationSettingsProperties",
+          "description": "User registration delegation settings."
+        }
+      },
+      "description": "Delegation settings contract properties."
+    },
+    "PortalSettingsCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PortalSettingsContract"
+          },
+          "description": "Descriptions of APIM policies."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number."
+        }
+      },
+      "description": "Descriptions of APIM policies."
+    },
+    "PortalSettingsContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PortalSettingsContractProperties",
+          "description": "Portal Settings contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Portal Settings for the Developer Portal."
+    },
+    "PortalSettingsContractProperties": {
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "A delegation Url."
+        },
+        "validationKey": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "A base64-encoded validation key to validate, that a request is coming from Azure API Management."
+        },
+        "subscriptions": {
+          "$ref": "#/definitions/SubscriptionsDelegationSettingsProperties",
+          "description": "Subscriptions delegation settings."
+        },
+        "userRegistration": {
+          "$ref": "#/definitions/RegistrationDelegationSettingsProperties",
+          "description": "User registration delegation settings."
+        },
+        "enabled": {
+          "type": "boolean",
+          "description": "Redirect Anonymous users to the Sign-In page."
+        },
+        "termsOfService": {
+          "type": "object",
+          "$ref": "#/definitions/TermsOfServiceProperties",
+          "description": "Terms of service contract properties."
+        }
+      },
+      "description": "Sign-in settings contract properties."
+    },
+    "PortalSigninSettingProperties": {
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Redirect Anonymous users to the Sign-In page."
+        }
+      },
+      "description": "Sign-in settings contract properties."
+    },
+    "PortalSigninSettings": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PortalSigninSettingProperties",
+          "description": "Sign-in settings contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Sign-In settings for the Developer Portal."
+    },
+    "PortalSignupSettings": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PortalSignupSettingsProperties",
+          "description": "Sign-up settings contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Sign-Up settings for a developer portal."
+    },
+    "PortalSignupSettingsProperties": {
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Allow users to sign up on a developer portal."
+        },
+        "termsOfService": {
+          "type": "object",
+          "$ref": "#/definitions/TermsOfServiceProperties",
+          "description": "Terms of service contract properties."
+        }
+      },
+      "description": "Sign-up settings contract properties."
+    },
+    "ProductCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ProductContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Products list representation."
+    },
+    "ProductContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ProductContractProperties",
+          "description": "Product entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Product details."
+    },
+    "ProductContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Product name.",
+          "minLength": 1,
+          "maxLength": 300
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ProductEntityBaseParameters"
+        }
+      ],
+      "required": [
+        "displayName"
+      ],
+      "description": "Product profile."
+    },
+    "ProductEntityBaseParameters": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Product description. May include HTML formatting tags.",
+          "minLength": 0,
+          "maxLength": 1000
+        },
+        "terms": {
+          "type": "string",
+          "description": "Product terms of use. Developers trying to subscribe to the product will be presented and required to accept these terms before they can complete the subscription process."
+        },
+        "subscriptionRequired": {
+          "description": "Whether a product subscription is required for accessing APIs included in this product. If true, the product is referred to as \"protected\" and a valid subscription key is required for a request to an API included in the product to succeed. If false, the product is referred to as \"open\" and requests to an API included in the product can be made without a subscription key. If property is omitted when creating a new product it's value is assumed to be true.",
+          "type": "boolean"
+        },
+        "approvalRequired": {
+          "description": "whether subscription approval is required. If false, new subscriptions will be approved automatically enabling developers to call the product’s APIs immediately after subscribing. If true, administrators must manually approve the subscription before the developer can any of the product’s APIs. Can be present only if subscriptionRequired property is present and has a value of false.",
+          "type": "boolean"
+        },
+        "subscriptionsLimit": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Whether the number of subscriptions a user can have to this product at the same time. Set to null or omit to allow unlimited per user subscriptions. Can be present only if subscriptionRequired property is present and has a value of false."
+        },
+        "state": {
+          "type": "string",
+          "description": "whether product is published or not. Published products are discoverable by users of developer portal. Non published products are visible only to administrators. Default state of Product is notPublished.",
+          "enum": [
+            "notPublished",
+            "published"
+          ],
+          "x-ms-enum": {
+            "name": "ProductState",
+            "modelAsString": false
+          }
+        }
+      },
+      "description": "Product Entity Base Parameters"
+    },
+    "ProductTagResourceContractProperties": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Identifier of the product in the form of /products/{productId}"
+        },
+        "name": {
+          "type": "string",
+          "description": "Product name.",
+          "minLength": 1,
+          "maxLength": 300
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./definitions.json#/definitions/ProductEntityBaseParameters"
+        }
+      ],
+      "required": [
+        "name"
+      ],
+      "description": "Product profile."
+    },
+    "ProductUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ProductUpdateProperties",
+          "description": "Product entity Update contract properties."
+        }
+      },
+      "description": "Product Update parameters."
+    },
+    "ProductUpdateProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Product name.",
+          "maxLength": 300,
+          "minLength": 1
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ProductEntityBaseParameters"
+        }
+      ],
+      "description": "Parameters supplied to the Update Product operation."
+    },
+    "NamedValueCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NamedValueContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged NamedValue list representation."
+    },
+    "NamedValueCreateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NamedValueCreateContractProperties",
+          "description": "NamedValue entity contract properties for PUT operation."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "NamedValue details."
+    },
+    "NamedValueCreateContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Unique name of NamedValue. It may contain only letters, digits, period, dash, and underscore characters.",
+          "minLength": 1,
+          "maxLength": 256,
+          "pattern": "^[A-Za-z0-9-._]+$"
+        },
+        "value": {
+          "type": "string",
+          "description": "Value of the NamedValue. Can contain policy expressions. It may not be empty or consist only of whitespace. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
+          "maxLength": 4096
+        },
+        "keyVault": {
+          "$ref": "#/definitions/KeyVaultContractCreateProperties",
+          "description": "KeyVault location details of the namedValue."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/NamedValueEntityBaseParameters"
+        }
+      ],
+      "required": [
+        "displayName"
+      ],
+      "description": "NamedValue Contract properties."
+    },
+    "NamedValueContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NamedValueContractProperties",
+          "description": "NamedValue entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "NamedValue details."
+    },
+    "NamedValueContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Unique name of NamedValue. It may contain only letters, digits, period, dash, and underscore characters.",
+          "minLength": 1,
+          "maxLength": 256,
+          "pattern": "^[A-Za-z0-9-._]+$"
+        },
+        "value": {
+          "type": "string",
+          "description": "Value of the NamedValue. Can contain policy expressions. It may not be empty or consist only of whitespace. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
+          "maxLength": 4096
+        },
+        "keyVault": {
+          "$ref": "#/definitions/KeyVaultContractProperties",
+          "description": "KeyVault location details of the namedValue."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/NamedValueEntityBaseParameters"
+        }
+      ],
+      "required": [
+        "displayName"
+      ],
+      "description": "NamedValue Contract properties."
+    },
+    "NamedValueEntityBaseParameters": {
+      "properties": {
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "maxItems": 32,
+          "description": "Optional tags that when provided can be used to filter the NamedValue list."
+        },
+        "secret": {
+          "description": "Determines whether the value is a secret and should be encrypted or not. Default value is false.",
+          "type": "boolean"
+        }
+      },
+      "description": "NamedValue Entity Base Parameters set."
+    },
+    "NamedValueUpdateParameterProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Unique name of NamedValue. It may contain only letters, digits, period, dash, and underscore characters.",
+          "minLength": 1,
+          "maxLength": 256,
+          "pattern": "^[A-Za-z0-9-._]+$"
+        },
+        "value": {
+          "type": "string",
+          "description": "Value of the NamedValue. Can contain policy expressions. It may not be empty or consist only of whitespace.",
+          "minLength": 1,
+          "maxLength": 4096
+        },
+        "keyVault": {
+          "$ref": "#/definitions/KeyVaultContractCreateProperties",
+          "description": "KeyVault location details of the namedValue."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/NamedValueEntityBaseParameters"
+        }
+      ],
+      "description": "NamedValue Contract properties."
+    },
+    "NamedValueUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NamedValueUpdateParameterProperties",
+          "description": "NamedValue entity Update contract properties."
+        }
+      },
+      "description": "NamedValue update Parameters."
+    },
+    "QuotaCounterCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/QuotaCounterContract"
+          },
+          "description": "Quota counter values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Quota Counter list representation."
+    },
+    "QuotaCounterContract": {
+      "properties": {
+        "counterKey": {
+          "type": "string",
+          "description": "The Key value of the Counter. Must not be empty.",
+          "minLength": 1
+        },
+        "periodKey": {
+          "type": "string",
+          "description": "Identifier of the Period for which the counter was collected. Must not be empty.",
+          "minLength": 1
+        },
+        "periodStartTime": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The date of the start of Counter Period. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "periodEndTime": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The date of the end of Counter Period. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "value": {
+          "$ref": "#/definitions/QuotaCounterValueContractProperties",
+          "description": "Quota Value Properties"
+        }
+      },
+      "required": [
+        "counterKey",
+        "periodKey",
+        "periodStartTime",
+        "periodEndTime"
+      ],
+      "description": "Quota counter details."
+    },
+    "QuotaCounterValueContract": {
+      "properties": {
+        "value": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/QuotaCounterValueContractProperties",
+          "description": "Quota counter Value Properties."
+        }
+      },
+      "description": "Quota counter value details."
+    },
+    "QuotaCounterValueContractProperties": {
+      "properties": {
+        "callsCount": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Number of times Counter was called."
+        },
+        "kbTransferred": {
+          "type": "number",
+          "format": "double",
+          "description": "Data Transferred in KiloBytes."
+        }
+      },
+      "description": "Quota counter value details."
+    },
+    "QuotaCounterValueUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/QuotaCounterValueContractProperties",
+          "description": "Quota counter value details."
+        }
+      },
+      "description": "Quota counter value details."
+    },
+    "RecipientEmailCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RecipientEmailContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Recipient User list representation."
+    },
+    "RecipientEmailContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/RecipientEmailContractProperties",
+          "description": "Recipient Email contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Recipient Email details."
+    },
+    "RecipientEmailContractProperties": {
+      "properties": {
+        "email": {
+          "type": "string",
+          "description": "User Email subscribed to notification."
+        }
+      },
+      "description": "Recipient Email Contract Properties."
+    },
+    "RecipientsContractProperties": {
+      "properties": {
+        "emails": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of Emails subscribed for the notification."
+        },
+        "users": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of Users subscribed for the notification."
+        }
+      },
+      "description": "Notification Parameter contract."
+    },
+    "RecipientUserCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RecipientUserContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Recipient User list representation."
+    },
+    "RecipientUserContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/RecipientUsersContractProperties",
+          "description": "Recipient User entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Recipient User details."
+    },
+    "RecipientUsersContractProperties": {
+      "properties": {
+        "userId": {
+          "type": "string",
+          "description": "API Management UserId subscribed to notification."
+        }
+      },
+      "description": "Recipient User Contract Properties."
+    },
+    "RegistrationDelegationSettingsProperties": {
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Enable or disable delegation for user registration."
+        }
+      },
+      "description": "User registration delegation settings properties."
+    },
+    "ReportCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ReportRecordContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Report records list representation."
+    },
+    "ReportRecordContract": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name depending on report endpoint specifies product, API, operation or developer name."
+        },
+        "timestamp": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Start of aggregation period. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "interval": {
+          "type": "string",
+          "description": "Length of aggregation period.  Interval must be multiple of 15 minutes and may not be zero. The value should be in ISO 8601 format (http://en.wikipedia.org/wiki/ISO_8601#Durations)."
+        },
+        "country": {
+          "type": "string",
+          "description": "Country to which this record data is related."
+        },
+        "region": {
+          "type": "string",
+          "description": "Country region to which this record data is related."
+        },
+        "zip": {
+          "type": "string",
+          "description": "Zip code to which this record data is related."
+        },
+        "userId": {
+          "readOnly": true,
+          "type": "string",
+          "description": "User identifier path. /users/{userId}"
+        },
+        "productId": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Product identifier path. /products/{productId}"
+        },
+        "apiId": {
+          "type": "string",
+          "description": "API identifier path. /apis/{apiId}"
+        },
+        "operationId": {
+          "type": "string",
+          "description": "Operation identifier path. /apis/{apiId}/operations/{operationId}"
+        },
+        "apiRegion": {
+          "type": "string",
+          "description": "API region identifier."
+        },
+        "subscriptionId": {
+          "type": "string",
+          "description": "Subscription identifier path. /subscriptions/{subscriptionId}"
+        },
+        "callCountSuccess": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Number of successful calls. This includes calls returning HttpStatusCode <= 301 and HttpStatusCode.NotModified and HttpStatusCode.TemporaryRedirect"
+        },
+        "callCountBlocked": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Number of calls blocked due to invalid credentials. This includes calls returning HttpStatusCode.Unauthorized and HttpStatusCode.Forbidden and HttpStatusCode.TooManyRequests"
+        },
+        "callCountFailed": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Number of calls failed due to proxy or backend errors. This includes calls returning HttpStatusCode.BadRequest(400) and any Code between HttpStatusCode.InternalServerError (500) and 600"
+        },
+        "callCountOther": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Number of other calls."
+        },
+        "callCountTotal": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Total number of calls."
+        },
+        "bandwidth": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Bandwidth consumed."
+        },
+        "cacheHitCount": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Number of times when content was served from cache policy."
+        },
+        "cacheMissCount": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Number of times content was fetched from backend."
+        },
+        "apiTimeAvg": {
+          "type": "number",
+          "format": "double",
+          "description": "Average time it took to process request."
+        },
+        "apiTimeMin": {
+          "type": "number",
+          "format": "double",
+          "description": "Minimum time it took to process request."
+        },
+        "apiTimeMax": {
+          "type": "number",
+          "format": "double",
+          "description": "Maximum time it took to process request."
+        },
+        "serviceTimeAvg": {
+          "type": "number",
+          "format": "double",
+          "description": "Average time it took to process request on backend."
+        },
+        "serviceTimeMin": {
+          "type": "number",
+          "format": "double",
+          "description": "Minimum time it took to process request on backend."
+        },
+        "serviceTimeMax": {
+          "type": "number",
+          "format": "double",
+          "description": "Maximum time it took to process request on backend."
+        }
+      },
+      "description": "Report data."
+    },
+    "RepresentationContract": {
+      "properties": {
+        "contentType": {
+          "type": "string",
+          "description": "Specifies a registered or custom content type for this representation, e.g. application/xml."
+        },
+        "schemaId": {
+          "type": "string",
+          "description": "Schema identifier. Applicable only if 'contentType' value is neither 'application/x-www-form-urlencoded' nor 'multipart/form-data'."
+        },
+        "typeName": {
+          "type": "string",
+          "description": "Type name defined by the schema. Applicable only if 'contentType' value is neither 'application/x-www-form-urlencoded' nor 'multipart/form-data'."
+        },
+        "formParameters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ParameterContract"
+          },
+          "description": "Collection of form parameters. Required if 'contentType' value is either 'application/x-www-form-urlencoded' or 'multipart/form-data'.."
+        },
+        "examples": {
+          "$ref": "#/definitions/ParameterExamplesContract",
+          "description": "Exampled defined for the representation."
+        }
+      },
+      "required": [
+        "contentType"
+      ],
+      "description": "Operation request/response representation details."
+    },
+    "RequestContract": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Operation request description."
+        },
+        "queryParameters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ParameterContract"
+          },
+          "description": "Collection of operation request query parameters."
+        },
+        "headers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ParameterContract"
+          },
+          "description": "Collection of operation request headers."
+        },
+        "representations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RepresentationContract"
+          },
+          "description": "Collection of operation request representations."
+        }
+      },
+      "description": "Operation request details."
+    },
+    "RequestReportCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RequestReportRecordContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        }
+      },
+      "description": "Paged Report records list representation."
+    },
+    "RequestReportRecordContract": {
+      "properties": {
+        "apiId": {
+          "type": "string",
+          "description": "API identifier path. /apis/{apiId}"
+        },
+        "operationId": {
+          "type": "string",
+          "description": "Operation identifier path. /apis/{apiId}/operations/{operationId}"
+        },
+        "productId": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Product identifier path. /products/{productId}"
+        },
+        "userId": {
+          "readOnly": true,
+          "type": "string",
+          "description": "User identifier path. /users/{userId}"
+        },
+        "method": {
+          "type": "string",
+          "description": "The HTTP method associated with this request.."
+        },
+        "url": {
+          "type": "string",
+          "description": "The full URL associated with this request."
+        },
+        "ipAddress": {
+          "type": "string",
+          "description": "The client IP address associated with this request."
+        },
+        "backendResponseCode": {
+          "type": "string",
+          "description": "The HTTP status code received by the gateway as a result of forwarding this request to the backend."
+        },
+        "responseCode": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The HTTP status code returned by the gateway."
+        },
+        "responseSize": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The size of the response returned by the gateway."
+        },
+        "timestamp": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The date and time when this request was received by the gateway in ISO 8601 format."
+        },
+        "cache": {
+          "type": "string",
+          "description": "Specifies if response cache was involved in generating the response. If the value is none, the cache was not used. If the value is hit, cached response was returned. If the value is miss, the cache was used but lookup resulted in a miss and request was fulfilled by the backend."
+        },
+        "apiTime": {
+          "type": "number",
+          "format": "double",
+          "description": "The total time it took to process this request."
+        },
+        "serviceTime": {
+          "type": "number",
+          "format": "double",
+          "description": "he time it took to forward this request to the backend and get the response back."
+        },
+        "apiRegion": {
+          "type": "string",
+          "description": "Azure region where the gateway that processed this request is located."
+        },
+        "subscriptionId": {
+          "type": "string",
+          "description": "Subscription identifier path. /subscriptions/{subscriptionId}"
+        },
+        "requestId": {
+          "type": "string",
+          "description": "Request Identifier."
+        },
+        "requestSize": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The size of this request.."
+        }
+      },
+      "description": "Request Report data."
+    },
+    "ResponseContract": {
+      "properties": {
+        "statusCode": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Operation response HTTP status code."
+        },
+        "description": {
+          "type": "string",
+          "description": "Operation response description."
+        },
+        "representations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RepresentationContract"
+          },
+          "description": "Collection of operation response representations."
+        },
+        "headers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ParameterContract"
+          },
+          "description": "Collection of operation response headers."
+        }
+      },
+      "required": [
+        "statusCode"
+      ],
+      "description": "Operation response details."
+    },
+    "SamplingSettings": {
+      "properties": {
+        "samplingType": {
+          "type": "string",
+          "description": "Sampling type.",
+          "enum": [
+            "fixed"
+          ],
+          "x-ms-enum": {
+            "name": "SamplingType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "fixed",
+                "description": "Fixed-rate sampling."
+              }
+            ]
+          }
+        },
+        "percentage": {
+          "type": "number",
+          "format": "double",
+          "minimum": 0,
+          "maximum": 100,
+          "description": "Rate of sampling for fixed-rate sampling."
+        }
+      },
+      "description": "Sampling settings for Diagnostic."
+    },
+    "SaveConfigurationParameter": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SaveConfigurationParameterProperties",
+          "description": "Properties of the Save Configuration Parameters."
+        }
+      },
+      "description": "Save Tenant Configuration Contract details."
+    },
+    "SaveConfigurationParameterProperties": {
+      "properties": {
+        "branch": {
+          "type": "string",
+          "description": "The name of the Git branch in which to commit the current configuration snapshot."
+        },
+        "force": {
+          "type": "boolean",
+          "description": "The value if true, the current configuration database is committed to the Git repository, even if the Git repository has newer changes that would be overwritten."
+        }
+      },
+      "required": [
+        "branch"
+      ],
+      "description": "Parameters supplied to the Save Tenant Configuration operation."
+    },
+    "SchemaCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SchemaContract"
+          },
+          "description": "API Schema Contract value.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "The response of the list schema operation."
+    },
+    "SchemaContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SchemaContractProperties",
+          "description": "Properties of the Schema."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Schema Contract details."
+    },
+    "SchemaContractProperties": {
+      "properties": {
+        "contentType": {
+          "type": "string",
+          "description": "Must be a valid a media type used in a Content-Type header as defined in the RFC 2616. Media type of the schema document (e.g. application/json, application/xml). </br> - `Swagger` Schema use `application/vnd.ms-azure-apim.swagger.definitions+json` </br> - `WSDL` Schema use `application/vnd.ms-azure-apim.xsd+xml` </br> - `OpenApi` Schema use `application/vnd.oai.openapi.components+json` </br> - `WADL Schema` use `application/vnd.ms-azure-apim.wadl.grammars+xml`."
+        },
+        "document": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SchemaDocumentProperties",
+          "description": "Create or update Properties of the Schema Document."
+        }
+      },
+      "required": [
+        "contentType"
+      ],
+      "description": "API Schema create or update contract Properties."
+    },
+    "SchemaDocumentProperties": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "Json escaped string defining the document representing the Schema. Used for schemas other than Swagger/OpenAPI."
+        },
+        "definitions": {
+          "type": "object",
+          "description": "Types definitions. Used for OpenAPI v2 (Swagger) schemas only, null otherwise."
+        },
+        "components": {
+          "type": "object",
+          "description": "Types definitions. Used for OpenAPI v3 schemas only, null otherwise."
+        }
+      },
+      "description": "Schema Document Properties."
+    },
+    "SubscriptionCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubscriptionContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Subscriptions list representation."
+    },
+    "SubscriptionContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SubscriptionContractProperties",
+          "description": "Subscription contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Subscription details."
+    },
+    "SubscriptionContractProperties": {
+      "properties": {
+        "ownerId": {
+          "type": "string",
+          "description": "The user resource identifier of the subscription owner. The value is a valid relative URL in the format of /users/{userId} where {userId} is a user identifier."
+        },
+        "scope": {
+          "type": "string",
+          "description": "Scope like /products/{productId} or /apis or /apis/{apiId}."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The name of the subscription, or null if the subscription has no name.",
+          "minLength": 0,
+          "maxLength": 100
+        },
+        "state": {
+          "type": "string",
+          "description": "Subscription state. Possible states are * active – the subscription is active, * suspended – the subscription is blocked, and the subscriber cannot call any APIs of the product, * submitted – the subscription request has been made by the developer, but has not yet been approved or rejected, * rejected – the subscription request has been denied by an administrator, * cancelled – the subscription has been cancelled by the developer or administrator, * expired – the subscription reached its expiration date and was deactivated.",
+          "enum": [
+            "suspended",
+            "active",
+            "expired",
+            "submitted",
+            "rejected",
+            "cancelled"
+          ],
+          "x-ms-enum": {
+            "name": "SubscriptionState",
+            "modelAsString": false
+          }
+        },
+        "createdDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Subscription creation date. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n",
+          "readOnly": true
+        },
+        "startDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Subscription activation date. The setting is for audit purposes only and the subscription is not automatically activated. The subscription lifecycle can be managed by using the `state` property. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "expirationDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Subscription expiration date. The setting is for audit purposes only and the subscription is not automatically expired. The subscription lifecycle can be managed by using the `state` property. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "endDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Date when subscription was cancelled or expired. The setting is for audit purposes only and the subscription is not automatically cancelled. The subscription lifecycle can be managed by using the `state` property. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "notificationDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Upcoming subscription expiration notification date. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "primaryKey": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Subscription primary key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "secondaryKey": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Subscription secondary key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value.",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "stateComment": {
+          "type": "string",
+          "description": "Optional subscription comment added by an administrator when the state is changed to the 'rejected'."
+        },
+        "allowTracing": {
+          "type": "boolean",
+          "description": "Determines whether tracing is enabled",
+          "x-apim-code-nillable": true
+        }
+      },
+      "required": [
+        "scope",
+        "state"
+      ],
+      "description": "Subscription details."
+    },
+    "SubscriptionCreateParameterProperties": {
+      "properties": {
+        "ownerId": {
+          "type": "string",
+          "description": "User (user id path) for whom subscription is being created in form /users/{userId}"
+        },
+        "scope": {
+          "type": "string",
+          "description": "Scope like /products/{productId} or /apis or /apis/{apiId}."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Subscription name.",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "primaryKey": {
+          "type": "string",
+          "description": "Primary subscription key. If not specified during request key will be generated automatically.",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "secondaryKey": {
+          "type": "string",
+          "description": "Secondary subscription key. If not specified during request key will be generated automatically.",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "state": {
+          "type": "string",
+          "description": "Initial subscription state. If no value is specified, subscription is created with Submitted state. Possible states are * active – the subscription is active, * suspended – the subscription is blocked, and the subscriber cannot call any APIs of the product, * submitted – the subscription request has been made by the developer, but has not yet been approved or rejected, * rejected – the subscription request has been denied by an administrator, * cancelled – the subscription has been cancelled by the developer or administrator, * expired – the subscription reached its expiration date and was deactivated.",
+          "enum": [
+            "suspended",
+            "active",
+            "expired",
+            "submitted",
+            "rejected",
+            "cancelled"
+          ],
+          "x-ms-enum": {
+            "name": "SubscriptionState",
+            "modelAsString": false
+          }
+        },
+        "allowTracing": {
+          "type": "boolean",
+          "description": "Determines whether tracing can be enabled"
+        }
+      },
+      "required": [
+        "scope",
+        "displayName"
+      ],
+      "description": "Parameters supplied to the Create subscription operation."
+    },
+    "SubscriptionCreateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SubscriptionCreateParameterProperties",
+          "description": "Subscription contract properties."
+        }
+      },
+      "description": "Subscription create details."
+    },
+    "SubscriptionKeyParameterNamesContract": {
+      "properties": {
+        "header": {
+          "type": "string",
+          "description": "Subscription key header name."
+        },
+        "query": {
+          "type": "string",
+          "description": "Subscription key query string parameter name."
+        }
+      },
+      "description": "Subscription key parameter names details.",
+      "example": {
+        "subscriptionKeyParameterNames": {
+          "query": "customQueryParameterName",
+          "header": "customHeaderParameterName"
+        }
+      }
+    },
+    "SubscriptionsDelegationSettingsProperties": {
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Enable or disable delegation for subscriptions."
+        }
+      },
+      "description": "Subscriptions delegation settings properties."
+    },
+    "SubscriptionUpdateParameterProperties": {
+      "properties": {
+        "ownerId": {
+          "type": "string",
+          "description": "User identifier path: /users/{userId}"
+        },
+        "scope": {
+          "type": "string",
+          "description": "Scope like /products/{productId} or /apis or /apis/{apiId}"
+        },
+        "expirationDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Subscription expiration date. The setting is for audit purposes only and the subscription is not automatically expired. The subscription lifecycle can be managed by using the `state` property. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Subscription name."
+        },
+        "primaryKey": {
+          "type": "string",
+          "description": "Primary subscription key.",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "secondaryKey": {
+          "type": "string",
+          "description": "Secondary subscription key.",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "state": {
+          "type": "string",
+          "description": "Subscription state. Possible states are * active – the subscription is active, * suspended – the subscription is blocked, and the subscriber cannot call any APIs of the product, * submitted – the subscription request has been made by the developer, but has not yet been approved or rejected, * rejected – the subscription request has been denied by an administrator, * cancelled – the subscription has been cancelled by the developer or administrator, * expired – the subscription reached its expiration date and was deactivated.",
+          "enum": [
+            "suspended",
+            "active",
+            "expired",
+            "submitted",
+            "rejected",
+            "cancelled"
+          ],
+          "x-ms-enum": {
+            "name": "SubscriptionState",
+            "modelAsString": false
+          }
+        },
+        "stateComment": {
+          "type": "string",
+          "description": "Comments describing subscription state change by the administrator when the state is changed to the 'rejected'."
+        },
+        "allowTracing": {
+          "type": "boolean",
+          "description": "Determines whether tracing can be enabled"
+        }
+      },
+      "description": "Parameters supplied to the Update subscription operation."
+    },
+    "SubscriptionUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SubscriptionUpdateParameterProperties",
+          "description": "Subscription Update contract properties."
+        }
+      },
+      "description": "Subscription update details."
+    },
+    "TagCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TagContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Tag list representation."
+    },
+    "TagContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/TagContractProperties",
+          "description": "Tag entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Tag Contract details."
+    },
+    "TagContractProperties": {
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Tag name.",
+          "maxLength": 160,
+          "minLength": 1
+        }
+      },
+      "required": [
+        "displayName"
+      ],
+      "description": "Tag contract Properties."
+    },
+    "TagCreateUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/TagContractProperties",
+          "description": "Properties supplied to Create Tag operation."
+        }
+      },
+      "description": "Parameters supplied to Create/Update Tag operations."
+    },
+    "TagDescriptionBaseProperties": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Description of the Tag."
+        },
+        "externalDocsUrl": {
+          "type": "string",
+          "description": "Absolute URL of external resources describing the tag.",
+          "maxLength": 2000
+        },
+        "externalDocsDescription": {
+          "type": "string",
+          "description": "Description of the external resources describing the tag."
+        }
+      },
+      "description": "Parameters supplied to the Create TagDescription operation."
+    },
+    "TagDescriptionCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TagDescriptionContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged TagDescription list representation."
+    },
+    "TagDescriptionContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/TagDescriptionContractProperties",
+          "description": "TagDescription entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Contract details."
+    },
+    "TagDescriptionContractProperties": {
+      "properties": {
+        "tagId": {
+          "type": "string",
+          "description": "Identifier of the tag in the form of /tags/{tagId}"
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Tag name.",
+          "maxLength": 160,
+          "minLength": 1
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/TagDescriptionBaseProperties"
+        }
+      ],
+      "description": "TagDescription contract Properties."
+    },
+    "TagDescriptionCreateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/TagDescriptionBaseProperties",
+          "description": "Properties supplied to Create TagDescription operation."
+        }
+      },
+      "description": "Parameters supplied to the Create TagDescription operation."
+    },
+    "TagResourceCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TagResourceContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Tag list representation."
+    },
+    "TagResourceContract": {
+      "properties": {
+        "tag": {
+          "$ref": "#/definitions/TagTagResourceContractProperties",
+          "description": "Tag associated with the resource."
+        },
+        "api": {
+          "$ref": "#/definitions/ApiTagResourceContractProperties",
+          "description": "API associated with the tag."
+        },
+        "operation": {
+          "$ref": "#/definitions/OperationTagResourceContractProperties",
+          "description": "Operation associated with the tag."
+        },
+        "product": {
+          "$ref": "#/definitions/ProductTagResourceContractProperties",
+          "description": "Product associated with the tag."
+        }
+      },
+      "required": [
+        "tag"
+      ],
+      "description": "TagResource contract properties."
+    },
+    "TagTagResourceContractProperties": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Tag identifier"
+        },
+        "name": {
+          "type": "string",
+          "description": "Tag Name",
+          "minLength": 1,
+          "maxLength": 160
+        }
+      },
+      "description": "Contract defining the Tag property in the Tag Resource Contract"
+    },
+    "TenantConfigurationSyncStateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/TenantConfigurationSyncStateContractProperties",
+          "description": "Properties returned Tenant Configuration Sync State check."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Result of Tenant Configuration Sync State."
+    },
+    "TenantConfigurationSyncStateContractProperties": {
+      "properties": {
+        "branch": {
+          "type": "string",
+          "description": "The name of Git branch."
+        },
+        "commitId": {
+          "type": "string",
+          "description": "The latest commit Id."
+        },
+        "isExport": {
+          "type": "boolean",
+          "description": "value indicating if last sync was save (true) or deploy (false) operation."
+        },
+        "isSynced": {
+          "type": "boolean",
+          "description": "value indicating if last synchronization was later than the configuration change."
+        },
+        "isGitEnabled": {
+          "type": "boolean",
+          "description": "value indicating whether Git configuration access is enabled."
+        },
+        "syncDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The date of the latest synchronization. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "configurationChangeDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The date of the latest configuration change. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "lastOperationId": {
+          "type": "string",
+          "description": "Most recent tenant configuration operation identifier"
+        }
+      },
+      "description": "Tenant Configuration Synchronization State."
+    },
+    "TermsOfServiceProperties": {
+      "properties": {
+        "text": {
+          "type": "string",
+          "description": "A terms of service text."
+        },
+        "enabled": {
+          "type": "boolean",
+          "description": "Display terms of service during a sign-up process."
+        },
+        "consentRequired": {
+          "type": "boolean",
+          "description": "Ask user for consent to the terms of service."
+        }
+      },
+      "description": "Terms of service contract properties."
+    },
+    "TokenBodyParameterContract": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "body parameter name."
+        },
+        "value": {
+          "type": "string",
+          "description": "body parameter value."
+        }
+      },
+      "required": [
+        "name",
+        "value"
+      ],
+      "description": "OAuth acquire token request body parameter (www-url-form-encoded)."
+    },
+    "UserCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/UserContract"
+          },
+          "description": "Page values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "Paged Users list representation."
+    },
+    "UserContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/UserContractProperties",
+          "description": "User entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "User details."
+    },
+    "UserContractProperties": {
+      "properties": {
+        "firstName": {
+          "type": "string",
+          "description": "First name."
+        },
+        "lastName": {
+          "type": "string",
+          "description": "Last name."
+        },
+        "email": {
+          "type": "string",
+          "description": "Email address."
+        },
+        "registrationDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Date of user registration. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        },
+        "groups": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "./definitions.json#/definitions/GroupContractProperties"
+          },
+          "description": "Collection of groups user is part of."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/UserEntityBaseParameters"
+        }
+      ],
+      "description": "User profile."
+    },
+    "UserCreateParameterProperties": {
+      "properties": {
+        "email": {
+          "type": "string",
+          "description": "Email address. Must not be empty and must be unique within the service instance.",
+          "minLength": 1,
+          "maxLength": 254
+        },
+        "firstName": {
+          "type": "string",
+          "description": "First name.",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "lastName": {
+          "type": "string",
+          "description": "Last name.",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "password": {
+          "type": "string",
+          "description": "User Password. If no value is provided, a default password is generated."
+        },
+        "appType": {
+          "type": "string",
+          "description": "Determines the type of application which send the create user request. Default is legacy portal.",
+          "enum": [
+            "portal",
+            "developerPortal"
+          ],
+          "x-ms-enum": {
+            "name": "AppType",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "portal",
+                "description": "User create request was sent by legacy developer portal."
+              },
+              {
+                "value": "developerPortal",
+                "description": "User create request was sent by new developer portal."
+              }
+            ]
+          }
+        },
+        "confirmation": {
+          "type": "string",
+          "description": "Determines the type of confirmation e-mail that will be sent to the newly created user.",
+          "enum": [
+            "signup",
+            "invite"
+          ],
+          "x-ms-enum": {
+            "name": "Confirmation",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "signup",
+                "description": "Send an e-mail to the user confirming they have successfully signed up."
+              },
+              {
+                "value": "invite",
+                "description": "Send an e-mail inviting the user to sign-up and complete registration."
+              }
+            ]
+          }
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/UserEntityBaseParameters"
+        }
+      ],
+      "required": [
+        "email",
+        "firstName",
+        "lastName"
+      ],
+      "description": "Parameters supplied to the Create User operation."
+    },
+    "UserCreateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/UserCreateParameterProperties",
+          "description": "User entity create contract properties."
+        }
+      },
+      "description": "User create details."
+    },
+    "UserEntityBaseParameters": {
+      "properties": {
+        "state": {
+          "type": "string",
+          "description": "Account state. Specifies whether the user is active or not. Blocked users are unable to sign into the developer portal or call any APIs of subscribed products. Default state is Active.",
+          "enum": [
+            "active",
+            "blocked",
+            "pending",
+            "deleted"
+          ],
+          "default": "active",
+          "x-ms-enum": {
+            "name": "UserState",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "active",
+                "description": "User state is active."
+              },
+              {
+                "value": "blocked",
+                "description": "User is blocked. Blocked users cannot authenticate at developer portal or call API."
+              },
+              {
+                "value": "pending",
+                "description": "User account is pending. Requires identity confirmation before it can be made active."
+              },
+              {
+                "value": "deleted",
+                "description": "User account is closed. All identities and related entities are removed."
+              }
+            ]
+          }
+        },
+        "note": {
+          "type": "string",
+          "description": "Optional note about a user set by the administrator."
+        },
+        "identities": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/UserIdentityContract"
+          },
+          "description": "Collection of user identities."
+        }
+      },
+      "description": "User Entity Base Parameters set."
+    },
+    "UserIdentityCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/UserIdentityContract"
+          },
+          "description": "User Identity values."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any."
+        }
+      },
+      "description": "List of Users Identity list representation."
+    },
+    "UserIdentityContract": {
+      "properties": {
+        "provider": {
+          "type": "string",
+          "description": "Identity provider name."
+        },
+        "id": {
+          "type": "string",
+          "description": "Identifier value within provider."
+        }
+      },
+      "description": "User identity details."
+    },
+    "UserTokenParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/UserTokenParameterProperties",
+          "description": "User Token Parameter contract properties."
+        }
+      },
+      "description": "Get User Token parameters."
+    },
+    "UserTokenParameterProperties": {
+      "properties": {
+        "keyType": {
+          "type": "string",
+          "description": "The Key to be used to generate token for user.",
+          "enum": [
+            "primary",
+            "secondary"
+          ],
+          "default": "primary",
+          "x-ms-enum": {
+            "name": "KeyType",
+            "modelAsString": false
+          }
+        },
+        "expiry": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The Expiry time of the Token. Maximum token expiry time is set to 30 days. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        }
+      },
+      "required": [
+        "keyType",
+        "expiry"
+      ],
+      "description": "Parameters supplied to the Get User Token operation."
+    },
+    "UserTokenResult": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "Shared Access Authorization token for the User."
+        }
+      },
+      "description": "Get User Token response details."
+    },
+    "UserUpdateParameters": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/UserUpdateParametersProperties",
+          "description": "User entity update contract properties."
+        }
+      },
+      "description": "User update parameters."
+    },
+    "UserUpdateParametersProperties": {
+      "properties": {
+        "email": {
+          "type": "string",
+          "description": "Email address. Must not be empty and must be unique within the service instance.",
+          "minLength": 1,
+          "maxLength": 254
+        },
+        "password": {
+          "type": "string",
+          "description": "User Password."
+        },
+        "firstName": {
+          "type": "string",
+          "description": "First name.",
+          "minLength": 1,
+          "maxLength": 100
+        },
+        "lastName": {
+          "type": "string",
+          "description": "Last name.",
+          "minLength": 1,
+          "maxLength": 100
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/UserEntityBaseParameters"
+        }
+      ],
+      "description": "Parameters supplied to the Update User operation."
+    },
+    "X509CertificateName": {
+      "properties": {
+        "name": {
+          "description": "Common Name of the Certificate.",
+          "type": "string"
+        },
+        "issuerCertificateThumbprint": {
+          "description": "Thumbprint for the Issuer of the Certificate.",
+          "type": "string"
+        }
+      },
+      "externalDocs": {
+        "url": "https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-windows-cluster-x509-security"
+      },
+      "description": "Properties of server X509Names."
+    },
+    "ClientSecretContract": {
+      "properties": {
+        "clientSecret": {
+          "type": "string",
+          "description": "Client or app secret used in IdentityProviders, Aad, OpenID or OAuth."
+        }
+      },
+      "description": "Client or app secret used in IdentityProviders, Aad, OpenID or OAuth."
+    },
+    "NamedValueSecretContract": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "This is secret value of the NamedValue entity."
+        }
+      },
+      "description": "Client or app secret used in IdentityProviders, Aad, OpenID or OAuth."
+    },
+    "PortalSettingValidationKeyContract": {
+      "properties": {
+        "validationKey": {
+          "type": "string",
+          "description": "This is secret value of the validation key in portal settings."
+        }
+      },
+      "description": "Client or app secret used in IdentityProviders, Aad, OpenID or OAuth."
+    },
+    "SubscriptionKeysContract": {
+      "properties": {
+        "primaryKey": {
+          "type": "string",
+          "description": "Subscription primary key.",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "secondaryKey": {
+          "type": "string",
+          "description": "Subscription secondary key.",
+          "minLength": 1,
+          "maxLength": 256
+        }
+      },
+      "description": "Subscription keys."
+    },
+    "GatewayCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/GatewayContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "count": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Total record count number across all pages."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged Gateway list representation."
+    },
+    "GatewayContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/GatewayContractProperties",
+          "description": "Gateway details."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Gateway details."
+    },
+    "GatewayContractProperties": {
+      "properties": {
+        "locationData": {
+          "$ref": "#/definitions/ResourceLocationDataContract",
+          "description": "Gateway location."
+        },
+        "description": {
+          "type": "string",
+          "description": "Gateway description",
+          "maxLength": 1000
+        }
+      },
+      "description": "Properties of the Gateway contract."
+    },
+    "ResourceLocationDataContract": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "A canonical name for the geographic or physical location.",
+          "maxLength": 256
+        },
+        "city": {
+          "type": "string",
+          "description": "The city or locality where the resource is located.",
+          "maxLength": 256
+        },
+        "district": {
+          "type": "string",
+          "description": "The district, state, or province where the resource is located.",
+          "maxLength": 256
+        },
+        "countryOrRegion": {
+          "type": "string",
+          "description": "The country or region where the resource is located.",
+          "maxLength": 256
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "Resource location data properties."
+    },
+    "GatewayKeysContract": {
+      "properties": {
+        "primary": {
+          "type": "string",
+          "description": "Primary gateway key."
+        },
+        "secondary": {
+          "type": "string",
+          "description": "Secondary gateway key."
+        }
+      },
+      "description": "Gateway authentication keys."
+    },
+    "GatewayTokenRequestContract": {
+      "properties": {
+        "keyType": {
+          "type": "string",
+          "description": "The Key to be used to generate gateway token.",
+          "enum": [
+            "primary",
+            "secondary"
+          ],
+          "default": "primary",
+          "x-ms-enum": {
+            "name": "KeyType",
+            "modelAsString": false
+          }
+        },
+        "expiry": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The Expiry time of the Token. Maximum token expiry time is set to 30 days. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
+        }
+      },
+      "required": [
+        "keyType",
+        "expiry"
+      ],
+      "description": "Gateway token request contract properties."
+    },
+    "GatewayTokenContract": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "Shared Access Authentication token value for the Gateway."
+        }
+      },
+      "description": "Gateway access token."
+    },
+    "GatewayKeyRegenerationRequestContract": {
+      "properties": {
+        "keyType": {
+          "type": "string",
+          "description": "The Key being regenerated.",
+          "enum": [
+            "primary",
+            "secondary"
+          ],
+          "x-ms-enum": {
+            "name": "KeyType",
+            "modelAsString": false
+          }
+        }
+      },
+      "required": [
+        "keyType"
+      ],
+      "description": "Gateway key regeneration request contract properties."
+    },
+    "GatewayHostnameConfigurationCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/GatewayHostnameConfigurationContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged Gateway hostname configuration list representation."
+    },
+    "GatewayHostnameConfigurationContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/GatewayHostnameConfigurationContractProperties",
+          "description": "Gateway hostname configuration details."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Gateway hostname configuration details."
+    },
+    "GatewayHostnameConfigurationContractProperties": {
+      "properties": {
+        "hostname": {
+          "type": "string",
+          "description": "Hostname value. Supports valid domain name, partial or full wildcard"
+        },
+        "certificateId": {
+          "type": "string",
+          "description": "Identifier of Certificate entity that will be used for TLS connection establishment"
+        },
+        "negotiateClientCertificate": {
+          "type": "boolean",
+          "description": "Determines whether gateway requests client certificate"
+        },
+        "tls10Enabled": {
+          "type": "boolean",
+          "description": "Specifies if TLS 1.0 is supported"
+        },
+        "tls11Enabled": {
+          "type": "boolean",
+          "description": "Specifies if TLS 1.1 is supported"
+        },
+        "http2Enabled": {
+          "type": "boolean",
+          "description": "Specifies if HTTP/2.0 is supported"
+        }
+      },
+      "description": "Gateway hostname configuration details."
+    },
+    "GatewayCertificateAuthorityCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/GatewayCertificateAuthorityContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged Gateway certificate authority list representation."
+    },
+    "GatewayCertificateAuthorityContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/GatewayCertificateAuthorityContractProperties",
+          "description": "Gateway certificate authority details."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Gateway certificate authority details."
+    },
+    "GatewayCertificateAuthorityContractProperties": {
+      "properties": {
+        "isTrusted": {
+          "type": "boolean",
+          "description": "Determines whether certificate authority is trusted."
+        }
+      },
+      "description": "Gateway certificate authority details."
+    },
+    "AssociationContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "properties": {
+            "provisioningState": {
+              "type": "string",
+              "description": "Provisioning state.",
+              "enum": [
+                "created"
+              ],
+              "x-ms-enum": {
+                "name": "ProvisioningState",
+                "modelAsString": false
+              }
+            }
+          },
+          "description": "Association entity contract properties."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Association entity details."
+    },
+    "ContentTypeCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ContentTypeContract"
+          },
+          "description": "Collection of content types.",
+          "readOnly": true
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link, if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged list of content types."
+    },
+    "ContentTypeContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ContentTypeContractProperties",
+          "description": "Properties of the content type."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Content type contract details."
+    },
+    "ContentTypeContractProperties": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Content type identifier"
+        },
+        "name": {
+          "type": "string",
+          "description": "Content type name. Must be 1 to 250 characters long."
+        },
+        "description": {
+          "type": "string",
+          "description": "Content type description."
+        },
+        "schema": {
+          "type": "object",
+          "description": "Content type schema."
+        },
+        "version": {
+          "type": "string",
+          "description": "Content type version."
+        }
+      }
+    },
+    "ContentItemCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ContentItemContract"
+          },
+          "description": "Collection of content items.",
+          "readOnly": true
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link, if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged list of content items."
+    },
+    "ContentItemContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ContentItemContractProperties",
+          "description": "Properties of the content item."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Content type contract details."
+    },
+    "ContentItemContractProperties": {
+      "properties": {},
+      "additionalProperties": true
+    },
+    "DeletedServicesCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DeletedServiceContract"
+          },
+          "description": "Page values.",
+          "readOnly": true
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged deleted API Management Services List Representation."
+    },
+    "DeletedServiceContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/DeletedServiceContractProperties",
+          "description": "Deleted API Management Service details."
+        },
+        "location": {
+          "readOnly": true,
+          "type": "string",
+          "description": "API Management Service Master Location."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Deleted API Management Service information."
+    },
+    "DeletedServiceContractProperties": {
+      "properties": {
+        "serviceId": {
+          "type": "string",
+          "description": "Fully-qualified API Management Service Resource ID"
+        },
+        "scheduledPurgeDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "UTC Date and Time when the service will be automatically purged. The date conforms to the following format: yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard."
+        },
+        "deletionDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "UTC Timestamp when the service was soft-deleted. The date conforms to the following format: yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard."
+        }
+      }
+    },
+    "PortalRevisionCollection": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PortalRevisionContract"
+          },
+          "description": "Collection of portal revisions.",
+          "readOnly": true
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Next page link, if any.",
+          "readOnly": true
+        }
+      },
+      "description": "Paged list of portal revisions."
+    },
+    "PortalRevisionContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PortalRevisionContractProperties",
+          "description": "Properties of the portal revisions."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "./../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
+        }
+      ],
+      "description": "Portal Revision's contract details."
+    },
+    "PortalRevisionContractProperties": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Portal revision description.",
+          "maxLength": 2000
+        },
+        "statusDetails": {
+          "type": "string",
+          "description": "Portal revision publishing status details.",
+          "maxLength": 2000,
+          "readOnly": true
+        },
+        "status": {
+          "type": "string",
+          "description": "Status of the portal's revision.",
+          "enum": [
+            "pending",
+            "publishing",
+            "completed",
+            "failed"
+          ],
+          "x-ms-enum": {
+            "modelAsString": true,
+            "name": "portalRevisionStatus",
+            "values": [
+              {
+                "value": "pending",
+                "description": "Portal's revision has been queued."
+              },
+              {
+                "value": "publishing",
+                "description": "Portal's revision is being published."
+              },
+              {
+                "value": "completed",
+                "description": "Portal's revision publishing completed."
+              },
+              {
+                "value": "failed",
+                "description": "Portal's revision publishing failed."
+              }
+            ]
+          },
+          "readOnly": true
+        },
+        "isCurrent": {
+          "type": "boolean",
+          "description": "Indicates if the portal's revision is public."
+        },
+        "createdDateTime": {
+          "type": "string",
+          "readOnly": true,
+          "format": "date-time",
+          "description": "Portal's revision creation date and time."
+        },
+        "updatedDateTime": {
+          "type": "string",
+          "readOnly": true,
+          "format": "date-time",
+          "description": "Last updated date and time."
+        }
+      }
+    },
+    "PrivateEndpointConnectionRequest": {
+      "description": "A request to approve or reject a private endpoint connection",
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "Private Endpoint Connection Resource Id.",
+          "type": "string"
+        },
+        "properties": {
+          "type": "object",
+          "description": "The connection state of the private endpoint connection.",
+          "properties": {
+            "privateLinkServiceConnectionState": {
+              "$ref": "../../../../../common-types/resource-management/v2/privatelinks.json#/definitions/PrivateLinkServiceConnectionState",
+              "description": "A collection of information about the state of the connection between service consumer and provider."
+            }
+          }
+        }
+      }
+    },
+    "RemotePrivateEndpointConnectionWrapper": {
+      "description": "Remote Private Endpoint Connection resource.",
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "Private Endpoint connection resource id",
+          "type": "string"
+        },
+        "name": {
+          "description": "Private Endpoint Connection Name",
+          "type": "string"
+        },
+        "type": {
+          "description": "Private Endpoint Connection Resource Type",
+          "type": "string"
+        },
+        "properties": {
+          "$ref": "#/definitions/PrivateEndpointConnectionWrapperProperties",
+          "x-ms-client-flatten": true,
+          "description": "Resource properties."
+        }
+      }
+    },
+    "PrivateEndpointConnectionWrapperProperties": {
+      "properties": {
+        "privateEndpoint": {
+          "$ref": "#/definitions/ArmIdWrapper",
+          "description": "The resource of private end point."
+        },
+        "privateLinkServiceConnectionState": {
+          "$ref": "../../../../../common-types/resource-management/v2/privatelinks.json#/definitions/PrivateLinkServiceConnectionState",
+          "description": "A collection of information about the state of the connection between service consumer and provider."
+        },
+        "provisioningState": {
+          "type": "string",
+          "readOnly": true,
+          "description": "The provisioning state of the private endpoint connection resource."
+        },
+        "groupIds": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "readOnly": true,
+          "description": "All the Group ids."
+        }
+      },
+      "required": [
+        "privateLinkServiceConnectionState"
+      ],
+      "description": "Properties of the PrivateEndpointConnectProperties.",
+      "type": "object"
+    },
+    "ArmIdWrapper": {
+      "description": "A wrapper for an ARM resource id",
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "ConnectivityCheckRequest": {
+      "description": "A request to perform the connectivity check operation on a API Management service.",
+      "type": "object",
+      "required": [
+        "source",
+        "destination"
+      ],
+      "properties": {
+        "source": {
+          "description": "Definitions about the connectivity check origin.",
+          "type": "object",
+          "required": [
+            "region"
+          ],
+          "properties": {
+            "region": {
+              "description": "The API Management service region from where to start the connectivity check operation.",
+              "type": "string",
+              "example": "westus"
+            },
+            "instance": {
+              "description": "The particular VMSS instance from which to fire the request.",
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        },
+        "destination": {
+          "description": "The connectivity check operation destination.",
+          "type": "object",
+          "required": [
+            "address",
+            "port"
+          ],
+          "properties": {
+            "address": {
+              "description": "Destination address. Can either be an IP address or a FQDN.",
+              "type": "string",
+              "example": "microsoft.com"
+            },
+            "port": {
+              "description": "Destination port.",
+              "type": "integer",
+              "format": "int64",
+              "example": 80
+            }
+          }
+        },
+        "preferredIPVersion": {
+          "description": "The IP version to be used. Only IPv4 is supported for now.",
+          "type": "string",
+          "enum": [
+            "IPv4"
+          ],
+          "x-ms-enum": {
+            "name": "PreferredIPVersion",
+            "modelAsString": true
+          }
+        },
+        "protocol": {
+          "description": "The request's protocol. Specific protocol configuration can be available based on this selection. The specified destination address must be coherent with this value.",
+          "type": "string",
+          "enum": [
+            "TCP",
+            "HTTP",
+            "HTTPS"
+          ],
+          "x-ms-enum": {
+            "name": "ConnectivityCheckProtocol",
+            "modelAsString": true
+          }
+        },
+        "protocolConfiguration": {
+          "description": "Protocol-specific configuration.",
+          "type": "object",
+          "properties": {
+            "HTTPConfiguration": {
+              "description": "Configuration for HTTP or HTTPS requests.",
+              "type": "object",
+              "properties": {
+                "method": {
+                  "description": "The HTTP method to be used.",
+                  "type": "string",
+                  "enum": [
+                    "GET",
+                    "POST"
+                  ],
+                  "x-ms-enum": {
+                    "name": "Method",
+                    "modelAsString": true
+                  }
+                },
+                "validStatusCodes": {
+                  "type": "array",
+                  "description": "List of HTTP status codes considered valid for the request response.",
+                  "items": {
+                    "type": "integer",
+                    "format": "int64"
+                  }
+                },
+                "headers": {
+                  "type": "array",
+                  "description": "List of headers to be included in the request.",
+                  "items": {
+                    "$ref": "#/definitions/HTTPHeader"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "HTTPHeader": {
+      "description": "HTTP header and it's value.",
+      "type": "object",
+      "required": [
+        "name",
+        "value"
+      ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Header name."
+        },
+        "value": {
+          "type": "string",
+          "description": "Header value."
+        }
+      }
+    },
+    "ConnectivityCheckResponse": {
+      "description": "Information on the connectivity status.",
+      "type": "object",
+      "properties": {
+        "hops": {
+          "readOnly": true,
+          "type": "array",
+          "description": "List of hops between the source and the destination.",
+          "items": {
+            "$ref": "#/definitions/ConnectivityHop"
+          }
+        },
+        "connectionStatus": {
+          "readOnly": true,
+          "type": "string",
+          "enum": [
+            "Unknown",
+            "Connected",
+            "Disconnected",
+            "Degraded"
+          ],
+          "x-ms-enum": {
+            "name": "ConnectionStatus",
+            "modelAsString": true
+          },
+          "description": "The connection status."
+        },
+        "avgLatencyInMs": {
+          "description": "Average latency in milliseconds.",
+          "readOnly": true,
+          "type": "integer",
+          "format": "int64"
+        },
+        "minLatencyInMs": {
+          "description": "Minimum latency in milliseconds.",
+          "readOnly": true,
+          "type": "integer",
+          "format": "int64"
+        },
+        "maxLatencyInMs": {
+          "description": "Maximum latency in milliseconds.",
+          "readOnly": true,
+          "type": "integer",
+          "format": "int64"
+        },
+        "probesSent": {
+          "description": "Total number of probes sent.",
+          "readOnly": true,
+          "type": "integer",
+          "format": "int64"
+        },
+        "probesFailed": {
+          "description": "Number of failed probes.",
+          "readOnly": true,
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
+    "ConnectivityHop": {
+      "description": "Information about a hop between the source and the destination.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "description": "The type of the hop.",
+          "readOnly": true,
+          "type": "string"
+        },
+        "id": {
+          "description": "The ID of the hop.",
+          "readOnly": true,
+          "type": "string"
+        },
+        "address": {
+          "description": "The IP address of the hop.",
+          "readOnly": true,
+          "type": "string"
+        },
+        "resourceId": {
+          "description": "The ID of the resource corresponding to this hop.",
+          "readOnly": true,
+          "type": "string"
+        },
+        "nextHopIds": {
+          "readOnly": true,
+          "type": "array",
+          "description": "List of next hop identifiers.",
+          "items": {
+            "type": "string"
+          }
+        },
+        "issues": {
+          "readOnly": true,
+          "type": "array",
+          "description": "List of issues.",
+          "items": {
+            "$ref": "#/definitions/ConnectivityIssue"
+          }
+        }
+      }
+    },
+    "ConnectivityIssue": {
+      "description": "Information about an issue encountered in the process of checking for connectivity.",
+      "type": "object",
+      "properties": {
+        "origin": {
+          "readOnly": true,
+          "type": "string",
+          "enum": [
+            "Local",
+            "Inbound",
+            "Outbound"
+          ],
+          "x-ms-enum": {
+            "name": "Origin",
+            "modelAsString": true
+          },
+          "description": "The origin of the issue."
+        },
+        "severity": {
+          "readOnly": true,
+          "type": "string",
+          "enum": [
+            "Error",
+            "Warning"
+          ],
+          "x-ms-enum": {
+            "name": "Severity",
+            "modelAsString": true
+          },
+          "description": "The severity of the issue."
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "enum": [
+            "Unknown",
+            "AgentStopped",
+            "GuestFirewall",
+            "DnsResolution",
+            "SocketBind",
+            "NetworkSecurityRule",
+            "UserDefinedRoute",
+            "PortThrottled",
+            "Platform"
+          ],
+          "x-ms-enum": {
+            "name": "IssueType",
+            "modelAsString": true
+          },
+          "description": "The type of issue."
+        },
+        "context": {
+          "readOnly": true,
+          "type": "array",
+          "description": "Provides additional context on the issue.",
+          "items": {
+            "$ref": "#/definitions/IssueContext"
+          }
+        }
+      }
+    },
+    "IssueContext": {
+      "description": "A key-value pair that provides additional context on the issue.",
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    }
+  },
+  "parameters": {}
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementApplyNetworkConfigurationUpdates.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementApplyNetworkConfigurationUpdates.json
new file mode 100644
index 000000000000..99d4241efbfe
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementApplyNetworkConfigurationUpdates.json
@@ -0,0 +1,53 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "location": "west us"
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "UID": "52ed5986-717b-45b4-b17c-3df8db372cff"
+        },
+        "location": "East Asia",
+        "etag": "AAAAAAAXX6Y=",
+        "properties": {
+          "publisherEmail": "admin@live.com",
+          "publisherName": "Contoso",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2015-09-22T01:50:34.7921566Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [],
+          "publicIPAddresses": [
+            "207.46.155.24"
+          ],
+          "virtualNetworkConfiguration": {
+            "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/eastUsVirtualNetwork/subnets/apimSubnet"
+          },
+          "virtualNetworkType": "External"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementApproveOrRejectPrivateEndpointConnection.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementApproveOrRejectPrivateEndpointConnection.json
new file mode 100644
index 000000000000..adf1ab0057ff
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementApproveOrRejectPrivateEndpointConnection.json
@@ -0,0 +1,42 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "privateEndpointConnectionName": "privateEndpointConnectionName",
+    "privateEndpointConnectionRequest": {
+      "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateEndpointConnections/connectionName",
+      "properties": {
+        "privateLinkServiceConnectionState": {
+          "status": "Approved",
+          "description": "The Private Endpoint Connection is approved."
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "name": "privateEndpointConnectionName",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateEndpointConnections/privateEndpointConnectionName",
+        "type": "Microsoft.ApiManagement/service/privateEndpointConnections",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "privateEndpoint": {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateEndpoints/privateEndpointName"
+          },
+          "privateLinkServiceConnectionState": {
+            "status": "Succeeded",
+            "description": "The request has been approved."
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json
new file mode 100644
index 000000000000..b9fe2fdca126
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "authsid": "newauthServer2"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "clientSecret": "2",
+        "resourceOwnerUsername": "un",
+        "resourceOwnerPassword": "pwd"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackendReconnect.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackendReconnect.json
new file mode 100644
index 000000000000..109a29f720d2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackendReconnect.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "backendId": "proxybackend",
+    "parameters": {
+      "properties": {
+        "after": "PT3S"
+      }
+    }
+  },
+  "responses": {
+    "202": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithAccessKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithAccessKey.json
new file mode 100644
index 000000000000..a31b3d7c57ff
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithAccessKey.json
@@ -0,0 +1,127 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "storageAccount": "teststorageaccount",
+      "containerName": "backupContainer",
+      "backupName": "apimService1backup_2017_03_19",
+      "accessType": "AccessKey",
+      "accessKey": "**************************************************"
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAACXok=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-12-18T06:26:20.3348609Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-westus-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false
+            },
+            {
+              "type": "Proxy",
+              "hostName": "gateway1.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": true
+            },
+            {
+              "type": "Management",
+              "hostName": "mgmt.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false
+            },
+            {
+              "type": "Portal",
+              "hostName": "portal1.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false
+            }
+          ],
+          "publicIPAddresses": [
+            "13.91.32.113"
+          ],
+          "additionalLocations": [
+            {
+              "location": "East US",
+              "sku": {
+                "name": "Premium",
+                "capacity": 1
+              },
+              "publicIPAddresses": [
+                "23.101.138.153"
+              ],
+              "gatewayRegionalUrl": "https://apimService1-eastus-01.regional.azure-api.net",
+              "disableGateway": true
+            }
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "apiVersionConstraint": {
+            "minApiVersion": "2019-01-01"
+          }
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithSystemManagedIdentity.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithSystemManagedIdentity.json
new file mode 100644
index 000000000000..c9ffbb861919
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithSystemManagedIdentity.json
@@ -0,0 +1,97 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "storageAccount": "contosorpstorage",
+      "containerName": "apim-backups",
+      "backupName": "backup5",
+      "accessType": "SystemAssignedManagedIdentity"
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "Owner": "apimService1"
+        },
+        "location": "Central US EUAP",
+        "etag": "AAAAAAAQM8o=",
+        "properties": {
+          "publisherEmail": "apimService1@corp.microsoft.com",
+          "publisherName": "MS",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2020-04-23T16:26:47.8637967Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-centraluseuap-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "publicIPAddresses": [
+            "52.XXXX.160.66"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "publicNetworkAccess": "Enabled",
+          "platformVersion": "stv1"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        },
+        "identity": {
+          "type": "SystemAssigned, UserAssigned",
+          "principalId": "XXXXX-5fb4-4916-95d4-64b306f9d924",
+          "tenantId": "XXXXX-86f1-XXXXX-91ab-2d7cd011db47",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/rg1UserIdentity": {
+              "principalId": "XXXXX-a100-4478-XXXX-d65d98118ba0",
+              "clientId": "XXXXX-a154-4830-XXXX-46a12da1a1e2"
+            },
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/vpnpremium": {
+              "principalId": "XXXXX-9208-4128-af2d-a10d2af9b5a3",
+              "clientId": "XXXX-6328-4db2-XXXX-ab0e3e7806cf"
+            }
+          }
+        },
+        "systemData": {
+          "lastModifiedBy": "contoso@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2021-06-30T06:24:57.0008037Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithUserAssignedManagedIdentity.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithUserAssignedManagedIdentity.json
new file mode 100644
index 000000000000..2b20bfbf91f5
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementBackupWithUserAssignedManagedIdentity.json
@@ -0,0 +1,98 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "storageAccount": "contosorpstorage",
+      "containerName": "apim-backups",
+      "backupName": "backup5",
+      "accessType": "UserAssignedManagedIdentity",
+      "clientId": "XXXXX-a154-4830-XXXX-46a12da1a1e2"
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "Owner": "apimService1"
+        },
+        "location": "Central US EUAP",
+        "etag": "AAAAAAAQM8o=",
+        "properties": {
+          "publisherEmail": "apimService1@corp.microsoft.com",
+          "publisherName": "MS",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2020-04-23T16:26:47.8637967Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-centraluseuap-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "publicIPAddresses": [
+            "52.XXXX.160.66"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "publicNetworkAccess": "Enabled",
+          "platformVersion": "stv1"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        },
+        "identity": {
+          "type": "SystemAssigned, UserAssigned",
+          "principalId": "XXXXX-5fb4-4916-95d4-64b306f9d924",
+          "tenantId": "XXXXX-86f1-XXXXX-91ab-2d7cd011db47",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/rg1UserIdentity": {
+              "principalId": "XXXXX-a100-4478-XXXX-d65d98118ba0",
+              "clientId": "XXXXX-a154-4830-XXXX-46a12da1a1e2"
+            },
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/vpnpremium": {
+              "principalId": "XXXXX-9208-4128-af2d-a10d2af9b5a3",
+              "clientId": "XXXX-6328-4db2-XXXX-ab0e3e7806cf"
+            }
+          }
+        },
+        "systemData": {
+          "lastModifiedBy": "contoso@microsoft.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2021-06-30T06:24:57.0008037Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateAILogger.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateAILogger.json
new file mode 100644
index 000000000000..013087589dce
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateAILogger.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "loggerId": "loggerId",
+    "parameters": {
+      "properties": {
+        "loggerType": "applicationInsights",
+        "description": "adding a new logger",
+        "credentials": {
+          "instrumentationKey": "11................a1"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/loggerId",
+        "type": "Microsoft.ApiManagement/service/loggers",
+        "name": "loggerId",
+        "properties": {
+          "loggerType": "applicationInsights",
+          "description": null,
+          "credentials": {
+            "instrumentationKey": "{{5a.......2a}}"
+          },
+          "isBuffered": false,
+          "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/microsoft.insights/components/airesource"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/loggerId",
+        "type": "Microsoft.ApiManagement/service/loggers",
+        "name": "loggerId",
+        "properties": {
+          "loggerType": "applicationInsights",
+          "description": null,
+          "credentials": {
+            "instrumentationKey": "{{5a.......2a}}"
+          },
+          "isBuffered": false
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApi.json
new file mode 100644
index 000000000000..8d02ff82222f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApi.json
@@ -0,0 +1,98 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "tempgroup",
+    "parameters": {
+      "properties": {
+        "description": "apidescription5200",
+        "authenticationSettings": {
+          "oAuth2": {
+            "authorizationServerId": "authorizationServerId2283",
+            "scope": "oauth2scope2580"
+          }
+        },
+        "subscriptionKeyParameterNames": {
+          "header": "header4520",
+          "query": "query3037"
+        },
+        "displayName": "apiname1463",
+        "serviceUrl": "http://newechoapi.cloudapp.net/api",
+        "path": "newapiPath",
+        "protocols": [
+          "https",
+          "http"
+        ]
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apiid9419",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "apiid9419",
+        "properties": {
+          "displayName": "apiname1463",
+          "apiRevision": "1",
+          "description": "apidescription5200",
+          "serviceUrl": "http://newechoapi.cloudapp.net/api",
+          "path": "newapiPath",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "authenticationSettings": {
+            "oAuth2": {
+              "authorizationServerId": "authorizationServerId2283",
+              "scope": "oauth2scope2580"
+            }
+          },
+          "subscriptionKeyParameterNames": {
+            "header": "header4520",
+            "query": "query3037"
+          },
+          "isCurrent": true,
+          "isOnline": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apiid9419",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "apiid9419",
+        "properties": {
+          "displayName": "apiname1463",
+          "apiRevision": "1",
+          "description": "apidescription5200",
+          "serviceUrl": "http://newechoapi.cloudapp.net/api",
+          "path": "newapiPath",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "authenticationSettings": {
+            "oAuth2": {
+              "authorizationServerId": "authorizationServerId2283",
+              "scope": "oauth2scope2580"
+            }
+          },
+          "subscriptionKeyParameterNames": {
+            "header": "header4520",
+            "query": "query3037"
+          },
+          "isCurrent": true,
+          "isOnline": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiClone.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiClone.json
new file mode 100644
index 000000000000..24601e0d44cb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiClone.json
@@ -0,0 +1,79 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echo-api2",
+    "parameters": {
+      "properties": {
+        "displayName": "Echo API2",
+        "description": "Copy of Existing Echo Api including Operations.",
+        "subscriptionRequired": true,
+        "serviceUrl": "http://echoapi.cloudapp.net/api",
+        "path": "echo2",
+        "protocols": [
+          "http",
+          "https"
+        ],
+        "isCurrent": true,
+        "sourceApiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/58a4aeac497000007d040001"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echoapi2",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "echoapi2",
+        "properties": {
+          "displayName": "Echo API2",
+          "apiRevision": "1",
+          "description": "Copy of Existing Echo Api including Operations.",
+          "subscriptionRequired": true,
+          "serviceUrl": "http://echoapi.cloudapp.net/api",
+          "path": "echo2",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echoapi2",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "echoapi2",
+        "properties": {
+          "displayName": "Echo API2",
+          "apiRevision": "1",
+          "description": "Copy of Existing Echo Api including Operations.",
+          "subscriptionRequired": true,
+          "serviceUrl": "http://echoapi.cloudapp.net/api",
+          "path": "echo2",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiDiagnostic.json
new file mode 100644
index 000000000000..7e84d9f8e701
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiDiagnostic.json
@@ -0,0 +1,160 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "parameters": {
+      "properties": {
+        "alwaysLog": "allErrors",
+        "loggerId": "/loggers/applicationinsights",
+        "sampling": {
+          "samplingType": "fixed",
+          "percentage": 50
+        },
+        "frontend": {
+          "request": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          },
+          "response": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          }
+        },
+        "backend": {
+          "request": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          },
+          "response": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/diagnostics/applicationinsights",
+        "type": "Microsoft.ApiManagement/service/apis/diagnostics",
+        "name": "applicationinsights",
+        "properties": {
+          "alwaysLog": "allErrors",
+          "loggerId": "/loggers/applicationinsights",
+          "sampling": {
+            "samplingType": "fixed",
+            "percentage": 50
+          },
+          "frontend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          },
+          "backend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/diagnostics/applicationinsights",
+        "type": "Microsoft.ApiManagement/service/apis/diagnostics",
+        "name": "applicationinsights",
+        "properties": {
+          "alwaysLog": "allErrors",
+          "loggerId": "/loggers/applicationinsights",
+          "sampling": {
+            "samplingType": "fixed",
+            "percentage": 50
+          },
+          "frontend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          },
+          "backend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssue.json
new file mode 100644
index 000000000000..099e8a1c1581
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssue.json
@@ -0,0 +1,49 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "parameters": {
+      "properties": {
+        "title": "New API issue",
+        "description": "New API issue description",
+        "createdDate": "2018-02-01T22:21:20.467Z",
+        "state": "open",
+        "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc",
+        "type": "Microsoft.ApiManagement/service/apis/issues",
+        "name": "57d2ef278aa04f0ad01d6cdc",
+        "properties": {
+          "title": "New API issue",
+          "description": "New API issue description",
+          "createdDate": "2018-02-01T22:21:20.467Z",
+          "state": "open",
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc",
+        "type": "Microsoft.ApiManagement/service/apis/issues",
+        "name": "57d2ef278aa04f0ad01d6cdc",
+        "properties": {
+          "title": "New API issue",
+          "description": "New API issue description",
+          "createdDate": "2018-02-01T22:21:20.467Z",
+          "state": "open",
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssueAttachment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssueAttachment.json
new file mode 100644
index 000000000000..10b024c63d5e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssueAttachment.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "attachmentId": "57d2ef278aa04f0888cba3f3",
+    "parameters": {
+      "properties": {
+        "title": "Issue attachment.",
+        "contentFormat": "image/jpeg",
+        "content": "IEJhc2U2NA=="
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc/attachments/57d2ef278aa04f0888cba3f3",
+        "type": "Microsoft.ApiManagement/service/apis/issues/attachments",
+        "name": "57d2ef278aa04f0888cba3f3",
+        "properties": {
+          "title": "Issue attachment.",
+          "contentFormat": "link",
+          "content": "https://.../image.jpg"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc/attachments/57d2ef278aa04f0888cba3f3",
+        "type": "Microsoft.ApiManagement/service/apis/issues/attachments",
+        "name": "57d2ef278aa04f0888cba3f3",
+        "properties": {
+          "title": "Issue attachment.",
+          "contentFormat": "link",
+          "content": "https://.../image.jpg"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssueComment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssueComment.json
new file mode 100644
index 000000000000..19a54b8cc69a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiIssueComment.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "commentId": "599e29ab193c3c0bd0b3e2fb",
+    "parameters": {
+      "properties": {
+        "text": "Issue comment.",
+        "createdDate": "2018-02-01T22:21:20.467Z",
+        "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc/comments/599e29ab193c3c0bd0b3e2fb",
+        "type": "Microsoft.ApiManagement/service/apis/issues/comments",
+        "name": "599e29ab193c3c0bd0b3e2fb",
+        "properties": {
+          "text": "Issue comment.",
+          "createdDate": "2018-02-01T22:21:20.467Z",
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc/comments/599e29ab193c3c0bd0b3e2fb",
+        "type": "Microsoft.ApiManagement/service/apis/issues/comments",
+        "name": "599e29ab193c3c0bd0b3e2fb",
+        "properties": {
+          "text": "Issue comment.",
+          "createdDate": "2018-02-01T22:21:20.467Z",
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiNewVersionUsingExistingApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiNewVersionUsingExistingApi.json
new file mode 100644
index 000000000000..29967bd31261
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiNewVersionUsingExistingApi.json
@@ -0,0 +1,95 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echoapiv3",
+    "parameters": {
+      "properties": {
+        "displayName": "Echo API2",
+        "description": "Create Echo API into a new Version using Existing Version Set and Copy all Operations.",
+        "subscriptionRequired": true,
+        "serviceUrl": "http://echoapi.cloudapp.net/api",
+        "path": "echo2",
+        "protocols": [
+          "http",
+          "https"
+        ],
+        "isCurrent": true,
+        "apiVersion": "v4",
+        "sourceApiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echoPath",
+        "apiVersionSetId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/aa9c59e6-c0cd-4258-9356-9ca7d2f0b458"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echoapiv3",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "echoapiv3",
+        "properties": {
+          "displayName": "Echo API2",
+          "apiRevision": "1",
+          "description": "Create Echo API into a new Version using Existing Version Set and Copy all Operations.",
+          "subscriptionRequired": true,
+          "serviceUrl": "http://echoapi.cloudapp.net/api",
+          "path": "echo2",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true,
+          "apiVersion": "v4",
+          "apiVersionSetId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/aa9c59e6-c0cd-4258-9356-9ca7d2f0b458",
+          "apiVersionSet": {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/aa9c59e6-c0cd-4258-9356-9ca7d2f0b458",
+            "name": "Echo API2",
+            "versioningScheme": "Segment"
+          }
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echoapiv3",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "echoapiv3",
+        "properties": {
+          "displayName": "Echo API2",
+          "apiRevision": "1",
+          "description": "Create Echo API into a new Version using Existing Version Set and Copy all Operations.",
+          "subscriptionRequired": true,
+          "serviceUrl": "http://echoapi.cloudapp.net/api",
+          "path": "echo2",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true,
+          "apiVersion": "v4",
+          "apiVersionSetId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/aa9c59e6-c0cd-4258-9356-9ca7d2f0b458",
+          "apiVersionSet": {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/aa9c59e6-c0cd-4258-9356-9ca7d2f0b458",
+            "name": "Echo API2",
+            "versioningScheme": "Segment"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperation.json
new file mode 100644
index 000000000000..4c175489f819
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperation.json
@@ -0,0 +1,130 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "PetStoreTemplate2",
+    "operationId": "newoperations",
+    "parameters": {
+      "properties": {
+        "displayName": "createUser2",
+        "method": "POST",
+        "urlTemplate": "/user1",
+        "templateParameters": [],
+        "description": "This can only be done by the logged in user.",
+        "request": {
+          "description": "Created user object",
+          "queryParameters": [],
+          "headers": [],
+          "representations": [
+            {
+              "contentType": "application/json",
+              "schemaId": "592f6c1d0af5840ca8897f0c",
+              "typeName": "User"
+            }
+          ]
+        },
+        "responses": [
+          {
+            "statusCode": 200,
+            "description": "successful operation",
+            "representations": [
+              {
+                "contentType": "application/xml"
+              },
+              {
+                "contentType": "application/json"
+              }
+            ],
+            "headers": []
+          }
+        ]
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/PetStoreTemplate2/operations/newoperations",
+        "type": "Microsoft.ApiManagement/service/apis/operations",
+        "name": "newoperations",
+        "properties": {
+          "displayName": "createUser2",
+          "method": "POST",
+          "urlTemplate": "/user1",
+          "templateParameters": [],
+          "description": "This can only be done by the logged in user.",
+          "request": {
+            "description": "Created user object",
+            "queryParameters": [],
+            "headers": [],
+            "representations": [
+              {
+                "contentType": "application/json",
+                "schemaId": "592f6c1d0af5840ca8897f0c",
+                "typeName": "User"
+              }
+            ]
+          },
+          "responses": [
+            {
+              "statusCode": 200,
+              "description": "successful operation",
+              "representations": [
+                {
+                  "contentType": "application/xml"
+                },
+                {
+                  "contentType": "application/json"
+                }
+              ],
+              "headers": []
+            }
+          ]
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/PetStoreTemplate2/operations/newoperations",
+        "type": "Microsoft.ApiManagement/service/apis/operations",
+        "name": "newoperations",
+        "properties": {
+          "displayName": "createUser2",
+          "method": "POST",
+          "urlTemplate": "/user1",
+          "templateParameters": [],
+          "description": "This can only be done by the logged in user.",
+          "request": {
+            "description": "Created user object",
+            "queryParameters": [],
+            "headers": [],
+            "representations": [
+              {
+                "contentType": "application/json",
+                "schemaId": "592f6c1d0af5840ca8897f0c",
+                "typeName": "User"
+              }
+            ]
+          },
+          "responses": [
+            {
+              "statusCode": 200,
+              "description": "successful operation",
+              "representations": [
+                {
+                  "contentType": "application/xml"
+                },
+                {
+                  "contentType": "application/json"
+                }
+              ],
+              "headers": []
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperationPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperationPolicy.json
new file mode 100644
index 000000000000..9b8a9db0b760
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperationPolicy.json
@@ -0,0 +1,40 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5600b57e7e8880006a040001",
+    "operationId": "5600b57e7e8880006a080001",
+    "policyId": "policy",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "format": "xml",
+        "value": "<policies> <inbound /> <backend>    <forward-request />  </backend>  <outbound /></policies>"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5600b57e7e8880006a040001/operations/5600b57e7e8880006a080001/policies/policy",
+        "type": "Microsoft.ApiManagement/service/apis/operations/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5600b57e7e8880006a040001/operations/5600b57e7e8880006a080001/policies/policy",
+        "type": "Microsoft.ApiManagement/service/apis/operations/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperationTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperationTag.json
new file mode 100644
index 000000000000..0dbd1af76e6e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiOperationTag.json
@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5931a75ae4bbd512a88c680b",
+    "operationId": "5931a75ae4bbd512a88c680a",
+    "tagId": "tagId1"
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "tagId1",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "tagId1",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiPolicy.json
new file mode 100644
index 000000000000..a1efe72b1c56
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiPolicy.json
@@ -0,0 +1,39 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5600b57e7e8880006a040001",
+    "policyId": "policy",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "format": "xml",
+        "value": "<policies> <inbound /> <backend>    <forward-request />  </backend>  <outbound /></policies>"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5600b57e7e8880006a040001/policies/policy",
+        "type": "Microsoft.ApiManagement/service/apis/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5600b57e7e8880006a040001/policies/policy",
+        "type": "Microsoft.ApiManagement/service/apis/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiPolicyNonXmlEncoded.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiPolicyNonXmlEncoded.json
new file mode 100644
index 000000000000..0d7865aa0525
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiPolicyNonXmlEncoded.json
@@ -0,0 +1,39 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5600b57e7e8880006a040001",
+    "policyId": "policy",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "value": "<policies>\r\n     <inbound>\r\n     <base />\r\n  <set-header name=\"newvalue\" exists-action=\"override\">\r\n   <value>\"@(context.Request.Headers.FirstOrDefault(h => h.Ke==\"Via\"))\" </value>\r\n    </set-header>\r\n  </inbound>\r\n      </policies>",
+        "format": "rawxml"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/4c1a3bc6-89f9-46fe-a175-5d8984b25095/resourcegroups/Api-DF-West-US/providers/Microsoft.ApiManagement/service/samirmsiservice2/apis/echo-api/operations/create-resource/policies/policy",
+        "type": "Microsoft.ApiManagement/service/apis/operations/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound>\r\n    <base />\r\n    <set-header name=\"newvalue\" exists-action=\"override\">\r\n      <value>\"@(context.Request.Headers.FirstOrDefault(h =&gt; h.Ke==\"Via\"))\" </value>\r\n    </set-header>\r\n  </inbound>\r\n</policies>"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/4c1a3bc6-89f9-46fe-a175-5d8984b25095/resourcegroups/Api-DF-West-US/providers/Microsoft.ApiManagement/service/samirmsiservice2/apis/echo-api/operations/create-resource/policies/policy",
+        "type": "Microsoft.ApiManagement/service/apis/operations/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound>\r\n    <base />\r\n    <set-header name=\"newvalue\" exists-action=\"override\">\r\n      <value>\"@(context.Request.Headers.FirstOrDefault(h =&gt; h.Ke==\"Via\"))\" </value>\r\n    </set-header>\r\n  </inbound>\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiRelease.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiRelease.json
new file mode 100644
index 000000000000..0ad697c0c3fe
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiRelease.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "a1",
+    "releaseId": "testrev",
+    "parameters": {
+      "properties": {
+        "apiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1",
+        "notes": "yahooagain"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1/releases/testrev",
+        "type": "Microsoft.ApiManagement/service/apis/releases",
+        "name": "testrev",
+        "properties": {
+          "apiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1",
+          "createdDateTime": "2018-02-08T20:52:00.65Z",
+          "updatedDateTime": "2018-02-08T20:52:00.65Z",
+          "notes": "yahooagain"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1/releases/testrev",
+        "type": "Microsoft.ApiManagement/service/apis/releases",
+        "name": "testrev",
+        "properties": {
+          "apiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1",
+          "createdDateTime": "2018-02-08T20:52:00.65Z",
+          "updatedDateTime": "2018-02-08T20:52:00.65Z",
+          "notes": "yahooagain"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiRevisionFromExistingApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiRevisionFromExistingApi.json
new file mode 100644
index 000000000000..403ce5ccb0d4
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiRevisionFromExistingApi.json
@@ -0,0 +1,68 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echo-api;rev=3",
+    "parameters": {
+      "properties": {
+        "path": "echo",
+        "serviceUrl": "http://echoapi.cloudapp.net/apiv3",
+        "sourceApiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api",
+        "apiRevisionDescription": "Creating a Revision of an existing API"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api;rev=3",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "echo-api;rev=3",
+        "properties": {
+          "displayName": "Echo API",
+          "apiRevision": "3",
+          "subscriptionRequired": true,
+          "serviceUrl": "http://echoapi.cloudapp.net/apiv3",
+          "path": "echo",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "apiRevisionDescription": "Creating a Revision of an existing API"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api;rev=3",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "echo-api;rev=3",
+        "properties": {
+          "displayName": "Echo API",
+          "apiRevision": "3",
+          "subscriptionRequired": true,
+          "serviceUrl": "http://echoapi.cloudapp.net/apiv3",
+          "path": "echo",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "apiRevisionDescription": "Creating a Revision of an existing API"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiSchema.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiSchema.json
new file mode 100644
index 000000000000..1d3b81f69e5c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiSchema.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d6bb8f1f7fab13dc67ec9b",
+    "schemaId": "ec12520d-9d48-4e7b-8f39-698ca2ac63f1",
+    "parameters": {
+      "properties": {
+        "contentType": "application/vnd.ms-azure-apim.xsd+xml",
+        "document": {
+          "value": "<s:schema elementFormDefault=\"qualified\" targetNamespace=\"http://ws.cdyne.com/WeatherWS/\" xmlns:tns=\"http://ws.cdyne.com/WeatherWS/\" xmlns:s=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:tm=\"http://microsoft.com/wsdl/mime/textMatching/\" xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\" xmlns:apim-wsdltns=\"http://ws.cdyne.com/WeatherWS/\">\r\n  <s:element name=\"GetWeatherInformation\">\r\n    <s:complexType />\r\n  </s:element>\r\n  <s:element name=\"GetWeatherInformationResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"GetWeatherInformationResult\" type=\"tns:ArrayOfWeatherDescription\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"ArrayOfWeatherDescription\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"WeatherDescription\" type=\"tns:WeatherDescription\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"WeatherDescription\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Description\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"PictureURL\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"GetCityForecastByZIP\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ZIP\" type=\"s:string\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:element name=\"GetCityForecastByZIPResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"GetCityForecastByZIPResult\" type=\"tns:ForecastReturn\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"ForecastReturn\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Success\" type=\"s:boolean\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ResponseText\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"State\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"City\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WeatherStationCity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ForecastResult\" type=\"tns:ArrayOfForecast\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"ArrayOfForecast\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"Forecast\" nillable=\"true\" type=\"tns:Forecast\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"Forecast\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Date\" type=\"s:dateTime\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Desciption\" type=\"s:string\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Temperatures\" type=\"tns:temp\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"ProbabilityOfPrecipiation\" type=\"tns:POP\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"temp\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"MorningLow\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"DaytimeHigh\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"POP\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Nighttime\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Daytime\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"GetCityWeatherByZIP\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ZIP\" type=\"s:string\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:element name=\"GetCityWeatherByZIPResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"GetCityWeatherByZIPResult\" type=\"tns:WeatherReturn\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"WeatherReturn\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Success\" type=\"s:boolean\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ResponseText\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"State\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"City\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WeatherStationCity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Description\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Temperature\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"RelativeHumidity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Wind\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Pressure\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Visibility\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WindChill\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Remarks\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"ArrayOfWeatherDescription\" nillable=\"true\" type=\"tns:ArrayOfWeatherDescription\" />\r\n  <s:element name=\"ForecastReturn\" nillable=\"true\" type=\"tns:ForecastReturn\" />\r\n  <s:element name=\"WeatherReturn\" type=\"tns:WeatherReturn\" />\r\n</s:schema>"
+        }
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/59d6bb8f1f7fab13dc67ec9b/schemas/ec12520d-9d48-4e7b-8f39-698ca2ac63f1?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/59d6bb8f1f7fab13dc67ec9b/schemas/ec12520d-9d48-4e7b-8f39-698ca2ac63f1",
+        "type": "Microsoft.ApiManagement/service/apis/schemas",
+        "name": "ec12520d-9d48-4e7b-8f39-698ca2ac63f1",
+        "properties": {
+          "contentType": "application/vnd.ms-azure-apim.xsd+xml",
+          "document": {
+            "value": "<s:schema elementFormDefault=\"qualified\" targetNamespace=\"http://ws.cdyne.com/WeatherWS/\" xmlns:tns=\"http://ws.cdyne.com/WeatherWS/\" xmlns:s=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:tm=\"http://microsoft.com/wsdl/mime/textMatching/\" xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\" xmlns:apim-wsdltns=\"http://ws.cdyne.com/WeatherWS/\">\r\n  <s:element name=\"GetWeatherInformation\">\r\n    <s:complexType />\r\n  </s:element>\r\n  <s:element name=\"GetWeatherInformationResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"GetWeatherInformationResult\" type=\"tns:ArrayOfWeatherDescription\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"ArrayOfWeatherDescription\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"WeatherDescription\" type=\"tns:WeatherDescription\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"WeatherDescription\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Description\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"PictureURL\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"GetCityForecastByZIP\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ZIP\" type=\"s:string\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:element name=\"GetCityForecastByZIPResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"GetCityForecastByZIPResult\" type=\"tns:ForecastReturn\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"ForecastReturn\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Success\" type=\"s:boolean\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ResponseText\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"State\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"City\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WeatherStationCity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ForecastResult\" type=\"tns:ArrayOfForecast\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"ArrayOfForecast\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"Forecast\" nillable=\"true\" type=\"tns:Forecast\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"Forecast\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Date\" type=\"s:dateTime\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Desciption\" type=\"s:string\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Temperatures\" type=\"tns:temp\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"ProbabilityOfPrecipiation\" type=\"tns:POP\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"temp\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"MorningLow\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"DaytimeHigh\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"POP\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Nighttime\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Daytime\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"GetCityWeatherByZIP\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ZIP\" type=\"s:string\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:element name=\"GetCityWeatherByZIPResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"GetCityWeatherByZIPResult\" type=\"tns:WeatherReturn\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"WeatherReturn\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Success\" type=\"s:boolean\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ResponseText\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"State\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"City\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WeatherStationCity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Description\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Temperature\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"RelativeHumidity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Wind\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Pressure\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Visibility\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WindChill\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Remarks\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"ArrayOfWeatherDescription\" nillable=\"true\" type=\"tns:ArrayOfWeatherDescription\" />\r\n  <s:element name=\"ForecastReturn\" nillable=\"true\" type=\"tns:ForecastReturn\" />\r\n  <s:element name=\"WeatherReturn\" type=\"tns:WeatherReturn\" />\r\n</s:schema>"
+          }
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/59d6bb8f1f7fab13dc67ec9b/schemas/ec12520d-9d48-4e7b-8f39-698ca2ac63f1",
+        "type": "Microsoft.ApiManagement/service/apis/schemas",
+        "name": "ec12520d-9d48-4e7b-8f39-698ca2ac63f1",
+        "properties": {
+          "contentType": "application/vnd.ms-azure-apim.xsd+xml",
+          "document": {
+            "value": "<s:schema elementFormDefault=\"qualified\" targetNamespace=\"http://ws.cdyne.com/WeatherWS/\" xmlns:tns=\"http://ws.cdyne.com/WeatherWS/\" xmlns:s=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:tm=\"http://microsoft.com/wsdl/mime/textMatching/\" xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\" xmlns:apim-wsdltns=\"http://ws.cdyne.com/WeatherWS/\">\r\n  <s:element name=\"GetWeatherInformation\">\r\n    <s:complexType />\r\n  </s:element>\r\n  <s:element name=\"GetWeatherInformationResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"GetWeatherInformationResult\" type=\"tns:ArrayOfWeatherDescription\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"ArrayOfWeatherDescription\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"WeatherDescription\" type=\"tns:WeatherDescription\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"WeatherDescription\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Description\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"PictureURL\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"GetCityForecastByZIP\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ZIP\" type=\"s:string\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:element name=\"GetCityForecastByZIPResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"GetCityForecastByZIPResult\" type=\"tns:ForecastReturn\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"ForecastReturn\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Success\" type=\"s:boolean\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ResponseText\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"State\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"City\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WeatherStationCity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ForecastResult\" type=\"tns:ArrayOfForecast\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"ArrayOfForecast\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"Forecast\" nillable=\"true\" type=\"tns:Forecast\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"Forecast\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Date\" type=\"s:dateTime\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Desciption\" type=\"s:string\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Temperatures\" type=\"tns:temp\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"ProbabilityOfPrecipiation\" type=\"tns:POP\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"temp\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"MorningLow\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"DaytimeHigh\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"POP\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Nighttime\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Daytime\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"GetCityWeatherByZIP\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ZIP\" type=\"s:string\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:element name=\"GetCityWeatherByZIPResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"GetCityWeatherByZIPResult\" type=\"tns:WeatherReturn\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"WeatherReturn\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Success\" type=\"s:boolean\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ResponseText\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"State\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"City\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WeatherStationCity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Description\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Temperature\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"RelativeHumidity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Wind\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Pressure\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Visibility\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WindChill\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Remarks\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"ArrayOfWeatherDescription\" nillable=\"true\" type=\"tns:ArrayOfWeatherDescription\" />\r\n  <s:element name=\"ForecastReturn\" nillable=\"true\" type=\"tns:ForecastReturn\" />\r\n  <s:element name=\"WeatherReturn\" type=\"tns:WeatherReturn\" />\r\n</s:schema>"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiTag.json
new file mode 100644
index 000000000000..9052d09147ed
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiTag.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5931a75ae4bbd512a88c680b",
+    "tagId": "tagId1"
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "tagId1",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "tagId1",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiTagDescription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiTagDescription.json
new file mode 100644
index 000000000000..99027d7d482b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiTagDescription.json
@@ -0,0 +1,47 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5931a75ae4bbd512a88c680b",
+    "tagDescriptionId": "tagId1",
+    "parameters": {
+      "properties": {
+        "description": "Some description that will be displayed for operation's tag if the tag is assigned to operation of the API",
+        "externalDocsUrl": "http://some.url/additionaldoc",
+        "externalDocsDescription": "Description of the external docs resource"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5931a75ae4bbd512a88c680b/tagDescriptions/tagId1",
+        "type": "Microsoft.ApiManagement/service/apis/tagDescriptions",
+        "name": "tagId1",
+        "properties": {
+          "tagId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+          "displayName": "tag1",
+          "description": "Some description that will be displayed for operation's tag if the tag is assigned to operation of the API",
+          "externalDocsDescription": "some additional info",
+          "externalDocsUrl": "http://some_url.com"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5931a75ae4bbd512a88c680b/tagDescriptions/tagId1",
+        "type": "Microsoft.ApiManagement/service/apis/tagDescriptions",
+        "name": "tagId1",
+        "properties": {
+          "tagId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+          "displayName": "tag1",
+          "description": "Some description that will be displayed for operation's tag if the tag is assigned to operation of the API",
+          "externalDocsDescription": "some additional info",
+          "externalDocsUrl": "http://some_url.com"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingImportOverrideServiceUrl.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingImportOverrideServiceUrl.json
new file mode 100644
index 000000000000..1810a5e88a20
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingImportOverrideServiceUrl.json
@@ -0,0 +1,68 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "apidocs",
+    "parameters": {
+      "properties": {
+        "format": "swagger-link",
+        "value": "http://apimpimportviaurl.azurewebsites.net/api/apidocs/",
+        "path": "petstoreapi123",
+        "serviceUrl": "http://petstore.swagger.wordnik.com/api"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apidocs",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "apidocs",
+        "properties": {
+          "displayName": "Swagger Sample App",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger \n    at <a href=\"http://swagger.wordnik.com\">http://swagger.wordnik.com</a> or on irc.freenode.net, #swagger.  For this sample,\n    you can use the api key \"special-key\" to test the authorization filters",
+          "serviceUrl": "http://petstore.swagger.wordnik.com/api",
+          "path": "petstoreapi123",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apidocs?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apidocs",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "apidocs",
+        "properties": {
+          "displayName": "Swagger Sample App",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger \n    at <a href=\"http://swagger.wordnik.com\">http://swagger.wordnik.com</a> or on irc.freenode.net, #swagger.  For this sample,\n    you can use the api key \"special-key\" to test the authorization filters",
+          "serviceUrl": "http://petstore.swagger.wordnik.com/api",
+          "path": "petstoreapi123",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingOai3Import.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingOai3Import.json
new file mode 100644
index 000000000000..a24aaf117cc0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingOai3Import.json
@@ -0,0 +1,65 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "petstore",
+    "parameters": {
+      "properties": {
+        "format": "openapi-link",
+        "value": "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v3.0/petstore.yaml",
+        "path": "petstore"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/petstoreapi",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "petstoreapi",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "serviceUrl": "http://petstore.swagger.io/v1",
+          "path": "petstore",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/petstoreapi",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "petstoreapi",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "serviceUrl": "http://petstore.swagger.io/v1",
+          "path": "petstore",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingSwaggerImport.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingSwaggerImport.json
new file mode 100644
index 000000000000..6194336a9ef1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingSwaggerImport.json
@@ -0,0 +1,67 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "petstore",
+    "parameters": {
+      "properties": {
+        "format": "swagger-link-json",
+        "value": "http://petstore.swagger.io/v2/swagger.json",
+        "path": "petstore"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/petstoreapi",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "petstoreapi",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+          "serviceUrl": "http://petstore.swagger.io/v2",
+          "path": "petstore",
+          "protocols": [
+            "http"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/petstoreapi",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "petstoreapi",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+          "serviceUrl": "http://petstore.swagger.io/v2",
+          "path": "petstore",
+          "protocols": [
+            "http"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingWadlImport.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingWadlImport.json
new file mode 100644
index 000000000000..78506b1ab983
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiUsingWadlImport.json
@@ -0,0 +1,67 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "petstore",
+    "parameters": {
+      "properties": {
+        "format": "wadl-link-json",
+        "value": "https://developer.cisco.com/media/wae-release-6-2-api-reference/wae-collector-rest-api/application.wadl",
+        "path": "collector"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/collectorwadl",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "collectorwadl",
+        "properties": {
+          "displayName": "http://localhost:8080/collector-northbound",
+          "apiRevision": "1",
+          "description": "",
+          "serviceUrl": "http://localhost:8080/collector-northbound",
+          "path": "collector",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/collectorwadl",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "collectorwadl",
+        "properties": {
+          "displayName": "http://localhost:8080/collector-northbound",
+          "apiRevision": "1",
+          "description": "",
+          "serviceUrl": "http://localhost:8080/collector-northbound",
+          "path": "collector",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiVersionSet.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiVersionSet.json
new file mode 100644
index 000000000000..bf5e67e49c35
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiVersionSet.json
@@ -0,0 +1,42 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "versionSetId": "api1",
+    "parameters": {
+      "properties": {
+        "displayName": "api set 1",
+        "versioningScheme": "Segment",
+        "description": "Version configuration"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/api1",
+        "type": "Microsoft.ApiManagement/service/api-version-sets",
+        "name": "api1",
+        "properties": {
+          "displayName": "api set 1",
+          "versioningScheme": "Segment",
+          "description": "Version configuration"
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/api1",
+        "type": "Microsoft.ApiManagement/service/api-version-sets",
+        "name": "api1",
+        "properties": {
+          "displayName": "api set 1",
+          "versioningScheme": "Segment",
+          "description": "Version configuration"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiWithOpenIdConnect.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiWithOpenIdConnect.json
new file mode 100644
index 000000000000..d0daff29529a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateApiWithOpenIdConnect.json
@@ -0,0 +1,99 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "tempgroup",
+    "parameters": {
+      "properties": {
+        "displayName": "Swagger Petstore",
+        "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+        "serviceUrl": "http://petstore.swagger.io/v2",
+        "path": "petstore",
+        "protocols": [
+          "https"
+        ],
+        "authenticationSettings": {
+          "openid": {
+            "openidProviderId": "testopenid",
+            "bearerTokenSendingMethods": [
+              "authorizationHeader"
+            ]
+          }
+        },
+        "subscriptionKeyParameterNames": {
+          "header": "Ocp-Apim-Subscription-Key",
+          "query": "subscription-key"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/58da4c4ccdae970a08121230",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "58da4c4ccdae970a08121230",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+          "serviceUrl": "http://petstore.swagger.io/v2",
+          "path": "petstore",
+          "protocols": [
+            "https"
+          ],
+          "authenticationSettings": {
+            "openid": {
+              "openidProviderId": "testopenid",
+              "bearerTokenSendingMethods": [
+                "authorizationHeader"
+              ]
+            }
+          },
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/58da4c4ccdae970a08121230",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "58da4c4ccdae970a08121230",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+          "serviceUrl": "http://petstore.swagger.io/v2",
+          "path": "petstore",
+          "protocols": [
+            "https"
+          ],
+          "authenticationSettings": {
+            "openid": {
+              "openidProviderId": "testopenid",
+              "bearerTokenSendingMethods": [
+                "authorizationHeader"
+              ]
+            }
+          },
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateAuthorizationServer.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateAuthorizationServer.json
new file mode 100644
index 000000000000..babdeb7849b4
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateAuthorizationServer.json
@@ -0,0 +1,94 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "authsid": "newauthServer",
+    "parameters": {
+      "properties": {
+        "displayName": "test2",
+        "description": "test server",
+        "clientRegistrationEndpoint": "https://www.contoso.com/apps",
+        "authorizationEndpoint": "https://www.contoso.com/oauth2/auth",
+        "authorizationMethods": [
+          "GET"
+        ],
+        "tokenEndpoint": "https://www.contoso.com/oauth2/token",
+        "supportState": true,
+        "defaultScope": "read write",
+        "grantTypes": [
+          "authorizationCode",
+          "implicit"
+        ],
+        "bearerTokenSendingMethods": [
+          "authorizationHeader"
+        ],
+        "clientId": "1",
+        "clientSecret": "2",
+        "resourceOwnerUsername": "un",
+        "resourceOwnerPassword": "pwd"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/authorizationServers/newauthServer",
+        "type": "Microsoft.ApiManagement/service/authorizationServers",
+        "name": "newauthServer",
+        "properties": {
+          "displayName": "test2",
+          "description": "test server",
+          "clientRegistrationEndpoint": "https://www.contoso.com/apps",
+          "authorizationEndpoint": "https://www.contoso.com/oauth2/auth",
+          "authorizationMethods": [
+            "GET"
+          ],
+          "tokenEndpoint": "https://www.contoso.com/oauth2/token",
+          "supportState": true,
+          "defaultScope": "read write",
+          "grantTypes": [
+            "authorizationCode",
+            "implicit"
+          ],
+          "bearerTokenSendingMethods": [
+            "authorizationHeader"
+          ],
+          "clientId": "1",
+          "resourceOwnerUsername": "un",
+          "resourceOwnerPassword": "pwd"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/authorizationServers/newauthServer",
+        "type": "Microsoft.ApiManagement/service/authorizationServers",
+        "name": "newauthServer",
+        "properties": {
+          "displayName": "test2",
+          "description": "test server",
+          "clientRegistrationEndpoint": "https://www.contoso.com/apps",
+          "authorizationEndpoint": "https://www.contoso.com/oauth2/auth",
+          "authorizationMethods": [
+            "GET"
+          ],
+          "tokenEndpoint": "https://www.contoso.com/oauth2/token",
+          "supportState": true,
+          "defaultScope": "read write",
+          "grantTypes": [
+            "authorizationCode",
+            "implicit"
+          ],
+          "bearerTokenSendingMethods": [
+            "authorizationHeader"
+          ],
+          "clientId": "1",
+          "resourceOwnerUsername": "un",
+          "resourceOwnerPassword": "pwd"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateBackendProxyBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
new file mode 100644
index 000000000000..0d367624a273
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateBackendProxyBackend.json
@@ -0,0 +1,126 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "backendId": "proxybackend",
+    "parameters": {
+      "properties": {
+        "description": "description5308",
+        "url": "https://backendname2644/",
+        "protocol": "http",
+        "tls": {
+          "validateCertificateChain": true,
+          "validateCertificateName": true
+        },
+        "proxy": {
+          "url": "http://192.168.1.1:8080",
+          "username": "Contoso\\admin",
+          "password": "<password>"
+        },
+        "credentials": {
+          "query": {
+            "sv": [
+              "xx",
+              "bb",
+              "cc"
+            ]
+          },
+          "header": {
+            "x-my-1": [
+              "val1",
+              "val2"
+            ]
+          },
+          "authorization": {
+            "scheme": "Basic",
+            "parameter": "opensesma"
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/backends/proxybackend",
+        "type": "Microsoft.ApiManagement/service/backends",
+        "name": "proxybackend",
+        "properties": {
+          "description": "description5308",
+          "url": "https://backendname2644/",
+          "protocol": "http",
+          "credentials": {
+            "query": {
+              "sv": [
+                "xx",
+                "bb",
+                "cc"
+              ]
+            },
+            "header": {
+              "x-my-1": [
+                "val1",
+                "val2"
+              ]
+            },
+            "authorization": {
+              "scheme": "Basic",
+              "parameter": "opensesma"
+            }
+          },
+          "proxy": {
+            "url": "http://192.168.1.1:8080",
+            "username": "Contoso\\admin",
+            "password": "<password>"
+          },
+          "tls": {
+            "validateCertificateChain": false,
+            "validateCertificateName": false
+          }
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/backends/proxybackend",
+        "type": "Microsoft.ApiManagement/service/backends",
+        "name": "proxybackend",
+        "properties": {
+          "description": "description5308",
+          "url": "https://backendname2644/",
+          "protocol": "http",
+          "credentials": {
+            "query": {
+              "sv": [
+                "xx",
+                "bb",
+                "cc"
+              ]
+            },
+            "header": {
+              "x-my-1": [
+                "val1",
+                "val2"
+              ]
+            },
+            "authorization": {
+              "scheme": "Basic",
+              "parameter": "opensesma"
+            }
+          },
+          "proxy": {
+            "url": "http://192.168.1.1:8080",
+            "username": "Contoso\\admin",
+            "password": "<password>"
+          },
+          "tls": {
+            "validateCertificateChain": false,
+            "validateCertificateName": false
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateBackendServiceFabric.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateBackendServiceFabric.json
new file mode 100644
index 000000000000..504c0cd59210
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateBackendServiceFabric.json
@@ -0,0 +1,87 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "backendId": "sfbackend",
+    "parameters": {
+      "properties": {
+        "description": "Service Fabric Test App 1",
+        "protocol": "http",
+        "url": "fabric:/mytestapp/mytestservice",
+        "properties": {
+          "serviceFabricCluster": {
+            "managementEndpoints": [
+              "https://somecluster.com"
+            ],
+            "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+            "serverX509Names": [
+              {
+                "name": "ServerCommonName1",
+                "issuerCertificateThumbprint": "IssuerCertificateThumbprint1"
+              }
+            ],
+            "maxPartitionResolutionRetries": 5
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/backends/sfbackend",
+        "type": "Microsoft.ApiManagement/service/backends",
+        "name": "sfbackend",
+        "properties": {
+          "description": "Service Fabric Test App 1",
+          "url": "fabric:/mytestapp/mytestservice",
+          "protocol": "http",
+          "properties": {
+            "serviceFabricCluster": {
+              "managementEndpoints": [
+                "https://somecluster.com"
+              ],
+              "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+              "serverX509Names": [
+                {
+                  "name": "ServerCommonName1",
+                  "issuerCertificateThumbprint": "IssuerCertificateThumbprint1"
+                }
+              ],
+              "maxPartitionResolutionRetries": 5
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/backends/sfbackend",
+        "type": "Microsoft.ApiManagement/service/backends",
+        "name": "sfbackend",
+        "properties": {
+          "description": "Service Fabric Test App 1",
+          "url": "fabric:/mytestapp/mytestservice",
+          "protocol": "http",
+          "properties": {
+            "serviceFabricCluster": {
+              "managementEndpoints": [
+                "https://somecluster.com"
+              ],
+              "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+              "serverX509Names": [
+                {
+                  "name": "ServerCommonName1",
+                  "issuerCertificateThumbprint": "IssuerCertificateThumbprint1"
+                }
+              ],
+              "maxPartitionResolutionRetries": 5
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCache.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCache.json
new file mode 100644
index 000000000000..9e6e6b92104b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCache.json
@@ -0,0 +1,45 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "cacheId": "c1",
+    "parameters": {
+      "properties": {
+        "connectionString": "apim.redis.cache.windows.net:6380,password=xc,ssl=True,abortConnect=False",
+        "description": "Redis cache instances in West India",
+        "useFromLocation": "default",
+        "resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
+        "type": "Microsoft.ApiManagement/service/caches",
+        "name": "c1",
+        "properties": {
+          "useFromLocation": "default",
+          "description": "Redis cache instances in West India",
+          "connectionString": "{{5f7fbca77a891a2200f3db38}}",
+          "resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
+        "type": "Microsoft.ApiManagement/service/caches",
+        "name": "c1",
+        "properties": {
+          "useFromLocation": "default",
+          "description": "Redis cache instances in West India",
+          "connectionString": "{{5f7fbca77a891a2200f3db38}}",
+          "resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCertificate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCertificate.json
new file mode 100644
index 000000000000..ef1ae872a088
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCertificate.json
@@ -0,0 +1,41 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "certificateId": "tempcert",
+    "parameters": {
+      "properties": {
+        "data": "****************Base 64 Encoded Certificate *******************************",
+        "password": "****Certificate Password******"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/tempcert",
+        "type": "Microsoft.ApiManagement/service/certificates",
+        "name": "tempcert",
+        "properties": {
+          "subject": "CN=contoso.com",
+          "thumbprint": "*******************3",
+          "expirationDate": "2018-03-17T21:55:07+00:00"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/tempcert",
+        "type": "Microsoft.ApiManagement/service/certificates",
+        "name": "tempcert",
+        "properties": {
+          "subject": "CN=contoso.com",
+          "thumbprint": "*******************3",
+          "expirationDate": "2018-03-17T21:55:07+00:00"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCertificateWithKeyVault.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCertificateWithKeyVault.json
new file mode 100644
index 000000000000..1d67786fba95
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateCertificateWithKeyVault.json
@@ -0,0 +1,59 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "certificateId": "templateCertkv",
+    "parameters": {
+      "properties": {
+        "keyVault": {
+          "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+          "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
+        "type": "Microsoft.ApiManagement/service/certificates",
+        "name": "templateCertkv",
+        "properties": {
+          "subject": "CN=*.msitesting.net",
+          "thumbprint": "EA**********************9AD690",
+          "expirationDate": "2037-01-01T07:00:00Z",
+          "keyVault": {
+            "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+            "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+            "lastStatus": {
+              "code": "Success",
+              "timeStampUtc": "2020-09-22T00:24:53.3191468Z"
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
+        "type": "Microsoft.ApiManagement/service/certificates",
+        "name": "templateCertkv",
+        "properties": {
+          "subject": "CN=*.msitesting.net",
+          "thumbprint": "EA**********************9AD690",
+          "expirationDate": "2037-01-01T07:00:00Z",
+          "keyVault": {
+            "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+            "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+            "lastStatus": {
+              "code": "Success",
+              "timeStampUtc": "2020-09-22T00:24:53.3191468Z"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateContentType.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateContentType.json
new file mode 100644
index 000000000000..d0abcdd00460
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateContentType.json
@@ -0,0 +1,177 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "contentTypeId": "page",
+    "parameters": {
+      "properties": {
+        "name": "Page",
+        "description": "A regular page",
+        "schema": {
+          "properties": {
+            "en_us": {
+              "type": "object",
+              "properties": {
+                "title": {
+                  "title": "Title",
+                  "description": "Page title. This property gets included in SEO attributes.",
+                  "type": "string",
+                  "indexed": true
+                },
+                "description": {
+                  "title": "Description",
+                  "description": "Page description. This property gets included in SEO attributes.",
+                  "type": "string",
+                  "indexed": true
+                },
+                "keywords": {
+                  "title": "Keywords",
+                  "description": "Page keywords. This property gets included in SEO attributes.",
+                  "type": "string",
+                  "indexed": true
+                },
+                "permalink": {
+                  "title": "Permalink",
+                  "description": "Page permalink, e.g. '/about'.",
+                  "type": "string",
+                  "indexed": true
+                },
+                "documentId": {
+                  "title": "Document ID",
+                  "description": "Reference to page content document.",
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false,
+              "required": [
+                "title",
+                "permalink",
+                "documentId"
+              ]
+            }
+          },
+          "additionalProperties": false
+        },
+        "version": "1.0.0"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/contentTypes/page",
+        "type": "Microsoft.ApiManagement/service/contentTypes",
+        "name": "page",
+        "properties": {
+          "name": "Page",
+          "description": "A regular page",
+          "schema": {
+            "properties": {
+              "en_us": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "title": "Title",
+                    "description": "Page title. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "description": {
+                    "title": "Description",
+                    "description": "Page description. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "keywords": {
+                    "title": "Keywords",
+                    "description": "Page keywords. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "permalink": {
+                    "title": "Permalink",
+                    "description": "Page permalink, e.g. '/about'.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "documentId": {
+                    "title": "Document ID",
+                    "description": "Reference to page content document.",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "title",
+                  "permalink",
+                  "documentId"
+                ]
+              }
+            },
+            "additionalProperties": false
+          },
+          "version": "1.0.0"
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/contentTypes/page",
+        "type": "Microsoft.ApiManagement/service/contentTypes",
+        "name": "page",
+        "properties": {
+          "name": "Page",
+          "description": "A regular page",
+          "schema": {
+            "properties": {
+              "en_us": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "title": "Title",
+                    "description": "Page title. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "description": {
+                    "title": "Description",
+                    "description": "Page description. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "keywords": {
+                    "title": "Keywords",
+                    "description": "Page keywords. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "permalink": {
+                    "title": "Permalink",
+                    "description": "Page permalink, e.g. '/about'.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "documentId": {
+                    "title": "Document ID",
+                    "description": "Reference to page content document.",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "title",
+                  "permalink",
+                  "documentId"
+                ]
+              }
+            },
+            "additionalProperties": false
+          },
+          "version": "1.0.0"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateContentTypeContentItem.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateContentTypeContentItem.json
new file mode 100644
index 000000000000..1df147555219
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateContentTypeContentItem.json
@@ -0,0 +1,55 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "contentTypeId": "page",
+    "contentItemId": "4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+    "parameters": {
+      "properties": {
+        "en_us": {
+          "title": "About",
+          "description": "Short story about the company.",
+          "keywords": "company, about",
+          "documentId": "contentTypes/document/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+          "permalink": "/about"
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/contentTypes/page/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+        "type": "Microsoft.ApiManagement/service/contentTypes/contentItems",
+        "name": "4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+        "properties": {
+          "en_us": {
+            "title": "About",
+            "description": "Short story about the company.",
+            "keywords": "company, about",
+            "documentId": "contentTypes/document/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+            "permalink": "/about"
+          }
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/contentTypes/page/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+        "type": "Microsoft.ApiManagement/service/contentTypes/contentItems",
+        "name": "4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+        "properties": {
+          "en_us": {
+            "title": "About",
+            "description": "Short story about the company.",
+            "keywords": "company, about",
+            "documentId": "contentTypes/document/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+            "permalink": "/about"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateDiagnostic.json
new file mode 100644
index 000000000000..4a416ef35532
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateDiagnostic.json
@@ -0,0 +1,159 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights",
+    "parameters": {
+      "properties": {
+        "alwaysLog": "allErrors",
+        "loggerId": "/loggers/azuremonitor",
+        "sampling": {
+          "samplingType": "fixed",
+          "percentage": 50
+        },
+        "frontend": {
+          "request": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          },
+          "response": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          }
+        },
+        "backend": {
+          "request": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          },
+          "response": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/diagnostics/applicationinsights",
+        "type": "Microsoft.ApiManagement/service/diagnostics",
+        "name": "applicationinsights",
+        "properties": {
+          "alwaysLog": "allErrors",
+          "loggerId": "/loggers/azuremonitor",
+          "sampling": {
+            "samplingType": "fixed",
+            "percentage": 50
+          },
+          "frontend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          },
+          "backend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/diagnostics/applicationinsights",
+        "type": "Microsoft.ApiManagement/service/diagnostics",
+        "name": "applicationinsights",
+        "properties": {
+          "alwaysLog": "allErrors",
+          "loggerId": "/loggers/applicationinsights",
+          "sampling": {
+            "samplingType": "fixed",
+            "percentage": 50
+          },
+          "frontend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          },
+          "backend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateEHLogger.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateEHLogger.json
new file mode 100644
index 000000000000..71966897842c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateEHLogger.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "loggerId": "eh1",
+    "parameters": {
+      "properties": {
+        "loggerType": "azureEventHub",
+        "description": "adding a new logger",
+        "credentials": {
+          "name": "hydraeventhub",
+          "connectionString": "Endpoint=sb://hydraeventhub-ns.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=********="
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/eh1",
+        "type": "Microsoft.ApiManagement/service/loggers",
+        "name": "eh1",
+        "properties": {
+          "loggerType": "azureEventHub",
+          "description": "adding a new logger",
+          "credentials": {
+            "connectionString": "{{Logger-Credentials-5f28745bbebeeb13cc3f7301}}"
+          },
+          "isBuffered": true
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/eh1",
+        "type": "Microsoft.ApiManagement/service/loggers",
+        "name": "eh1",
+        "properties": {
+          "loggerType": "azureEventHub",
+          "description": "adding a new logger",
+          "credentials": {
+            "connectionString": "{{Logger-Credentials-5f28745bbebeeb13cc3f7301}}"
+          },
+          "isBuffered": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGateway.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGateway.json
new file mode 100644
index 000000000000..c0e0ad36a8af
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGateway.json
@@ -0,0 +1,45 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "parameters": {
+      "properties": {
+        "description": "my gateway 1",
+        "locationData": {
+          "name": "my location"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1",
+        "type": "Microsoft.ApiManagement/service/gateways",
+        "name": "a1",
+        "properties": {
+          "description": "my gateway 1",
+          "locationData": {
+            "name": "my location"
+          }
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1",
+        "type": "Microsoft.ApiManagement/service/gateways",
+        "name": "a1",
+        "properties": {
+          "description": "my gateway 1",
+          "locationData": {
+            "name": "my location"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayApi.json
new file mode 100644
index 000000000000..e8a0320745e2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayApi.json
@@ -0,0 +1,61 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "apiId": "echo-api",
+    "parameters": {
+      "properties": {
+        "provisioningState": "created"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/apis/echo-api",
+        "type": "Microsoft.ApiManagement/service/gateways/apis",
+        "name": "echo-api",
+        "properties": {
+          "displayName": "EchoApi",
+          "apiRevision": "1",
+          "serviceUrl": "https://contoso.com/apis/echo",
+          "path": "",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/apis/echo-api",
+        "type": "Microsoft.ApiManagement/service/gateways/apis",
+        "name": "echo-api",
+        "properties": {
+          "displayName": "EchoApi",
+          "apiRevision": "1",
+          "serviceUrl": "https://contoso.com/apis/echo",
+          "path": "",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayCertificateAuthority.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayCertificateAuthority.json
new file mode 100644
index 000000000000..2fed0e6ccf14
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayCertificateAuthority.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "certificateId": "cert1",
+    "parameters": {
+      "properties": {
+        "isTrusted": false
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/certificateAuthorities/cert1",
+        "type": "Microsoft.ApiManagement/service/gateways/certificateAuthorities",
+        "name": "cert1",
+        "properties": {
+          "isTrusted": false
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/certificateAuthorities/cert1",
+        "type": "Microsoft.ApiManagement/service/gateways/certificateAuthorities",
+        "name": "cert1",
+        "properties": {
+          "isTrusted": false
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayHostnameConfiguration.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayHostnameConfiguration.json
new file mode 100644
index 000000000000..477528bfa00b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGatewayHostnameConfiguration.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "hcId": "default",
+    "parameters": {
+      "properties": {
+        "hostname": "*",
+        "certificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+        "negotiateClientCertificate": false,
+        "tls10Enabled": false,
+        "tls11Enabled": false,
+        "http2Enabled": true
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/hostnameConfigurations/default",
+        "type": "Microsoft.ApiManagement/service/gateways/hostnameConfigurations",
+        "name": "default",
+        "properties": {
+          "hostname": "*",
+          "certificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+          "negotiateClientCertificate": false,
+          "tls10Enabled": false,
+          "tls11Enabled": false,
+          "http2Enabled": true
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/hostnameConfigurations/default",
+        "type": "Microsoft.ApiManagement/service/gateways/hostnameConfigurations",
+        "name": "default",
+        "properties": {
+          "hostname": "*",
+          "certificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+          "negotiateClientCertificate": false,
+          "tls10Enabled": false,
+          "tls11Enabled": false,
+          "http2Enabled": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGraphQLApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGraphQLApi.json
new file mode 100644
index 000000000000..05bf1bdc1763
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGraphQLApi.json
@@ -0,0 +1,75 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "tempgroup",
+    "parameters": {
+      "properties": {
+        "description": "apidescription5200",
+        "displayName": "apiname1463",
+        "type": "graphql",
+        "serviceUrl": "https://api.spacex.land/graphql",
+        "path": "graphql-api",
+        "protocols": [
+          "http",
+          "https"
+        ]
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apiid9419",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "apiid9419",
+        "properties": {
+          "displayName": "apiname1463",
+          "apiRevision": "1",
+          "description": "apidescription5200",
+          "serviceUrl": "https://api.spacex.land/graphql",
+          "type": "graphql",
+          "path": "graphql-api",
+          "protocols": [
+            "https",
+            "https"
+          ],
+          "authenticationSettings": null,
+          "subscriptionKeyParameterNames": null,
+          "isCurrent": true,
+          "isOnline": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apiid9419",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "apiid9419",
+        "properties": {
+          "displayName": "apiname1463",
+          "apiRevision": "1",
+          "description": "apidescription5200",
+          "serviceUrl": "https://api.spacex.land/graphql",
+          "type": "graphql",
+          "path": "graphql-api",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "authenticationSettings": null,
+          "subscriptionKeyParameterNames": null,
+          "isCurrent": true,
+          "isOnline": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroup.json
new file mode 100644
index 000000000000..8d093f4a5f03
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroup.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "tempgroup",
+    "parameters": {
+      "properties": {
+        "displayName": "temp group"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/tempgroup",
+        "type": "Microsoft.ApiManagement/service/groups",
+        "name": "tempgroup",
+        "properties": {
+          "displayName": "temp group",
+          "type": "custom"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/tempgroup",
+        "type": "Microsoft.ApiManagement/service/groups",
+        "name": "tempgroup",
+        "properties": {
+          "displayName": "temp group",
+          "type": "custom"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroupExternal.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroupExternal.json
new file mode 100644
index 000000000000..d10c1dbaaa8f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroupExternal.json
@@ -0,0 +1,45 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "aadGroup",
+    "parameters": {
+      "properties": {
+        "displayName": "NewGroup (samiraad.onmicrosoft.com)",
+        "description": "new group to test",
+        "type": "external",
+        "externalId": "aad://samiraad.onmicrosoft.com/groups/83cf2753-5831-4675-bc0e-2f8dc067c58d"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/aadGroup",
+        "type": "Microsoft.ApiManagement/service/groups",
+        "name": "aadGroup",
+        "properties": {
+          "displayName": "NewGroup (samiraad.onmicrosoft.com)",
+          "description": "new group to test",
+          "type": "external",
+          "externalId": "aad://samiraad.onmicrosoft.com/groups/83cf2753-5831-4675-bc0e-2f8dc067c58d"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/aadGroup",
+        "type": "Microsoft.ApiManagement/service/groups",
+        "name": "aadGroup",
+        "properties": {
+          "displayName": "NewGroup (samiraad.onmicrosoft.com)",
+          "description": "new group to test",
+          "type": "external",
+          "externalId": "aad://samiraad.onmicrosoft.com/groups/83cf2753-5831-4675-bc0e-2f8dc067c58d"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroupUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroupUser.json
new file mode 100644
index 000000000000..483a89a30605
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateGroupUser.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "tempgroup",
+    "userId": "59307d350af58404d8a26300"
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/59307d350af58404d8a26300",
+        "type": "Microsoft.ApiManagement/service/groups/users",
+        "name": "59307d350af58404d8a26300",
+        "properties": {
+          "firstName": "test",
+          "lastName": "user",
+          "email": "testuser1@live.com",
+          "state": "active",
+          "registrationDate": "2017-06-01T20:46:45.437Z",
+          "groups": [],
+          "identities": []
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/59307d350af58404d8a26300",
+        "type": "Microsoft.ApiManagement/service/groups/users",
+        "name": "59307d350af58404d8a26300",
+        "properties": {
+          "firstName": "test",
+          "lastName": "user",
+          "email": "testuser1@live.com",
+          "state": "active",
+          "registrationDate": "2017-06-01T20:46:45.437Z",
+          "groups": [],
+          "identities": []
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateIdentityProvider.json
new file mode 100644
index 000000000000..131a6b9f1a7f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateIdentityProvider.json
@@ -0,0 +1,39 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "identityProviderName": "facebook",
+    "parameters": {
+      "properties": {
+        "clientId": "facebookid",
+        "clientSecret": "facebookapplicationsecret"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/identityProviders/Facebook",
+        "type": "Microsoft.ApiManagement/service/identityProviders",
+        "name": "Facebook",
+        "properties": {
+          "clientId": "facebookid",
+          "type": "facebook"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/identityProviders/Facebook",
+        "type": "Microsoft.ApiManagement/service/identityProviders",
+        "name": "Facebook",
+        "properties": {
+          "clientId": "facebookid",
+          "type": "facebook"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json
new file mode 100644
index 000000000000..ee57dea3b004
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json
@@ -0,0 +1,256 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "hostnameConfigurations": [
+          {
+            "type": "Proxy",
+            "hostName": "gateway1.msitesting.net",
+            "encodedCertificate": "****** Base 64 Encoded Certificate ************",
+            "certificatePassword": "Password",
+            "defaultSslBinding": true
+          },
+          {
+            "type": "Management",
+            "hostName": "mgmt.msitesting.net",
+            "encodedCertificate": "****** Base 64 Encoded Certificate ************",
+            "certificatePassword": "Password"
+          },
+          {
+            "type": "Portal",
+            "hostName": "portal1.msitesting.net",
+            "encodedCertificate": "****** Base 64 Encoded Certificate ************",
+            "certificatePassword": "Password"
+          }
+        ],
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk",
+        "additionalLocations": [
+          {
+            "location": "East US",
+            "sku": {
+              "name": "Premium",
+              "capacity": 1
+            },
+            "disableGateway": true
+          }
+        ],
+        "virtualNetworkType": "None",
+        "apiVersionConstraint": {
+          "minApiVersion": "2019-01-01"
+        }
+      },
+      "sku": {
+        "name": "Premium",
+        "capacity": 1
+      },
+      "location": "West US",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/bXVsdGlob3N0bmFtZW11bHRpcmVnaW9uc2VydmljZV9BY3RfZjFiOTZhMjc=?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAACXoo=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2019-12-18T08:04:26.9492661Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false
+            },
+            {
+              "type": "Proxy",
+              "hostName": "gateway1.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXF1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": true
+            },
+            {
+              "type": "Management",
+              "hostName": "mgmt.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXF1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false
+            },
+            {
+              "type": "Portal",
+              "hostName": "portal1.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXF1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false
+            }
+          ],
+          "additionalLocations": [
+            {
+              "location": "East US",
+              "sku": {
+                "name": "Premium",
+                "capacity": 1
+              },
+              "disableGateway": true
+            }
+          ],
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "apiVersionConstraint": {
+            "minApiVersion": "2019-01-01"
+          }
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAACXok=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-12-18T06:26:20.3348609Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-westus-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false
+            },
+            {
+              "type": "Proxy",
+              "hostName": "gateway1.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXF1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": true
+            },
+            {
+              "type": "Management",
+              "hostName": "mgmt.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXF1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false
+            },
+            {
+              "type": "Portal",
+              "hostName": "portal1.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXF1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false
+            }
+          ],
+          "publicIPAddresses": [
+            "13.91.32.113"
+          ],
+          "additionalLocations": [
+            {
+              "location": "East US",
+              "sku": {
+                "name": "Premium",
+                "capacity": 1
+              },
+              "publicIPAddresses": [
+                "23.101.138.153"
+              ],
+              "gatewayRegionalUrl": "https://apimService1-eastus-01.regional.azure-api.net",
+              "disableGateway": true
+            }
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "apiVersionConstraint": {
+            "minApiVersion": "2019-01-01"
+          }
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/bXVsdGlob3N0bmFtZW11bHRpcmVnaW9uc2VydmljZV9BY3RfZjFiOTZhMjc=?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNamedValue.json
new file mode 100644
index 000000000000..833cd53c6b25
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNamedValue.json
@@ -0,0 +1,59 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testprop2",
+    "parameters": {
+      "properties": {
+        "displayName": "prop3name",
+        "value": "propValue",
+        "tags": [
+          "foo",
+          "bar"
+        ],
+        "secret": false
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop2?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop2",
+        "type": "Microsoft.ApiManagement/service/namedValues",
+        "name": "testprop2",
+        "properties": {
+          "displayName": "prop3name",
+          "value": "propValue",
+          "tags": [
+            "foo",
+            "bar"
+          ],
+          "secret": false
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop2",
+        "type": "Microsoft.ApiManagement/service/namedValues",
+        "name": "testprop2",
+        "properties": {
+          "displayName": "prop3name",
+          "value": "propValue",
+          "tags": [
+            "foo",
+            "bar"
+          ],
+          "secret": false
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
new file mode 100644
index 000000000000..768d255f7c4a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
@@ -0,0 +1,76 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testprop6",
+    "parameters": {
+      "properties": {
+        "displayName": "prop6namekv",
+        "keyVault": {
+          "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+          "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret"
+        },
+        "tags": [
+          "foo",
+          "bar"
+        ],
+        "secret": true
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop6?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop6",
+        "type": "Microsoft.ApiManagement/service/namedValues",
+        "name": "testprop6",
+        "properties": {
+          "displayName": "prop6namekv",
+          "keyVault": {
+            "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
+            "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+            "lastStatus": {
+              "code": "Success",
+              "timeStampUtc": "2020-09-11T00:54:31.8024882Z"
+            }
+          },
+          "tags": [
+            "foo",
+            "bar"
+          ],
+          "secret": true
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop6",
+        "type": "Microsoft.ApiManagement/service/namedValues",
+        "name": "testprop6",
+        "properties": {
+          "displayName": "prop6namekv",
+          "keyVault": {
+            "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
+            "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+            "lastStatus": {
+              "code": "Success",
+              "timeStampUtc": "2020-09-11T00:54:31.8024882Z"
+            }
+          },
+          "tags": [
+            "foo",
+            "bar"
+          ],
+          "secret": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotification.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotification.json
new file mode 100644
index 000000000000..8d5261cd0d2b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotification.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage",
+        "type": "Microsoft.ApiManagement/service/notifications",
+        "name": "RequestPublisherNotificationMessage",
+        "properties": {
+          "title": "Subscription requests (requiring approval)",
+          "description": "The following email recipients and users will receive email notifications about subscription requests for API products requiring approval.",
+          "recipients": {
+            "emails": [
+              "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/recipientEmails/contoso@live.com",
+              "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/recipientEmails/foobar!live",
+              "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/recipientEmails/foobar@live.com"
+            ],
+            "users": [
+              "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/576823d0a40f7e74ec07d642"
+            ]
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotificationRecipientEmail.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotificationRecipientEmail.json
new file mode 100644
index 000000000000..a25c8c97d360
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotificationRecipientEmail.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage",
+    "email": "foobar@live.com"
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/foobar@live.com",
+        "type": "Microsoft.ApiManagement/service/notifications/recipientEmails",
+        "name": "foobar@live.com",
+        "properties": {
+          "email": "foobar@live.com"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/foobar@live.com",
+        "type": "Microsoft.ApiManagement/service/notifications/recipientEmails",
+        "name": "foobar@live.com",
+        "properties": {
+          "email": "foobar@live.com"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotificationRecipientUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotificationRecipientUser.json
new file mode 100644
index 000000000000..e3fe480e65c6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateNotificationRecipientUser.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage",
+    "userId": "576823d0a40f7e74ec07d642"
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientUsers/576823d0a40f7e74ec07d642",
+        "type": "Microsoft.ApiManagement/service/notifications/recipientUsers",
+        "name": "576823d0a40f7e74ec07d642",
+        "properties": {
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/576823d0a40f7e74ec07d642"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientUsers/576823d0a40f7e74ec07d642",
+        "type": "Microsoft.ApiManagement/service/notifications/recipientUsers",
+        "name": "576823d0a40f7e74ec07d642",
+        "properties": {
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/576823d0a40f7e74ec07d642"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateOpenIdConnectProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateOpenIdConnectProvider.json
new file mode 100644
index 000000000000..5f7433d1a083
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateOpenIdConnectProvider.json
@@ -0,0 +1,43 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "opid": "templateOpenIdConnect3",
+    "parameters": {
+      "properties": {
+        "displayName": "templateoidprovider3",
+        "metadataEndpoint": "https://oidprovider-template3.net",
+        "clientId": "oidprovidertemplate3",
+        "clientSecret": "x"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/openidConnectProviders/templateOpenIdConnect3",
+        "type": "Microsoft.ApiManagement/service/openidconnectproviders",
+        "name": "templateOpenIdConnect3",
+        "properties": {
+          "displayName": "templateoidprovider3",
+          "metadataEndpoint": "https://oidprovider-template3.net",
+          "clientId": "oidprovidertemplate3"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/openidConnectProviders/templateOpenIdConnect3",
+        "type": "Microsoft.ApiManagement/service/openidconnectproviders",
+        "name": "templateOpenIdConnect3",
+        "properties": {
+          "displayName": "templateoidprovider3",
+          "metadataEndpoint": "https://oidprovider-template3.net",
+          "clientId": "oidprovidertemplate3"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreatePolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreatePolicy.json
new file mode 100644
index 000000000000..0d2a968c2e97
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreatePolicy.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "policyId": "policy",
+    "parameters": {
+      "properties": {
+        "format": "xml",
+        "value": "<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/policies/policy",
+        "type": "Microsoft.ApiManagement/service/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/policies/policy",
+        "type": "Microsoft.ApiManagement/service/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreatePortalRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreatePortalRevision.json
new file mode 100644
index 000000000000..8c920c9ad22d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreatePortalRevision.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "portalRevisionId": "20201112101010",
+    "parameters": {
+      "properties": {
+        "description": "portal revision 1",
+        "isCurrent": true
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010?api-version=2021-04-01-preview&asyncId=5faf089b1d9a026694220e0c&asyncCode=201"
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010",
+        "type": "Microsoft.ApiManagement/service/portalRevisions",
+        "name": "20201112101010",
+        "properties": {
+          "description": "portal revision 1",
+          "statusDetails": null,
+          "status": "completed",
+          "isCurrent": true,
+          "createdDateTime": "2020-11-13T22:28:43.657Z",
+          "updatedDateTime": "2020-11-13T22:29:22.68Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProduct.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProduct.json
new file mode 100644
index 000000000000..a9505b728929
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProduct.json
@@ -0,0 +1,42 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "testproduct",
+    "parameters": {
+      "properties": {
+        "displayName": "Test Template ProductName 4"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/testproduct",
+        "type": "Microsoft.ApiManagement/service/products",
+        "name": "testproduct",
+        "properties": {
+          "displayName": "Test Template ProductName 4",
+          "subscriptionRequired": true,
+          "approvalRequired": false,
+          "state": "notPublished"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/testproduct",
+        "type": "Microsoft.ApiManagement/service/products",
+        "name": "testproduct",
+        "properties": {
+          "displayName": "Test Template ProductName 4",
+          "subscriptionRequired": true,
+          "approvalRequired": false,
+          "state": "notPublished"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductApi.json
new file mode 100644
index 000000000000..51c1a305e4c5
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductApi.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "testproduct",
+    "apiId": "echo-api"
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5931a75ae4bbd512a88c680b",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "5931a75ae4bbd512a88c680b",
+        "properties": {
+          "displayName": "EchoApi",
+          "apiRevision": "1",
+          "serviceUrl": "https://contoso.com/apis/echo",
+          "path": "",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5931a75ae4bbd512a88c680b",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "5931a75ae4bbd512a88c680b",
+        "properties": {
+          "displayName": "EchoApi",
+          "apiRevision": "1",
+          "serviceUrl": "https://contoso.com/apis/echo",
+          "path": "",
+          "protocols": [
+            "http",
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductGroup.json
new file mode 100644
index 000000000000..647c8daf515d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductGroup.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "testproduct",
+    "groupId": "templateGroup"
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/templateGroup",
+        "type": "Microsoft.ApiManagement/service/products/groups",
+        "name": "templateGroup",
+        "properties": {
+          "displayName": "Template Group",
+          "description": "group created via Template",
+          "builtIn": false,
+          "type": "custom"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/templateGroup",
+        "type": "Microsoft.ApiManagement/service/products/groups",
+        "name": "templateGroup",
+        "properties": {
+          "displayName": "Template Group",
+          "description": "group created via Template",
+          "builtIn": false,
+          "type": "custom"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductPolicy.json
new file mode 100644
index 000000000000..dfe0bca3b288
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductPolicy.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "5702e97e5157a50f48dce801",
+    "policyId": "policy",
+    "parameters": {
+      "properties": {
+        "format": "xml",
+        "value": "<policies>\r\n  <inbound>\r\n    <rate-limit calls=\"{{call-count}}\" renewal-period=\"15\"></rate-limit>\r\n    <log-to-eventhub logger-id=\"16\">\r\n                      @( string.Join(\",\", DateTime.UtcNow, context.Deployment.ServiceName, context.RequestId, context.Request.IpAddress, context.Operation.Name) ) \r\n                  </log-to-eventhub>\r\n    <quota-by-key calls=\"40\" counter-key=\"cc\" renewal-period=\"3600\" increment-count=\"@(context.Request.Method == &quot;POST&quot; ? 1:2)\" />\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <base />\r\n  </outbound>\r\n</policies>"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5702e97e5157a50f48dce801/policies/policy",
+        "type": "Microsoft.ApiManagement/service/products/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound>\r\n    <rate-limit calls=\"{{58c884fed8d14f127cec38f0}}\" renewal-period=\"15\" version=\"2\"></rate-limit>\r\n    <log-to-eventhub logger-id=\"16\">\r\n                      @( string.Join(\",\", DateTime.UtcNow, context.Deployment.ServiceName, context.RequestId, context.Request.IpAddress, context.Operation.Name) ) \r\n                  </log-to-eventhub>\r\n    <quota-by-key calls=\"40\" counter-key=\"cc\" renewal-period=\"3600\" increment-count=\"@(context.Request.Method == &quot;POST&quot; ? 1:2)\" />\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <base />\r\n  </outbound>\r\n</policies>"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5702e97e5157a50f48dce801/policies/policy",
+        "type": "Microsoft.ApiManagement/service/products/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound>\r\n    <rate-limit calls=\"{{58c884fed8d14f127cec38f0}}\" renewal-period=\"15\" version=\"2\"></rate-limit>\r\n    <log-to-eventhub logger-id=\"16\">\r\n                      @( string.Join(\",\", DateTime.UtcNow, context.Deployment.ServiceName, context.RequestId, context.Request.IpAddress, context.Operation.Name) ) \r\n                  </log-to-eventhub>\r\n    <quota-by-key calls=\"40\" counter-key=\"cc\" renewal-period=\"3600\" increment-count=\"@(context.Request.Method == &quot;POST&quot; ? 1:2)\" />\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <base />\r\n  </outbound>\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductTag.json
new file mode 100644
index 000000000000..8523feb97d91
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateProductTag.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "5931a75ae4bbd512a88c680b",
+    "tagId": "tagId1"
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "tagId1",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "tagId1",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateService.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateService.json
new file mode 100644
index 000000000000..4b4dfe698fab
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateService.json
@@ -0,0 +1,141 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "publisherEmail": "foo@contoso.com",
+        "publisherName": "foo"
+      },
+      "sku": {
+        "name": "Developer",
+        "capacity": 1
+      },
+      "location": "South Central US",
+      "tags": {
+        "Name": "Contoso",
+        "Test": "User"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "Name": "Contoso",
+          "Test": "User"
+        },
+        "location": "South Central US",
+        "etag": "AAAAAAAp3P0=",
+        "properties": {
+          "publisherEmail": "foo@contoso.com",
+          "publisherName": "foo",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2019-12-18T06:10:56.0327105Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "apiVersionConstraint": {}
+        },
+        "sku": {
+          "name": "Developer",
+          "capacity": 1
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "Name": "Contoso",
+          "Test": "User"
+        },
+        "location": "South Central US",
+        "etag": "AAAAAAAp3T4=",
+        "properties": {
+          "publisherEmail": "foo@contoso.com",
+          "publisherName": "foo",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-12-18T06:10:56.0327105Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-southcentralus-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "publicIPAddresses": [
+            "23.102.171.124"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "apiVersionConstraint": {}
+        },
+        "sku": {
+          "name": "Developer",
+          "capacity": 1
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/c2RrdGVzdGFwaW0xNTkxX0FjdF9jZTkyMmNmOQ==?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceHavingMsi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
new file mode 100644
index 000000000000..c2a25e3693ee
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
@@ -0,0 +1,137 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk"
+      },
+      "sku": {
+        "name": "Consumption",
+        "capacity": 0
+      },
+      "identity": {
+        "type": "SystemAssigned"
+      },
+      "location": "West US",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAAAWiE=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2019-04-11T16:29:29.9711098Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
+          "virtualNetworkType": "None"
+        },
+        "sku": {
+          "name": "Consumption",
+          "capacity": 0
+        },
+        "identity": {
+          "type": "SystemAssigned",
+          "principalId": "dfb9a757-df69-4966-a8d0-711a9cd8ffb4",
+          "tenantId": "XXXXXX-86f1-41af-91ab-2d7cd011db47"
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAAAWiU=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-04-11T16:29:29.9711098Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "virtualNetworkType": "None",
+          "enableClientCertificate": false,
+          "platformVersion": "mtv1"
+        },
+        "sku": {
+          "name": "Consumption",
+          "capacity": 0
+        },
+        "identity": {
+          "type": "SystemAssigned",
+          "principalId": "dfb9a757-df69-4966-a8d0-711a9cd8ffb4",
+          "tenantId": "XXXXXX-86f1-41af-91ab-2d7cd011db47"
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
new file mode 100644
index 000000000000..579c91574bf3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
@@ -0,0 +1,169 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk",
+        "virtualNetworkConfiguration": {
+          "subnetResourceId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/virtualNetworks/apimcus/subnets/tenant"
+        },
+        "publicIpAddressId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/publicIPAddresses/apimazvnet",
+        "virtualNetworkType": "External"
+      },
+      "sku": {
+        "name": "Premium",
+        "capacity": 2
+      },
+      "zones": [
+        "1",
+        "2"
+      ],
+      "location": "East US 2 EUAP",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "East US 2 EUAP",
+        "etag": "AAAAAAAiXto=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2020-07-28T23:18:14.6562474Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "publicIpAddressId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/publicIPAddresses/apimazvnet",
+          "virtualNetworkConfiguration": {
+            "subnetResourceId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/virtualNetworks/apimcus/subnets/tenant"
+          },
+          "virtualNetworkType": "External",
+          "disableGateway": false,
+          "platformVersion": "stv2"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 2
+        },
+        "zones": [
+          "1",
+          "2"
+        ],
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "East US 2 EUAP",
+        "etag": "AAAAAAAGTAs=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2021-02-22T06:53:46.6409875Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-eastus2euap-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
+          "publicIPAddresses": [
+            "20.47.137.XXX"
+          ],
+          "publicIpAddressId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/publicIPAddresses/apimazvnet",
+          "virtualNetworkConfiguration": {
+            "subnetResourceId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/virtualNetworks/apimcus/subnets/tenant"
+          },
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "External",
+          "disableGateway": false,
+          "platformVersion": "stv2"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 2
+        },
+        "zones": [
+          "1",
+          "2"
+        ],
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInZones.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInZones.json
new file mode 100644
index 000000000000..64801a00c67a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInZones.json
@@ -0,0 +1,156 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk"
+      },
+      "sku": {
+        "name": "Premium",
+        "capacity": 2
+      },
+      "zones": [
+        "1",
+        "2"
+      ],
+      "location": "North europe",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "North Europe",
+        "etag": "AAAAAAAiXto=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2020-07-28T23:18:14.6562474Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "platformVersion": "stv2"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 2
+        },
+        "zones": [
+          "1",
+          "2"
+        ],
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "North Europe",
+        "etag": "AAAAAAAiXvE=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2020-07-28T23:18:14.6562474Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-northeurope-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
+          "publicIPAddresses": [
+            "20.54.34.66"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "platformVersion": "stv2"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 2
+        },
+        "zones": [
+          "1",
+          "2"
+        ],
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
new file mode 100644
index 000000000000..3a797ae90241
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
@@ -0,0 +1,282 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "hostnameConfigurations": [
+          {
+            "type": "Proxy",
+            "hostName": "gateway1.msitesting.net",
+            "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+            "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468",
+            "defaultSslBinding": true
+          },
+          {
+            "type": "Management",
+            "hostName": "mgmt.msitesting.net",
+            "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+            "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468"
+          },
+          {
+            "type": "Portal",
+            "hostName": "portal1.msitesting.net",
+            "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+            "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468"
+          }
+        ],
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk",
+        "virtualNetworkType": "None",
+        "apiVersionConstraint": {
+          "minApiVersion": "2019-01-01"
+        }
+      },
+      "sku": {
+        "name": "Premium",
+        "capacity": 1
+      },
+      "identity": {
+        "type": "UserAssigned",
+        "userAssignedIdentities": {
+          "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {}
+        }
+      },
+      "location": "North Europe",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/bXVsdGlob3N0bmFtZW11bHRpcmVnaW9uc2VydmljZV9BY3RfZjFiOTZhMjc=?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "North Europe",
+        "etag": "AAAAAAAigi8=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2020-09-13T22:30:20.7759747Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false,
+              "certificateSource": "BuiltIn"
+            },
+            {
+              "type": "Proxy",
+              "hostName": "gateway1.msitesting.net",
+              "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2037-01-01T07:00:00+00:00",
+                "thumbprint": "EA276907917CB5XXXXXXXXXXX690",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": true,
+              "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468",
+              "certificateSource": "KeyVault"
+            },
+            {
+              "type": "Management",
+              "hostName": "mgmt.msitesting.net",
+              "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2037-01-01T07:00:00+00:00",
+                "thumbprint": "EA276907917CB5XXXXXXXXXXX690",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false,
+              "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468",
+              "certificateSource": "KeyVault"
+            },
+            {
+              "type": "Portal",
+              "hostName": "portal1.msitesting.net",
+              "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2037-01-01T07:00:00+00:00",
+                "thumbprint": "EA276907917CB5XXXXXXXXXXX690",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false,
+              "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468",
+              "certificateSource": "KeyVault"
+            }
+          ],
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "platformVersion": "stv2",
+          "apiVersionConstraint": {
+            "minApiVersion": "2019-01-01"
+          }
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        },
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {}
+          }
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "North Europe",
+        "etag": "AAAAAAAigjU=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2020-09-13T22:30:20.7759747Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-northeurope-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false,
+              "certificateSource": "BuiltIn"
+            },
+            {
+              "type": "Proxy",
+              "hostName": "gateway1.msitesting.net",
+              "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2037-01-01T07:00:00+00:00",
+                "thumbprint": "EA276907917CB5XXXXXXXXXXX690",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": true,
+              "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468",
+              "certificateSource": "KeyVault"
+            },
+            {
+              "type": "Management",
+              "hostName": "mgmt.msitesting.net",
+              "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2037-01-01T07:00:00+00:00",
+                "thumbprint": "EA276907917CB5XXXXXXXXXXX690",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false,
+              "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468",
+              "certificateSource": "KeyVault"
+            },
+            {
+              "type": "Portal",
+              "hostName": "portal1.msitesting.net",
+              "keyVaultId": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2037-01-01T07:00:00+00:00",
+                "thumbprint": "EA276907917CB5XXXXXXXXXXX690",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false,
+              "identityClientId": "329419bc-adec-4dce-9568-25a6d486e468",
+              "certificateSource": "KeyVault"
+            }
+          ],
+          "publicIPAddresses": [
+            "40.112.74.192"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "platformVersion": "stv2",
+          "apiVersionConstraint": {
+            "minApiVersion": "2019-01-01"
+          }
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        },
+        "identity": {
+          "type": "UserAssigned",
+          "tenantId": "f686d426-8d16-xxxx-xxxx-ab578e110ccd",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {
+              "principalId": "15e769b2-xxxx-xxxx-xxxx-3fd9a923ac3a",
+              "clientId": "329419bc-adec-4dce-9568-25a6d486e468"
+            }
+          }
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/bXVsdGlob3N0bmFtZW11bHRpcmVnaW9uc2VydmljZV9BY3RfZjFiOTZhMjc=?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
new file mode 100644
index 000000000000..5f89490dc5e9
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
@@ -0,0 +1,173 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "certificates": [
+          {
+            "encodedCertificate": "*******Base64 encoded Certificate******************",
+            "certificatePassword": "Password",
+            "storeName": "CertificateAuthority"
+          }
+        ],
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk"
+      },
+      "sku": {
+        "name": "Basic",
+        "capacity": 1
+      },
+      "location": "Central US",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/bXVsdGlob3N0bmFtZW11bHRpcmVnaW9uc2VydmljZV9BY3RfZjFiOTZhMjc=?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "Central US",
+        "etag": "AAAAAAAp3TM=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2019-12-18T06:33:28.0906918Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
+          "virtualNetworkType": "None",
+          "certificates": [
+            {
+              "storeName": "CertificateAuthority",
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989652CABCF585ACBFCB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              }
+            }
+          ],
+          "disableGateway": false,
+          "platformVersion": "stv2",
+          "apiVersionConstraint": {}
+        },
+        "sku": {
+          "name": "Basic",
+          "capacity": 1
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "Central US",
+        "etag": "AAAAAAAp3UM=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-12-18T06:33:28.0906918Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-centralus-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "publicIPAddresses": [
+            "40.113.223.117"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "certificates": [
+            {
+              "storeName": "CertificateAuthority",
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989652CABCF585ACBFCB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              }
+            }
+          ],
+          "disableGateway": false,
+          "platformVersion": "stv2",
+          "apiVersionConstraint": {}
+        },
+        "sku": {
+          "name": "Basic",
+          "capacity": 1
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/bXVsdGlob3N0bmFtZW11bHRpcmVnaW9uc2VydmljZV9BY3RfZjFiOTZhMjc=?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json
new file mode 100644
index 000000000000..ae1575a4a7cf
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json
@@ -0,0 +1,156 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk"
+      },
+      "sku": {
+        "name": "Consumption",
+        "capacity": 0
+      },
+      "identity": {
+        "type": "UserAssigned",
+        "userAssignedIdentities": {
+          "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/apimService1": {}
+        }
+      },
+      "location": "West US",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAAFzyQ=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2020-03-12T01:05:33.4573398Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "virtualNetworkType": "None",
+          "platformVersion": "mtv1"
+        },
+        "sku": {
+          "name": "Consumption",
+          "capacity": 0
+        },
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/apimService1": {}
+          }
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAAFzyk=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2020-03-12T01:05:33.4573398Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true,
+              "certificateSource": "BuiltIn"
+            }
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "platformVersion": "mtv1"
+        },
+        "sku": {
+          "name": "Consumption",
+          "capacity": 0
+        },
+        "identity": {
+          "type": "UserAssigned",
+          "tenantId": "XXXXX-86f1-41af-XXXX-2d7cd011db47",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/apimService1": {
+              "principalId": "XXXXX-6e62-4649-9f54-a119fc1ba85e",
+              "clientId": "5a2c6b8e-0905-XXXX-a772-993c9418137f"
+            }
+          }
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "Application",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "Application",
+          "lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSoapPassThroughApiUsingWsdlImport.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSoapPassThroughApiUsingWsdlImport.json
new file mode 100644
index 000000000000..7a158f3934e5
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSoapPassThroughApiUsingWsdlImport.json
@@ -0,0 +1,72 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "soapApi",
+    "parameters": {
+      "properties": {
+        "format": "wsdl-link",
+        "value": "http://www.webservicex.net/CurrencyConvertor.asmx?WSDL",
+        "path": "currency",
+        "apiType": "soap",
+        "wsdlSelector": {
+          "wsdlServiceName": "CurrencyConvertor",
+          "wsdlEndpointName": "CurrencyConvertorSoap"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/soapApi",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "soapApi",
+        "properties": {
+          "displayName": "CurrencyConvertor",
+          "apiRevision": "1",
+          "serviceUrl": "http://www.webservicex.net",
+          "path": "currency",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "type": "soap",
+          "isCurrent": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/soapApi",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "soapApi",
+        "properties": {
+          "displayName": "CurrencyConvertor",
+          "apiRevision": "1",
+          "serviceUrl": "http://www.webservicex.net",
+          "path": "currency",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "type": "soap",
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSoapToRestApiUsingWsdlImport.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSoapToRestApiUsingWsdlImport.json
new file mode 100644
index 000000000000..811bd5619f35
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSoapToRestApiUsingWsdlImport.json
@@ -0,0 +1,69 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "soapApi",
+    "parameters": {
+      "properties": {
+        "format": "wsdl-link",
+        "value": "http://www.webservicex.net/CurrencyConvertor.asmx?WSDL",
+        "path": "currency",
+        "wsdlSelector": {
+          "wsdlServiceName": "CurrencyConvertor",
+          "wsdlEndpointName": "CurrencyConvertorSoap"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/soapApi",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "soapApi",
+        "properties": {
+          "displayName": "CurrencyConvertor",
+          "apiRevision": "1",
+          "serviceUrl": "http://www.webservicex.net",
+          "path": "currency",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/soapApi",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "soapApi",
+        "properties": {
+          "displayName": "CurrencyConvertor",
+          "apiRevision": "1",
+          "serviceUrl": "http://www.webservicex.net",
+          "path": "currency",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSubscription.json
new file mode 100644
index 000000000000..9374bdcf2622
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateSubscription.json
@@ -0,0 +1,46 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "sid": "testsub",
+    "parameters": {
+      "properties": {
+        "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/57127d485157a511ace86ae7",
+        "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060002",
+        "displayName": "testsub"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/subscriptions/testsub",
+        "type": "Microsoft.ApiManagement/service/subscriptions",
+        "name": "testsub",
+        "properties": {
+          "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/57127d485157a511ace86ae7",
+          "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060002",
+          "displayName": "testsub",
+          "state": "submitted",
+          "createdDate": "2017-06-02T23:34:03.1055076Z"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/subscriptions/testsub",
+        "type": "Microsoft.ApiManagement/service/subscriptions",
+        "name": "testsub",
+        "properties": {
+          "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/57127d485157a511ace86ae7",
+          "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060002",
+          "displayName": "testsub",
+          "state": "submitted",
+          "createdDate": "2017-06-02T23:34:03.1055076Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTag.json
new file mode 100644
index 000000000000..3382d246b8cd
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTag.json
@@ -0,0 +1,36 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "tagId": "tagId1",
+    "parameters": {
+      "properties": {
+        "displayName": "tag1"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "tagId1",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/tagId1",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "tagId1",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTemplate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTemplate.json
new file mode 100644
index 000000000000..821c69bc37a6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTemplate.json
@@ -0,0 +1,96 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "templateName": "newIssueNotificationMessage",
+    "parameters": {
+      "properties": {
+        "subject": "Your request for $IssueName was successfully received."
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/templates/NewIssueNotificationMessage",
+        "type": "Microsoft.ApiManagement/service/templates",
+        "name": "NewIssueNotificationMessage",
+        "properties": {
+          "subject": "Your request for $IssueName was successfully received.",
+          "body": "<!DOCTYPE html >\r\n<html>\r\n  <head />\r\n  <body>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Dear $DevFirstName $DevLastName,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Thank you for contacting us. Our API team will review your issue and get back to you soon.</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">\r\n          Click this <a href=\"http://$DevPortalUrl/issues/$IssueId\">link</a> to view or edit your request.\r\n        </p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Best,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">The $OrganizationName API Team</p>\r\n  </body>\r\n</html>",
+          "title": "New issue received",
+          "description": "This email is sent to developers after they create a new topic on the Issues page of the developer portal.",
+          "isDefault": false,
+          "parameters": [
+            {
+              "name": "DevFirstName",
+              "title": "Developer first name"
+            },
+            {
+              "name": "DevLastName",
+              "title": "Developer last name"
+            },
+            {
+              "name": "IssueId",
+              "title": "Issue id"
+            },
+            {
+              "name": "IssueName",
+              "title": "Issue name"
+            },
+            {
+              "name": "OrganizationName",
+              "title": "Organization name"
+            },
+            {
+              "name": "DevPortalUrl",
+              "title": "Developer portal URL"
+            }
+          ]
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/templates/NewIssueNotificationMessage",
+        "type": "Microsoft.ApiManagement/service/templates",
+        "name": "NewIssueNotificationMessage",
+        "properties": {
+          "subject": "Your request for $IssueName was successfully received.",
+          "body": "<!DOCTYPE html >\r\n<html>\r\n  <head />\r\n  <body>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Dear $DevFirstName $DevLastName,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Thank you for contacting us. Our API team will review your issue and get back to you soon.</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">\r\n          Click this <a href=\"http://$DevPortalUrl/issues/$IssueId\">link</a> to view or edit your request.\r\n        </p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Best,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">The $OrganizationName API Team</p>\r\n  </body>\r\n</html>",
+          "title": "New issue received",
+          "description": "This email is sent to developers after they create a new topic on the Issues page of the developer portal.",
+          "isDefault": false,
+          "parameters": [
+            {
+              "name": "DevFirstName",
+              "title": "Developer first name"
+            },
+            {
+              "name": "DevLastName",
+              "title": "Developer last name"
+            },
+            {
+              "name": "IssueId",
+              "title": "Issue id"
+            },
+            {
+              "name": "IssueName",
+              "title": "Issue name"
+            },
+            {
+              "name": "OrganizationName",
+              "title": "Organization name"
+            },
+            {
+              "name": "DevPortalUrl",
+              "title": "Developer portal URL"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTenantAccess.json
new file mode 100644
index 000000000000..a8d3765220c3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateTenantAccess.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "If-Match": "*",
+    "accessName": "access",
+    "parameters": {
+      "properties": {
+        "enabled": true
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/access",
+        "type": "Microsoft.ApiManagement/service/tenant",
+        "name": "access",
+        "properties": {
+          "enabled": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateUser.json
new file mode 100644
index 000000000000..d63d7d103404
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateUser.json
@@ -0,0 +1,61 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512288c680b",
+    "parameters": {
+      "properties": {
+        "firstName": "foo",
+        "lastName": "bar",
+        "email": "foobar@outlook.com",
+        "confirmation": "signup"
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/5931a75ae4bbd512288c680b",
+        "type": "Microsoft.ApiManagement/service/users",
+        "name": "5931a75ae4bbd512288c680b",
+        "properties": {
+          "firstName": "foo",
+          "lastName": "bar",
+          "email": "foobar@outlook.com",
+          "state": "active",
+          "registrationDate": "2018-01-07T21:21:29.16Z",
+          "groups": [],
+          "identities": [
+            {
+              "provider": "Basic",
+              "id": "foobar@outlook.com"
+            }
+          ]
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/5931a75ae4bbd512288c680b",
+        "type": "Microsoft.ApiManagement/service/users",
+        "name": "5931a75ae4bbd512288c680b",
+        "properties": {
+          "firstName": "foo",
+          "lastName": "bar",
+          "email": "foobar@outlook.com",
+          "state": "active",
+          "registrationDate": "2018-01-07T21:21:29.16Z",
+          "groups": [],
+          "identities": [
+            {
+              "provider": "Basic",
+              "id": "foobar@outlook.com"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateWebsocketApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateWebsocketApi.json
new file mode 100644
index 000000000000..240443e37808
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateWebsocketApi.json
@@ -0,0 +1,75 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "tempgroup",
+    "parameters": {
+      "properties": {
+        "description": "apidescription5200",
+        "displayName": "apiname1463",
+        "type": "websocket",
+        "serviceUrl": "wss://echo.websocket.org",
+        "path": "newapiPath",
+        "protocols": [
+          "wss",
+          "ws"
+        ]
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apiid9419",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "apiid9419",
+        "properties": {
+          "displayName": "apiname1463",
+          "apiRevision": "1",
+          "description": "apidescription5200",
+          "serviceUrl": "wss://echo.websocket.org",
+          "type": "websocket",
+          "path": "newapiPath",
+          "protocols": [
+            "ws",
+            "wss"
+          ],
+          "authenticationSettings": null,
+          "subscriptionKeyParameterNames": null,
+          "isCurrent": true,
+          "isOnline": true
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/apiid9419",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "apiid9419",
+        "properties": {
+          "displayName": "apiname1463",
+          "apiRevision": "1",
+          "description": "apidescription5200",
+          "serviceUrl": "wss://echo.websocket.org",
+          "type": "websocket",
+          "path": "newapiPath",
+          "protocols": [
+            "ws",
+            "wss"
+          ],
+          "authenticationSettings": null,
+          "subscriptionKeyParameterNames": null,
+          "isCurrent": true,
+          "isOnline": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApi.json
new file mode 100644
index 000000000000..52a336497af6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApi.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echo-api",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiDiagnostic.json
new file mode 100644
index 000000000000..46ceb6600318
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiDiagnostic.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "If-Match": "*"
+  },
+  "responses": {
+    "204": {},
+    "200": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssue.json
new file mode 100644
index 000000000000..857d26e42ce8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssue.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssueAttachment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssueAttachment.json
new file mode 100644
index 000000000000..84afb325b5ef
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssueAttachment.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "attachmentId": "57d2ef278aa04f0888cba3f3",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssueComment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssueComment.json
new file mode 100644
index 000000000000..68335396e23b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiIssueComment.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "commentId": "599e29ab193c3c0bd0b3e2fb",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperation.json
new file mode 100644
index 000000000000..28a56426a063
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperation.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "operationId": "57d2ef278aa04f0ad01d6cdc",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperationPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperationPolicy.json
new file mode 100644
index 000000000000..ce033d01d534
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperationPolicy.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "testapi",
+    "operationId": "testoperation",
+    "policyId": "policy",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperationTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperationTag.json
new file mode 100644
index 000000000000..6eeecc3c8f3a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiOperationTag.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d5b28d1f7fab116c282650",
+    "operationId": "59d5b28d1f7fab116c282651",
+    "tagId": "59d5b28e1f7fab116402044e",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiPolicy.json
new file mode 100644
index 000000000000..5013fd6966de
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiPolicy.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "loggerId",
+    "policyId": "policy",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiRelease.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiRelease.json
new file mode 100644
index 000000000000..b53059e6ed1d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiRelease.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5a5fcc09124a7fa9b89f2f1d",
+    "releaseId": "testrev",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiSchema.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiSchema.json
new file mode 100644
index 000000000000..26a766954360
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiSchema.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d5b28d1f7fab116c282650",
+    "schemaId": "59d5b28e1f7fab116402044e",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiTag.json
new file mode 100644
index 000000000000..e244b050a8ca
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiTag.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d5b28d1f7fab116c282650",
+    "tagId": "59d5b28e1f7fab116402044e",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiTagDescription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiTagDescription.json
new file mode 100644
index 000000000000..a8d5fa5eaf35
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiTagDescription.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d5b28d1f7fab116c282650",
+    "tagDescriptionId": "59d5b28e1f7fab116402044e",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiVersionSet.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiVersionSet.json
new file mode 100644
index 000000000000..923bcff83787
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteApiVersionSet.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "versionSetId": "a1",
+    "If-Match": "*"
+  },
+  "responses": {
+    "204": {},
+    "200": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteAuthorizationServer.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteAuthorizationServer.json
new file mode 100644
index 000000000000..2f001f4079fb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteAuthorizationServer.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "authsid": "newauthServer2",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteBackend.json
new file mode 100644
index 000000000000..7733e5d5fd4a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteBackend.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "backendId": "sfbackend",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteCache.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteCache.json
new file mode 100644
index 000000000000..1928147a59f9
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteCache.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "cacheId": "southindia",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteCertificate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteCertificate.json
new file mode 100644
index 000000000000..442611836396
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteCertificate.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "certificateId": "tempcert",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteContentType.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteContentType.json
new file mode 100644
index 000000000000..63191768f8dc
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteContentType.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "contentTypeId": "page",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteContentTypeContentItem.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteContentTypeContentItem.json
new file mode 100644
index 000000000000..c887252cc9c1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteContentTypeContentItem.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "contentTypeId": "page",
+    "contentItemId": "4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteDiagnostic.json
new file mode 100644
index 000000000000..eecde068546e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteDiagnostic.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGateway.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGateway.json
new file mode 100644
index 000000000000..f822f640051a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGateway.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayApi.json
new file mode 100644
index 000000000000..cfb891378f03
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayApi.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "apiId": "echo-api",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayCertificateAuthority.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayCertificateAuthority.json
new file mode 100644
index 000000000000..4a44d1db366f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayCertificateAuthority.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "certificateId": "default",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayHostnameConfiguration.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayHostnameConfiguration.json
new file mode 100644
index 000000000000..e96e9a14a66e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGatewayHostnameConfiguration.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "hcId": "default",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGroup.json
new file mode 100644
index 000000000000..71001f3507fa
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGroup.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "aadGroup",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGroupUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGroupUser.json
new file mode 100644
index 000000000000..99f5471fb575
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteGroupUser.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "templategroup",
+    "userId": "59307d350af58404d8a26300",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteIdentityProvider.json
new file mode 100644
index 000000000000..6280cf4e347d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteIdentityProvider.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "identityProviderName": "aad",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteLogger.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteLogger.json
new file mode 100644
index 000000000000..5addaee3a365
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteLogger.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "loggerId": "loggerId",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNamedValue.json
new file mode 100644
index 000000000000..3e14b724a871
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNamedValue.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testprop2",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNotificationRecipientEmail.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNotificationRecipientEmail.json
new file mode 100644
index 000000000000..58c526a5dff6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNotificationRecipientEmail.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage",
+    "email": "contoso@live.com"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNotificationRecipientUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNotificationRecipientUser.json
new file mode 100644
index 000000000000..8fe6716ac432
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteNotificationRecipientUser.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage",
+    "userId": "576823d0a40f7e74ec07d642"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteOpenIdConnectProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteOpenIdConnectProvider.json
new file mode 100644
index 000000000000..9b849f862870
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteOpenIdConnectProvider.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "opid": "templateOpenIdConnect3",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletePolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletePolicy.json
new file mode 100644
index 000000000000..2600120f3ed4
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletePolicy.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "policyId": "policy",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletePrivateEndpointConnection.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletePrivateEndpointConnection.json
new file mode 100644
index 000000000000..bb972bbf6841
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletePrivateEndpointConnection.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "privateEndpointConnectionName": "privateEndpointConnectionName"
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/tempgroup?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProduct.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProduct.json
new file mode 100644
index 000000000000..eea36af1e2e3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProduct.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "testproduct",
+    "deleteSubscriptions": true,
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductApi.json
new file mode 100644
index 000000000000..8b5413819288
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductApi.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "testproduct",
+    "apiId": "echo-api",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductGroup.json
new file mode 100644
index 000000000000..1d3483c1c920
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductGroup.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "testproduct",
+    "groupId": "templateGroup",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductPolicy.json
new file mode 100644
index 000000000000..565f1561becf
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductPolicy.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "testproduct",
+    "policyId": "policy",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductTag.json
new file mode 100644
index 000000000000..c187474b20a1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteProductTag.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "59d5b28d1f7fab116c282650",
+    "tagId": "59d5b28e1f7fab116402044e",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteSubscription.json
new file mode 100644
index 000000000000..9fbeb07dee42
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteSubscription.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "sid": "testsub",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteTag.json
new file mode 100644
index 000000000000..34c02edbbfa2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteTag.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "tagId": "tagId1",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteTemplate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteTemplate.json
new file mode 100644
index 000000000000..9db7c52250d1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteTemplate.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "templateName": "newIssueNotificationMessage",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteUser.json
new file mode 100644
index 000000000000..4807cdc22f5e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeleteUser.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512288c680b",
+    "If-Match": "*"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletedServicesListBySubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletedServicesListBySubscription.json
new file mode 100644
index 000000000000..0028b6585a9e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletedServicesListBySubscription.json
@@ -0,0 +1,36 @@
+{
+  "parameters": {
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.ApiManagement/locations/westus/deletedservices/apimService3",
+            "name": "apimService3",
+            "type": "Microsoft.ApiManagement/deletedservices",
+            "location": "West US",
+            "properties": {
+              "serviceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService3",
+              "scheduledPurgeDate": "2017-05-27T15:33:55.5426123Z",
+              "deletionDate": "2017-05-27T15:33:55.5426123Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.ApiManagement/locations/westus2/deletedservices/apimService",
+            "name": "apimService",
+            "type": "Microsoft.ApiManagement/deletedservices",
+            "location": "West US 2",
+            "properties": {
+              "serviceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService",
+              "scheduledPurgeDate": "2017-05-27T15:33:55.5426123Z",
+              "deletionDate": "2017-05-27T15:33:55.5426123Z"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletedServicesPurge.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletedServicesPurge.json
new file mode 100644
index 000000000000..9e895cff6584
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementDeletedServicesPurge.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "serviceName": "apimService3",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "location": "westus"
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/locations/westus/deletedservices/apimService3/operationresults/TGV2eTExMDZtMDJfVGVybV9jMmZlY2QwMA==?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/providers/Microsoft.ApiManagement/locations/westus/deletedservices/apimService3",
+        "name": "apimService3",
+        "type": "Microsoft.ApiManagement/deletedservices",
+        "location": "West US",
+        "properties": {
+          "serviceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService3",
+          "scheduledPurgeDate": "2017-05-27T15:33:55.5426123Z",
+          "deletionDate": "2017-05-27T15:33:55.5426123Z"
+        }
+      }
+    },
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayGenerateToken.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayGenerateToken.json
new file mode 100644
index 000000000000..ad1f633ec689
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayGenerateToken.json
@@ -0,0 +1,20 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "parameters": {
+      "keyType": "primary",
+      "expiry": "2020-04-21T00:44:24.2845269Z"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": "gw1&201904210044&9A1GR1f5WIhFvFmzQG+xxxxxxxxxxx/kBeu87DWad3tkasUXuvPL+MgzlwUHyg=="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayListKeys.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayListKeys.json
new file mode 100644
index 000000000000..e5e88b4727b2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayListKeys.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "primary": "primary_key_value",
+        "secondary": "secondary_key_value"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayRegenerateKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayRegenerateKey.json
new file mode 100644
index 000000000000..742a8d706a9e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGatewayRegenerateKey.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gwId",
+    "parameters": {
+      "keyType": "primary"
+    }
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiContract.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiContract.json
new file mode 100644
index 000000000000..551597def374
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiContract.json
@@ -0,0 +1,34 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d1f7558aa04f15146d9d8a"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "57d1f7558aa04f15146d9d8a",
+        "properties": {
+          "displayName": "Service",
+          "apiRevision": "1",
+          "serviceUrl": "https://api.plexonline.com/DataSource/Service.asmx",
+          "path": "schulte",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "type": "soap",
+          "isCurrent": true,
+          "isOnline": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiDiagnostic.json
new file mode 100644
index 000000000000..bee9fc275ef8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiDiagnostic.json
@@ -0,0 +1,57 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights",
+    "apiId": "57d1f7558aa04f15146d9d8a"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api/diagnostics/applicationinsights",
+        "type": "Microsoft.ApiManagement/service/apis/diagnostics",
+        "name": "applicationinsights",
+        "properties": {
+          "alwaysLog": "allErrors",
+          "httpCorrelationProtocol": "Legacy",
+          "logClientIp": true,
+          "loggerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/aisamplingtest",
+          "sampling": {
+            "samplingType": "fixed",
+            "percentage": 100
+          },
+          "frontend": {
+            "request": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            },
+            "response": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            }
+          },
+          "backend": {
+            "request": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            },
+            "response": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiExportInOpenApi2dot0.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiExportInOpenApi2dot0.json
new file mode 100644
index 000000000000..973e64d8c9b1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiExportInOpenApi2dot0.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echo-api",
+    "format": "swagger-link",
+    "export": "true"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api",
+        "format": "swagger-link-json",
+        "value": {
+          "link": "https://apimgmtstkjpszxxxxxxx.blob.core.windows.net/api-export/Swagger Petstore Extensive.json?sv=2015-07-08&sr=b&sig=mxhLsFuOonu8EXIjyFPV%2FnDra0qTIoip7N7MuU%2BTFsA%3D&se=2019-04-10T22:41:31Z&sp=r"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiExportInOpenApi3dot0.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiExportInOpenApi3dot0.json
new file mode 100644
index 000000000000..a98d79681350
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiExportInOpenApi3dot0.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "aid9676",
+    "format": "openapi-link",
+    "export": "true"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/aid9676",
+        "format": "openapi-link",
+        "value": {
+          "link": "https: //apimgmtstkjpszxxxxxxx.blob.core.windows.net/api-export/Swagger Petstore.yaml?sv=2015-07-08&sr=b&sig=qqtR1y5iTbz5P7USBduqB5vriIU4gmiGqe0lKVV8j9k%3D&se=2019-04-10T22:40:57Z&sp=r"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssue.json
new file mode 100644
index 000000000000..3fe0b02cdeed
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssue.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "issueId": "57d2ef278aa04f0ad01d6cdc"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc",
+        "type": "Microsoft.ApiManagement/service/apis/issues",
+        "name": "57d2ef278aa04f0ad01d6cdc",
+        "properties": {
+          "title": "New API issue",
+          "description": "New API issue description",
+          "createdDate": "2018-02-01T22:21:20.467Z",
+          "state": "open",
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+          "apiId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssueAttachment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssueAttachment.json
new file mode 100644
index 000000000000..c378928464cc
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssueAttachment.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "attachmentId": "57d2ef278aa04f0888cba3f3"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc/attachments/57d2ef278aa04f0888cba3f3",
+        "type": "Microsoft.ApiManagement/service/apis/issues/attachments",
+        "name": "57d2ef278aa04f0888cba3f3",
+        "properties": {
+          "title": "Issue attachment.",
+          "contentFormat": "link",
+          "content": "https://.../image.jpg"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssueComment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssueComment.json
new file mode 100644
index 000000000000..d4ef251927cb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiIssueComment.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "commentId": "599e29ab193c3c0bd0b3e2fb"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc/comments/599e29ab193c3c0bd0b3e2fb",
+        "type": "Microsoft.ApiManagement/service/apis/issues/comments",
+        "name": "599e29ab193c3c0bd0b3e2fb",
+        "properties": {
+          "text": "Issue comment.",
+          "createdDate": "2018-02-01T22:21:20.467Z",
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperation.json
new file mode 100644
index 000000000000..c9a38dfd8a37
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperation.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "operationId": "57d2ef278aa04f0ad01d6cdc"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d2ef278aa04f0888cba3f3/operations/57d2ef278aa04f0ad01d6cdc",
+        "type": "Microsoft.ApiManagement/service/apis/operations",
+        "name": "57d2ef278aa04f0ad01d6cdc",
+        "properties": {
+          "displayName": "CancelOrder",
+          "method": "POST",
+          "urlTemplate": "/?soapAction=http://tempuri.org/IFazioService/CancelOrder",
+          "templateParameters": [],
+          "request": {
+            "description": "IFazioService_CancelOrder_InputMessage",
+            "queryParameters": [],
+            "headers": [],
+            "representations": [
+              {
+                "contentType": "text/xml",
+                "schemaId": "6980a395-f08b-4a59-8295-1440cbd909b8",
+                "typeName": "CancelOrder"
+              }
+            ]
+          },
+          "responses": [
+            {
+              "statusCode": 200,
+              "description": "IFazioService_CancelOrder_OutputMessage",
+              "representations": [
+                {
+                  "contentType": "text/xml",
+                  "schemaId": "6980a395-f08b-4a59-8295-1440cbd909b8",
+                  "typeName": "CancelOrderResponse"
+                }
+              ],
+              "headers": []
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationPetStore.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationPetStore.json
new file mode 100644
index 000000000000..91f345b079f3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationPetStore.json
@@ -0,0 +1,91 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "swagger-petstore",
+    "operationId": "loginUser"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/swagger-petstore/operations/loginUser",
+        "type": "Microsoft.ApiManagement/service/apis/operations",
+        "name": "loginUser",
+        "properties": {
+          "displayName": "Logs user into the system",
+          "method": "GET",
+          "urlTemplate": "/user/login?username={username}&password={password}",
+          "templateParameters": [
+            {
+              "name": "username",
+              "description": "The user name for login",
+              "type": "string",
+              "required": true,
+              "values": []
+            },
+            {
+              "name": "password",
+              "description": "The password for login in clear text",
+              "type": "string",
+              "required": true,
+              "values": []
+            }
+          ],
+          "description": "",
+          "request": {
+            "queryParameters": [],
+            "headers": [],
+            "representations": []
+          },
+          "responses": [
+            {
+              "statusCode": 200,
+              "description": "successful operation",
+              "representations": [
+                {
+                  "contentType": "application/xml",
+                  "schemaId": "5ba91a35f373b513a0bf31c6",
+                  "typeName": "UserLoginGet200ApplicationXmlResponse"
+                },
+                {
+                  "contentType": "application/json",
+                  "schemaId": "5ba91a35f373b513a0bf31c6",
+                  "typeName": "UserLoginGet200ApplicationJsonResponse"
+                }
+              ],
+              "headers": [
+                {
+                  "name": "X-Rate-Limit",
+                  "description": "calls per hour allowed by the user",
+                  "type": "integer",
+                  "values": []
+                },
+                {
+                  "name": "X-Expires-After",
+                  "description": "date in UTC when token expires",
+                  "type": "string",
+                  "values": []
+                }
+              ]
+            },
+            {
+              "statusCode": 400,
+              "description": "Invalid username/password supplied",
+              "representations": [
+                {
+                  "contentType": "application/xml"
+                },
+                {
+                  "contentType": "application/json"
+                }
+              ],
+              "headers": []
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationPolicy.json
new file mode 100644
index 000000000000..8e195abe34b6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationPolicy.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5600b539c53f5b0062040001",
+    "operationId": "5600b53ac53f5b0062080006",
+    "policyId": "policy"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5600b539c53f5b0062040001/operations/5600b53ac53f5b0062080006/policies/policy",
+        "type": "Microsoft.ApiManagement/service/apis/operations/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound>\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <base />\r\n    <set-header name=\"X-My-Sample\" exists-action=\"override\">\r\n      <value>This is a sample</value>\r\n      <!-- for multiple headers with the same name add additional value elements -->\r\n    </set-header>\r\n    <jsonp callback-parameter-name=\"ProcessResponse\" />\r\n  </outbound>\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationTag.json
new file mode 100644
index 000000000000..60629727037a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiOperationTag.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d6bb8f1f7fab13dc67ec9b",
+    "operationId": "59d6bb8f1f7fab13dc67ec9a",
+    "tagId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/59306a29e4bbd510dc24e5f9",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "59306a29e4bbd510dc24e5f9",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiPolicy.json
new file mode 100644
index 000000000000..b482f144dccc
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiPolicy.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5600b59475ff190048040001",
+    "policyId": "policy"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5600b59475ff190048040001/policies/policy",
+        "type": "Microsoft.ApiManagement/service/apis/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<!--\r\n    IMPORTANT:\r\n    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.\r\n    - Only the <forward-request> policy element can appear within the <backend> section element.\r\n    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.\r\n    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.\r\n    - To add a policy position the cursor at the desired insertion point and click on the round button associated with the policy.\r\n    - To remove a policy, delete the corresponding policy statement from the policy document.\r\n    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.\r\n    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.\r\n    - Policies are applied in the order of their appearance, from the top down.\r\n-->\r\n<policies>\r\n  <inbound>\r\n    <quota-by-key calls=\"5\" bandwidth=\"2\" renewal-period=\"&#x9;P3Y6M4DT12H30M5S\" counter-key=\"ba\" />\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <log-to-eventhub logger-id=\"apimService1\" partition-key=\"@(context.Subscription.Id)\">\r\n@{\r\n\tRandom Random = new Random();\r\n\t\t\t\tconst string Chars = \"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz \";                \r\n                return string.Join(\",\", DateTime.UtcNow, new string(\r\n                    Enumerable.Repeat(Chars, Random.Next(2150400))\r\n                              .Select(s =&gt; s[Random.Next(s.Length)])\r\n                              .ToArray()));\r\n          }                           \r\n                        </log-to-eventhub>\r\n    <base />\r\n  </outbound>\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiRelease.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiRelease.json
new file mode 100644
index 000000000000..674dbb00bfef
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiRelease.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "a1",
+    "releaseId": "5a7cb545298324c53224a799"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1/releases/5a7cb545298324c53224a799",
+        "type": "Microsoft.ApiManagement/service/apis/releases",
+        "name": "5a7cb545298324c53224a799",
+        "properties": {
+          "apiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1",
+          "createdDateTime": "2018-02-08T20:38:29.173Z",
+          "updatedDateTime": "2018-02-08T20:38:29.173Z",
+          "notes": "yahoo"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiRevision.json
new file mode 100644
index 000000000000..3739149cb6b2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiRevision.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echo-api;rev=3"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api;rev=3",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "echo-api;rev=3",
+        "properties": {
+          "displayName": "Service",
+          "apiRevision": "3",
+          "serviceUrl": "https://api.plexonline.com/DataSource/Service.asmx",
+          "path": "schulte",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "apiRevisionDescription": "fixed bug in contract"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiSchema.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiSchema.json
new file mode 100644
index 000000000000..8d62b39c859b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiSchema.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d6bb8f1f7fab13dc67ec9b",
+    "schemaId": "ec12520d-9d48-4e7b-8f39-698ca2ac63f1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/59d6bb8f1f7fab13dc67ec9b/schemas/ec12520d-9d48-4e7b-8f39-698ca2ac63f1",
+        "type": "Microsoft.ApiManagement/service/apis/schemas",
+        "name": "ec12520d-9d48-4e7b-8f39-698ca2ac63f1",
+        "properties": {
+          "contentType": "application/vnd.ms-azure-apim.xsd+xml",
+          "document": {
+            "value": "<s:schema elementFormDefault=\"qualified\" targetNamespace=\"http://ws.cdyne.com/WeatherWS/\" xmlns:tns=\"http://ws.cdyne.com/WeatherWS/\" xmlns:s=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:tm=\"http://microsoft.com/wsdl/mime/textMatching/\" xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\" xmlns:apim-wsdltns=\"http://ws.cdyne.com/WeatherWS/\">\r\n  <s:element name=\"GetWeatherInformation\">\r\n    <s:complexType />\r\n  </s:element>\r\n  <s:element name=\"GetWeatherInformationResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"GetWeatherInformationResult\" type=\"tns:ArrayOfWeatherDescription\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"ArrayOfWeatherDescription\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"WeatherDescription\" type=\"tns:WeatherDescription\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"WeatherDescription\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Description\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"PictureURL\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"GetCityForecastByZIP\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ZIP\" type=\"s:string\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:element name=\"GetCityForecastByZIPResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"GetCityForecastByZIPResult\" type=\"tns:ForecastReturn\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"ForecastReturn\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Success\" type=\"s:boolean\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ResponseText\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"State\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"City\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WeatherStationCity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ForecastResult\" type=\"tns:ArrayOfForecast\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"ArrayOfForecast\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"Forecast\" nillable=\"true\" type=\"tns:Forecast\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"Forecast\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Date\" type=\"s:dateTime\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Desciption\" type=\"s:string\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Temperatures\" type=\"tns:temp\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"ProbabilityOfPrecipiation\" type=\"tns:POP\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"temp\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"MorningLow\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"DaytimeHigh\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:complexType name=\"POP\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Nighttime\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Daytime\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"GetCityWeatherByZIP\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ZIP\" type=\"s:string\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:element name=\"GetCityWeatherByZIPResponse\">\r\n    <s:complexType>\r\n      <s:sequence>\r\n        <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"GetCityWeatherByZIPResult\" type=\"tns:WeatherReturn\" />\r\n      </s:sequence>\r\n    </s:complexType>\r\n  </s:element>\r\n  <s:complexType name=\"WeatherReturn\">\r\n    <s:sequence>\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Success\" type=\"s:boolean\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ResponseText\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"State\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"City\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WeatherStationCity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"WeatherID\" type=\"s:short\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Description\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Temperature\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"RelativeHumidity\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Wind\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Pressure\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Visibility\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"WindChill\" type=\"s:string\" />\r\n      <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Remarks\" type=\"s:string\" />\r\n    </s:sequence>\r\n  </s:complexType>\r\n  <s:element name=\"ArrayOfWeatherDescription\" nillable=\"true\" type=\"tns:ArrayOfWeatherDescription\" />\r\n  <s:element name=\"ForecastReturn\" nillable=\"true\" type=\"tns:ForecastReturn\" />\r\n  <s:element name=\"WeatherReturn\" type=\"tns:WeatherReturn\" />\r\n</s:schema>"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiTag.json
new file mode 100644
index 000000000000..680a634f3a70
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiTag.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d6bb8f1f7fab13dc67ec9b",
+    "tagId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/59306a29e4bbd510dc24e5f9",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "59306a29e4bbd510dc24e5f9",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiTagDescription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiTagDescription.json
new file mode 100644
index 000000000000..61edc36c4118
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiTagDescription.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d6bb8f1f7fab13dc67ec9b",
+    "tagDescriptionId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/59d6bb8f1f7fab13dc67ec9b/tagDescriptions/59306a29e4bbd510dc24e5f9",
+        "type": "Microsoft.ApiManagement/service/apis/tagDescriptions",
+        "name": "59306a29e4bbd510dc24e5f9",
+        "properties": {
+          "tagId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/59306a29e4bbd510dc24e5f9",
+          "displayName": "tag1",
+          "description": null,
+          "externalDocsDescription": "some additional info",
+          "externalDocsUrl": "http://some_url.com"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiVersionSet.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiVersionSet.json
new file mode 100644
index 000000000000..0c826aba6e52
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetApiVersionSet.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "versionSetId": "vs1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/vs1",
+        "type": "Microsoft.ApiManagement/service/api-version-sets",
+        "name": "vs1",
+        "properties": {
+          "displayName": "Version Set 1",
+          "versioningScheme": "Segment",
+          "description": "Version configuration"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetAuthorizationServer.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetAuthorizationServer.json
new file mode 100644
index 000000000000..b69a121212bb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetAuthorizationServer.json
@@ -0,0 +1,43 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "authsid": "newauthServer2"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/authorizationServers/newauthServer2",
+        "type": "Microsoft.ApiManagement/service/authorizationServers",
+        "name": "newauthServer2",
+        "properties": {
+          "displayName": "test3",
+          "description": "test server",
+          "clientRegistrationEndpoint": "https://www.contoso.com/apps",
+          "authorizationEndpoint": "https://www.contoso.com/oauth2/auth",
+          "authorizationMethods": [
+            "GET"
+          ],
+          "clientAuthenticationMethod": [
+            "Basic"
+          ],
+          "tokenEndpoint": "https://www.contoso.com/oauth2/token",
+          "supportState": true,
+          "defaultScope": "read write",
+          "grantTypes": [
+            "authorizationCode",
+            "implicit"
+          ],
+          "bearerTokenSendingMethods": [
+            "authorizationHeader"
+          ],
+          "clientId": "1",
+          "resourceOwnerUsername": "un",
+          "resourceOwnerPassword": "pwd"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetBackend.json
new file mode 100644
index 000000000000..38ae8bd8dff3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetBackend.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "backendId": "sfbackend"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/backends/sfbackend",
+        "type": "Microsoft.ApiManagement/service/backends",
+        "name": "sfbackend",
+        "properties": {
+          "description": "Service Fabric Test App 1",
+          "url": "fabric:/mytestapp/mytestservice",
+          "protocol": "http",
+          "properties": {
+            "serviceFabricCluster": {
+              "managementEndpoints": [
+                "https://somecluster.com"
+              ],
+              "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+              "serverX509Names": [
+                {
+                  "name": "ServerCommonName1",
+                  "issuerCertificateThumbprint": "IssuerCertificateThumbprint1"
+                }
+              ],
+              "maxPartitionResolutionRetries": 5
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCache.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCache.json
new file mode 100644
index 000000000000..6f0ed579c12f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCache.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "cacheId": "c1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
+        "type": "Microsoft.ApiManagement/service/caches",
+        "name": "c1",
+        "properties": {
+          "useFromLocation": "default",
+          "description": "Redis cache instances in West India",
+          "connectionString": "{{5f7fbca77a891a2200f3db38}}",
+          "resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCertificate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCertificate.json
new file mode 100644
index 000000000000..36607936f5c7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCertificate.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "certificateId": "templateCert1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCert1",
+        "type": "Microsoft.ApiManagement/service/certificates",
+        "name": "templateCert1",
+        "properties": {
+          "subject": "CN=mutual-authcert",
+          "thumbprint": "EBA**********************8594A6",
+          "expirationDate": "2017-04-23T17:03:41Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCertificateWithKeyVault.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCertificateWithKeyVault.json
new file mode 100644
index 000000000000..bc260ea2d6d2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetCertificateWithKeyVault.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "certificateId": "templateCertkv"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
+        "type": "Microsoft.ApiManagement/service/certificates",
+        "name": "templateCertkv",
+        "properties": {
+          "subject": "CN=*.msitesting.net",
+          "thumbprint": "EA**********************9AD690",
+          "expirationDate": "2037-01-01T07:00:00Z",
+          "keyVault": {
+            "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+            "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+            "lastStatus": {
+              "code": "Success",
+              "timeStampUtc": "2020-09-22T00:24:53.3191468Z"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetContentType.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetContentType.json
new file mode 100644
index 000000000000..760b2ddb3e92
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetContentType.json
@@ -0,0 +1,68 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "contentTypeId": "page"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/contentTypes/page",
+        "type": "Microsoft.ApiManagement/service/contentTypes",
+        "name": "page",
+        "properties": {
+          "name": "Page",
+          "description": "A regular page",
+          "schema": {
+            "properties": {
+              "en_us": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "title": "Title",
+                    "description": "Page title. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "description": {
+                    "title": "Description",
+                    "description": "Page description. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "keywords": {
+                    "title": "Keywords",
+                    "description": "Page keywords. This property gets included in SEO attributes.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "permalink": {
+                    "title": "Permalink",
+                    "description": "Page permalink, e.g. '/about'.",
+                    "type": "string",
+                    "indexed": true
+                  },
+                  "documentId": {
+                    "title": "Document ID",
+                    "description": "Reference to page content document.",
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false,
+                "required": [
+                  "title",
+                  "permalink",
+                  "documentId"
+                ]
+              }
+            },
+            "additionalProperties": false
+          },
+          "version": "1.0.0"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetContentTypeContentItem.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetContentTypeContentItem.json
new file mode 100644
index 000000000000..7c9d1a6e9ddb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetContentTypeContentItem.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "contentTypeId": "page",
+    "contentItemId": "4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/contentTypes/page/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+        "type": "Microsoft.ApiManagement/service/contentTypes/contentItems",
+        "name": "4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+        "properties": {
+          "en_us": {
+            "title": "About",
+            "description": "Short story about the company.",
+            "keywords": "company, about",
+            "documentId": "contentTypes/document/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+            "permalink": "/about"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetDeletedServiceByName.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetDeletedServiceByName.json
new file mode 100644
index 000000000000..e0de0cf30551
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetDeletedServiceByName.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "serviceName": "apimService3",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "location": "westus"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/providers/Microsoft.ApiManagement/locations/westus/deletedservices/apimService3",
+        "name": "apimService3",
+        "type": "Microsoft.ApiManagement/deletedservices",
+        "location": "West US",
+        "properties": {
+          "serviceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService3",
+          "scheduledPurgeDate": "2017-05-27T15:33:55.5426123Z",
+          "deletionDate": "2017-05-27T15:33:55.5426123Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetDiagnostic.json
new file mode 100644
index 000000000000..e15d9711211e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetDiagnostic.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/diagnostics/applicationinsights",
+        "type": "Microsoft.ApiManagement/service/diagnostics",
+        "name": "applicationinsights",
+        "properties": {
+          "alwaysLog": "allErrors",
+          "httpCorrelationProtocol": "Legacy",
+          "logClientIp": true,
+          "loggerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/aisamplingtest",
+          "sampling": {
+            "samplingType": "fixed",
+            "percentage": 100
+          },
+          "frontend": {
+            "request": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            },
+            "response": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            }
+          },
+          "backend": {
+            "request": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            },
+            "response": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGateway.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGateway.json
new file mode 100644
index 000000000000..cffb55723e16
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGateway.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1",
+        "type": "Microsoft.ApiManagement/service/gateways",
+        "name": "a1",
+        "properties": {
+          "description": "my gateway 1",
+          "locationData": {
+            "name": "my location"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGatewayCertificateAuthority.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGatewayCertificateAuthority.json
new file mode 100644
index 000000000000..5e664fbf865e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGatewayCertificateAuthority.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "certificateId": "cert1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/certificateAuthorities/cert1",
+        "type": "Microsoft.ApiManagement/service/gateways/certificateAuthorities",
+        "name": "cert1",
+        "properties": {
+          "isTrusted": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGatewayHostnameConfiguration.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGatewayHostnameConfiguration.json
new file mode 100644
index 000000000000..e853a1ab3688
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGatewayHostnameConfiguration.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "hcId": "default"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/hostnameConfigurations/default",
+        "type": "Microsoft.ApiManagement/service/gateways/hostnameConfigurations",
+        "name": "default",
+        "properties": {
+          "hostname": "*",
+          "certificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+          "negotiateClientCertificate": false
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGroup.json
new file mode 100644
index 000000000000..33be0b3bcc00
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetGroup.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/59306a29e4bbd510dc24e5f9",
+        "type": "Microsoft.ApiManagement/service/groups",
+        "name": "59306a29e4bbd510dc24e5f9",
+        "properties": {
+          "displayName": "AwesomeGroup (samiraad.onmicrosoft.com)",
+          "description": "awesome group of people",
+          "builtIn": false,
+          "type": "external",
+          "externalId": "aad://samiraad.onmicrosoft.com/groups/3773adf4-032e-4d25-9988-eaff9ca72eca"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetIdentityProvider.json
new file mode 100644
index 000000000000..902ff1c91499
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetIdentityProvider.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "identityProviderName": "aadB2C"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/identityProviders/AadB2C",
+        "type": "Microsoft.ApiManagement/service/identityProviders",
+        "name": "AadB2C",
+        "properties": {
+          "clientId": "f02dafe2-b8b8-48ec-a38e-27e5c16c51e5",
+          "type": "aadB2C",
+          "authority": "login.microsoftonline.com",
+          "signinTenant": "contosoaadb2c.onmicrosoft.com",
+          "allowedTenants": [
+            "contosoaadb2c.onmicrosoft.com",
+            "contoso2aadb2c.onmicrosoft.com"
+          ],
+          "signupPolicyName": "B2C_1_policy-signup",
+          "signinPolicyName": "B2C_1_policy-signin"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetIssue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetIssue.json
new file mode 100644
index 000000000000..07ac1f3e3c71
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetIssue.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "issueId": "57d2ef278aa04f0ad01d6cdc"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/issues/57d2ef278aa04f0ad01d6cdc",
+        "type": "Microsoft.ApiManagement/service/issues",
+        "name": "57d2ef278aa04f0ad01d6cdc",
+        "properties": {
+          "title": "New API issue",
+          "description": "New API issue description",
+          "createdDate": "2018-02-01T22:21:20.467Z",
+          "state": "open",
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+          "apiId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetLogger.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetLogger.json
new file mode 100644
index 000000000000..a349f16654f4
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetLogger.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "loggerId": "templateLogger"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/kloudapilogger1",
+        "type": "Microsoft.ApiManagement/service/loggers",
+        "name": "kloudapilogger1",
+        "properties": {
+          "loggerType": "azureEventHub",
+          "description": "testeventhub3again",
+          "credentials": {
+            "name": "testeventhub4",
+            "connectionString": "Endpoint=sb://eventhubapim.servicebus.windows.net/;SharedAccessKeyName=Sender;SharedAccessKey=************"
+          },
+          "isBuffered": true,
+          "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.EventHub/namespaces/eventhubapim"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNamedValue.json
new file mode 100644
index 000000000000..a1022100323d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNamedValue.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testarmTemplateproperties2"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testarmTemplateproperties2",
+        "type": "Microsoft.ApiManagement/service/namedValues",
+        "name": "testarmTemplateproperties2",
+        "properties": {
+          "displayName": "propName",
+          "value": "propValue",
+          "tags": [
+            "foo",
+            "bar"
+          ],
+          "secret": false
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNamedValueWithKeyVault.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNamedValueWithKeyVault.json
new file mode 100644
index 000000000000..efba22412eea
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNamedValueWithKeyVault.json
@@ -0,0 +1,34 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testprop6"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop6",
+        "type": "Microsoft.ApiManagement/service/namedValues",
+        "name": "testprop6",
+        "properties": {
+          "displayName": "prop6namekv",
+          "keyVault": {
+            "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+            "identityClientId": "2d2df842-44d8-4885-8dec-77cc1a984a31",
+            "lastStatus": {
+              "code": "Success",
+              "timeStampUtc": "2020-09-11T00:54:31.8024882Z"
+            }
+          },
+          "tags": [
+            "foo",
+            "bar"
+          ],
+          "secret": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNotification.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNotification.json
new file mode 100644
index 000000000000..8d5261cd0d2b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetNotification.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage",
+        "type": "Microsoft.ApiManagement/service/notifications",
+        "name": "RequestPublisherNotificationMessage",
+        "properties": {
+          "title": "Subscription requests (requiring approval)",
+          "description": "The following email recipients and users will receive email notifications about subscription requests for API products requiring approval.",
+          "recipients": {
+            "emails": [
+              "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/recipientEmails/contoso@live.com",
+              "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/recipientEmails/foobar!live",
+              "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/recipientEmails/foobar@live.com"
+            ],
+            "users": [
+              "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/576823d0a40f7e74ec07d642"
+            ]
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetOpenIdConnectProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetOpenIdConnectProvider.json
new file mode 100644
index 000000000000..700aac6ee9f1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetOpenIdConnectProvider.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "opid": "templateOpenIdConnect2"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/openidConnectProviders/templateOpenIdConnect2",
+        "type": "Microsoft.ApiManagement/service/openidconnectproviders",
+        "name": "templateOpenIdConnect2",
+        "properties": {
+          "displayName": "templateoidprovider2",
+          "description": "open id provider template2",
+          "metadataEndpoint": "https://oidprovider-template2.net",
+          "clientId": "oidprovidertemplate2"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPolicy.json
new file mode 100644
index 000000000000..37d8b9f5f6ad
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPolicy.json
@@ -0,0 +1,21 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "policyId": "policy"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/policies/policy",
+        "type": "Microsoft.ApiManagement/service/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<!--\r\n    IMPORTANT:\r\n    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.\r\n    - Only the <forward-request> policy element can appear within the <backend> section element.\r\n    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.\r\n    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.\r\n    - To add a policy position the cursor at the desired insertion point and click on the round button associated with the policy.\r\n    - To remove a policy, delete the corresponding policy statement from the policy document.\r\n    - Policies are applied in the order of their appearance, from the top down.\r\n-->\r\n<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPolicyFormat.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPolicyFormat.json
new file mode 100644
index 000000000000..eef4d1a08cd6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPolicyFormat.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "policyId": "policy",
+    "format": "rawxml"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/policies/policy",
+        "type": "Microsoft.ApiManagement/service/policies",
+        "name": "policy",
+        "properties": {
+          "format": "rawxml",
+          "value": "<!--\n    IMPORTANT:\n    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.\n    - Only the <forward-request> policy element can appear within the <backend> section element.\n    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.\n    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.\n    - To add a policy position the cursor at the desired insertion point and click on the round button associated with the policy.\n    - To remove a policy, delete the corresponding policy statement from the policy document.\n    - Policies are applied in the order of their appearance, from the top down.\n-->\r\n<policies>\r\n\t<inbound>\r\n\t\t<set-header name=\"correlationid\" exists-action=\"skip\">\r\n\t\t\t<value>@{\n                var guidBinary = new byte[16];\n                Array.Copy(Guid.NewGuid().ToByteArray(), 0, guidBinary, 0, 10);\n                long time = DateTime.Now.Ticks;\n                byte[] bytes = new byte[6];\n                unchecked\n                {\n                       bytes[5] = (byte)(time >> 40);\n                       bytes[4] = (byte)(time >> 32);\n                       bytes[3] = (byte)(time >> 24);\n                       bytes[2] = (byte)(time >> 16);\n                       bytes[1] = (byte)(time >> 8);\n                       bytes[0] = (byte)(time);\n                }\n                Array.Copy(bytes, 0, guidBinary, 10, 6);\n                return new Guid(guidBinary).ToString();\n            }\n            </value>\r\n\t\t</set-header>\r\n\t</inbound>\r\n\t<backend>\r\n\t\t<forward-request />\r\n\t</backend>\r\n\t<outbound />\r\n\t<on-error />\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPortalRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPortalRevision.json
new file mode 100644
index 000000000000..45803139aabd
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPortalRevision.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "portalRevisionId": "20201112101010"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010",
+        "type": "Microsoft.ApiManagement/service/portalRevisions",
+        "name": "20201112101010",
+        "properties": {
+          "description": "portal revision 1",
+          "statusDetails": null,
+          "status": "completed",
+          "isCurrent": true,
+          "createdDateTime": "2020-11-12T22:51:36.47Z",
+          "updatedDateTime": "2020-11-12T22:52:00.097Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPrivateEndpointConnection.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPrivateEndpointConnection.json
new file mode 100644
index 000000000000..3abcaa517394
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPrivateEndpointConnection.json
@@ -0,0 +1,29 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "privateEndpointConnectionName": "privateEndpointConnectionName"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateEndpointConnections/privateEndpointConnectionName",
+        "type": "Microsoft.ApiManagement/service/privateEndpointConnections",
+        "name": "privateEndpointProxyName",
+        "properties": {
+          "provisioningState": "Pending",
+          "privateEndpoint": {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateEndpoints/privateEndpointName"
+          },
+          "privateLinkServiceConnectionState": {
+            "status": "Pending",
+            "description": "Please approve my request, thanks",
+            "actionsRequired": "None"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPrivateLinkGroupResource.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPrivateLinkGroupResource.json
new file mode 100644
index 000000000000..443bb0951515
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetPrivateLinkGroupResource.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "privateLinkSubResourceName": "privateLinkSubResourceName"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateLinkResources/privateLinkSubResourceName",
+        "name": "Gateway",
+        "type": "Microsoft.ApiManagement/service/privateLinkResources",
+        "properties": {
+          "groupId": "Gateway",
+          "requiredMembers": [
+            "Gateway_west_us"
+          ],
+          "requiredZoneNames": [
+            "privateLink.azure.api.net"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProduct.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProduct.json
new file mode 100644
index 000000000000..63259bad2e45
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProduct.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "unlimited"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/unlimited",
+        "type": "Microsoft.ApiManagement/service/products",
+        "name": "unlimited",
+        "properties": {
+          "displayName": "Unlimited",
+          "description": "Subscribers have completely unlimited access to the API. Administrator approval is required.",
+          "subscriptionRequired": true,
+          "approvalRequired": true,
+          "subscriptionsLimit": 1,
+          "state": "published"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProductPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProductPolicy.json
new file mode 100644
index 000000000000..6bda309157ce
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProductPolicy.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "kjoshiarmTemplateProduct4",
+    "policyId": "policy"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/kjoshiarmTemplateProduct4/policies/policy",
+        "type": "Microsoft.ApiManagement/service/products/policies",
+        "name": "policy",
+        "properties": {
+          "value": "<policies>\r\n  <inbound>\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <base />\r\n  </outbound>\r\n  <on-error>\r\n    <base />\r\n  </on-error>\r\n</policies>"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProductTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProductTag.json
new file mode 100644
index 000000000000..5e64670a0add
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetProductTag.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "59d6bb8f1f7fab13dc67ec9b",
+    "tagId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/59306a29e4bbd510dc24e5f9",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "59306a29e4bbd510dc24e5f9",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetQuotaCounterKeys.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetQuotaCounterKeys.json
new file mode 100644
index 000000000000..46a5c2fdc4cc
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetQuotaCounterKeys.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "quotaCounterKey": "ba"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "counterKey": "ba",
+            "periodKey": "0_P3Y6M4DT12H30M5S",
+            "periodStartTime": "2014-08-04T04:24:35Z",
+            "periodEndTime": "2018-02-08T16:54:40Z",
+            "value": {
+              "callsCount": 5,
+              "kbTransferred": 2.5830078125
+            }
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetQuotaCounterKeysByQuotaPeriod.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetQuotaCounterKeysByQuotaPeriod.json
new file mode 100644
index 000000000000..c06170cf0e6e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetQuotaCounterKeysByQuotaPeriod.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "quotaCounterKey": "ba",
+    "quotaPeriodKey": "0_P3Y6M4DT12H30M5S"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "counterKey": "ba",
+        "periodKey": "0_P3Y6M4DT12H30M5S",
+        "periodStartTime": "2014-08-04T04:24:35Z",
+        "periodEndTime": "2018-02-08T16:54:40Z",
+        "value": {
+          "callsCount": 0,
+          "kbTransferred": 2.5625
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByApi.json
new file mode 100644
index 000000000000..e4605aa2a706
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByApi.json
@@ -0,0 +1,55 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "$filter": "timestamp ge datetime'2017-06-01T00:00:00' and timestamp le datetime'2017-06-04T00:00:00'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "Echo API",
+            "apiId": "/apis/5600b59475ff190048040001",
+            "callCountSuccess": 0,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 0,
+            "bandwidth": 0,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 0,
+            "apiTimeMin": 0,
+            "apiTimeMax": 0,
+            "serviceTimeAvg": 0,
+            "serviceTimeMin": 0,
+            "serviceTimeMax": 0
+          },
+          {
+            "name": "httpbin",
+            "apiId": "/apis/57a03a13e4bbd5119c8b19e9",
+            "callCountSuccess": 13,
+            "callCountBlocked": 1,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 14,
+            "bandwidth": 11019,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 1015.7607923076923,
+            "apiTimeMin": 330.3206,
+            "apiTimeMax": 1819.2173,
+            "serviceTimeAvg": 957.094776923077,
+            "serviceTimeMin": 215.24,
+            "serviceTimeMax": 1697.3612
+          }
+        ],
+        "count": 2,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByGeo.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByGeo.json
new file mode 100644
index 000000000000..f13019ef13ec
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByGeo.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "$filter": "timestamp ge datetime'2017-06-01T00:00:00' and timestamp le datetime'2017-06-04T00:00:00'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "country": "US",
+            "region": "WA",
+            "zip": "98052",
+            "callCountSuccess": 13,
+            "callCountBlocked": 1,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 14,
+            "bandwidth": 11019,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 1015.7607923076923,
+            "apiTimeMin": 330.3206,
+            "apiTimeMax": 1819.2173,
+            "serviceTimeAvg": 957.094776923077,
+            "serviceTimeMin": 215.24,
+            "serviceTimeMax": 1697.3612
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByOperation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByOperation.json
new file mode 100644
index 000000000000..8617e9d62cb0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByOperation.json
@@ -0,0 +1,76 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "$filter": "timestamp ge datetime'2017-06-01T00:00:00' and timestamp le datetime'2017-06-04T00:00:00'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "get",
+            "apiId": "/apis/57a03a13e4bbd5119c8b19e9",
+            "operationId": "/apis/57a03a13e4bbd5119c8b19e9/operations/57a03a1dd8d14f0a780d7d14",
+            "callCountSuccess": 13,
+            "callCountBlocked": 1,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 14,
+            "bandwidth": 11019,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 1015.7607923076923,
+            "apiTimeMin": 330.3206,
+            "apiTimeMax": 1819.2173,
+            "serviceTimeAvg": 957.094776923077,
+            "serviceTimeMin": 215.24,
+            "serviceTimeMax": 1697.3612
+          },
+          {
+            "name": "GetWeatherInformation",
+            "apiId": "/apis/57c999d1e4bbd50c988cb2c3",
+            "operationId": "/apis/57c999d1e4bbd50c988cb2c3/operations/57c999d1e4bbd50df889c93e",
+            "callCountSuccess": 0,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 0,
+            "bandwidth": 0,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 0,
+            "apiTimeMin": 0,
+            "apiTimeMax": 0,
+            "serviceTimeAvg": 0,
+            "serviceTimeMin": 0,
+            "serviceTimeMax": 0
+          },
+          {
+            "name": "GetCityForecastByZIP",
+            "apiId": "/apis/57c999d1e4bbd50c988cb2c3",
+            "operationId": "/apis/57c999d1e4bbd50c988cb2c3/operations/57c999d1e4bbd50df889c93f",
+            "callCountSuccess": 0,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 0,
+            "bandwidth": 0,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 0,
+            "apiTimeMin": 0,
+            "apiTimeMax": 0,
+            "serviceTimeAvg": 0,
+            "serviceTimeMin": 0,
+            "serviceTimeMax": 0
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByProduct.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByProduct.json
new file mode 100644
index 000000000000..c8d6716e05bb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByProduct.json
@@ -0,0 +1,55 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "$filter": "timestamp ge datetime'2017-06-01T00:00:00' and timestamp le datetime'2017-06-04T00:00:00'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "Starter",
+            "productId": "/products/5600b59475ff190048060001",
+            "callCountSuccess": 0,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 0,
+            "bandwidth": 0,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 0,
+            "apiTimeMin": 0,
+            "apiTimeMax": 0,
+            "serviceTimeAvg": 0,
+            "serviceTimeMin": 0,
+            "serviceTimeMax": 0
+          },
+          {
+            "name": "Unlimited",
+            "productId": "/products/5600b59475ff190048060002",
+            "callCountSuccess": 13,
+            "callCountBlocked": 1,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 14,
+            "bandwidth": 11019,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 1015.7607923076923,
+            "apiTimeMin": 330.3206,
+            "apiTimeMax": 1819.2173,
+            "serviceTimeAvg": 957.094776923077,
+            "serviceTimeMin": 215.24,
+            "serviceTimeMax": 1697.3612
+          }
+        ],
+        "count": 2,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByRequest.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByRequest.json
new file mode 100644
index 000000000000..ec40e9f7318f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByRequest.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "$filter": "timestamp ge datetime'2017-06-01T00:00:00' and timestamp le datetime'2017-06-04T00:00:00'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "apiId": "/apis/5931a75ae4bbd512a88c680b",
+            "operationId": "/apis/5931a75ae4bbd512a88c680b/operations/-",
+            "productId": "/products/-",
+            "userId": "/users/1",
+            "method": "GET",
+            "url": "https://apimService1.azure-api.net/echo/resource?param1=sample",
+            "ipAddress": "207.xx.155.xx",
+            "responseCode": 404,
+            "responseSize": 405,
+            "timestamp": "2017-06-03T00:17:00.1649134Z",
+            "cache": "none",
+            "apiTime": 221.1544,
+            "serviceTime": 0.0,
+            "apiRegion": "East Asia",
+            "subscriptionId": "/subscriptions/5600b59475ff190048070002",
+            "requestId": "63e7119c-26aa-433c-96d7-f6f3267ff52f",
+            "requestSize": 0
+          },
+          {
+            "apiId": "/apis/5931a75ae4bbd512a88c680b",
+            "operationId": "/apis/5931a75ae4bbd512a88c680b/operations/-",
+            "productId": "/products/-",
+            "userId": "/users/1",
+            "method": "POST",
+            "url": "https://apimService1.azure-api.net/echo/resource",
+            "ipAddress": "207.xx.155.xx",
+            "responseCode": 404,
+            "responseSize": 403,
+            "timestamp": "2017-06-03T00:17:20.5255131Z",
+            "cache": "none",
+            "apiTime": 6.6754000000000007,
+            "serviceTime": 0.0,
+            "apiRegion": "East Asia",
+            "subscriptionId": "/subscriptions/5600b59475ff190048070002",
+            "requestId": "e581b7f7-c9ec-4fc6-8ab9-3855d9b00b04",
+            "requestSize": 0
+          }
+        ],
+        "count": 2
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsBySubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsBySubscription.json
new file mode 100644
index 000000000000..11e44b921a2e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsBySubscription.json
@@ -0,0 +1,79 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "$filter": "timestamp ge datetime'2017-06-01T00:00:00' and timestamp le datetime'2017-06-04T00:00:00'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "",
+            "userId": "/users/1",
+            "productId": "/products/5600b59475ff190048060001",
+            "subscriptionId": "/subscriptions/5600b59475ff190048070001",
+            "callCountSuccess": 0,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 0,
+            "bandwidth": 0,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 0,
+            "apiTimeMin": 0,
+            "apiTimeMax": 0,
+            "serviceTimeAvg": 0,
+            "serviceTimeMin": 0,
+            "serviceTimeMax": 0
+          },
+          {
+            "name": "",
+            "userId": "/users/1",
+            "productId": "/products/5600b59475ff190048060002",
+            "subscriptionId": "/subscriptions/5600b59475ff190048070002",
+            "callCountSuccess": 13,
+            "callCountBlocked": 1,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 14,
+            "bandwidth": 11019,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 1015.7607923076923,
+            "apiTimeMin": 330.3206,
+            "apiTimeMax": 1819.2173,
+            "serviceTimeAvg": 957.094776923077,
+            "serviceTimeMin": 215.24,
+            "serviceTimeMax": 1697.3612
+          },
+          {
+            "name": "",
+            "userId": "/users/1",
+            "productId": "/products/5702e97e5157a50f48dce801",
+            "subscriptionId": "/subscriptions/5702e97e5157a50a9c733303",
+            "callCountSuccess": 0,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 0,
+            "bandwidth": 0,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 0,
+            "apiTimeMin": 0,
+            "apiTimeMax": 0,
+            "serviceTimeAvg": 0,
+            "serviceTimeMin": 0,
+            "serviceTimeMax": 0
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByTime.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByTime.json
new file mode 100644
index 000000000000..a28ffd995f25
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByTime.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "$filter": "timestamp ge datetime'2017-06-01T00:00:00' and timestamp le datetime'2017-06-04T00:00:00'",
+    "interval": "PT15M"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "timestamp": "2017-06-03T00:15:00Z",
+            "interval": "PT15M",
+            "callCountSuccess": 4,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 4,
+            "bandwidth": 3243,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 1337.46335,
+            "apiTimeMin": 885.0839000000001,
+            "apiTimeMax": 1819.2173,
+            "serviceTimeAvg": 1255.917425,
+            "serviceTimeMin": 882.8264,
+            "serviceTimeMax": 1697.3612
+          },
+          {
+            "timestamp": "2017-06-03T00:30:00Z",
+            "interval": "PT15M",
+            "callCountSuccess": 9,
+            "callCountBlocked": 1,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 10,
+            "bandwidth": 7776,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 872.7818777777778,
+            "apiTimeMin": 330.3206,
+            "apiTimeMax": 1093.8407,
+            "serviceTimeAvg": 824.2847111111112,
+            "serviceTimeMin": 215.24,
+            "serviceTimeMax": 973.2262000000001
+          }
+        ],
+        "count": 2,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByUser.json
new file mode 100644
index 000000000000..b2dcea34d3bb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetReportsByUser.json
@@ -0,0 +1,73 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "$filter": "timestamp ge datetime'2017-06-01T00:00:00' and timestamp le datetime'2017-06-04T00:00:00'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "Administrator",
+            "userId": "/users/1",
+            "callCountSuccess": 13,
+            "callCountBlocked": 1,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 14,
+            "bandwidth": 11019,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 1015.7607923076923,
+            "apiTimeMin": 330.3206,
+            "apiTimeMax": 1819.2173,
+            "serviceTimeAvg": 957.094776923077,
+            "serviceTimeMin": 215.24,
+            "serviceTimeMax": 1697.3612
+          },
+          {
+            "name": "Samir Solanki",
+            "userId": "/users/56eaec62baf08b06e46d27fd",
+            "callCountSuccess": 0,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 0,
+            "bandwidth": 0,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 0,
+            "apiTimeMin": 0,
+            "apiTimeMax": 0,
+            "serviceTimeAvg": 0,
+            "serviceTimeMin": 0,
+            "serviceTimeMax": 0
+          },
+          {
+            "name": "Anonymous",
+            "userId": "/users/54c800b332965a0035030000",
+            "callCountSuccess": 0,
+            "callCountBlocked": 0,
+            "callCountFailed": 0,
+            "callCountOther": 0,
+            "callCountTotal": 0,
+            "bandwidth": 0,
+            "cacheHitCount": 0,
+            "cacheMissCount": 0,
+            "apiTimeAvg": 0,
+            "apiTimeMin": 0,
+            "apiTimeMax": 0,
+            "serviceTimeAvg": 0,
+            "serviceTimeMin": 0,
+            "serviceTimeMax": 0
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetSubscription.json
new file mode 100644
index 000000000000..13cd74dbcaa4
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetSubscription.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "sid": "5931a769d8d14f0ad8ce13b8"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/subscriptions/5931a769d8d14f0ad8ce13b8",
+        "type": "Microsoft.ApiManagement/service/subscriptions",
+        "name": "5931a769d8d14f0ad8ce13b8",
+        "properties": {
+          "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/5931a75ae4bbd512a88c680b",
+          "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060002",
+          "displayName": "Unlimited",
+          "state": "submitted",
+          "createdDate": "2017-06-02T17:59:06.223Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTag.json
new file mode 100644
index 000000000000..b47a77767d3b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTag.json
@@ -0,0 +1,21 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "tagId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/59306a29e4bbd510dc24e5f9",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "59306a29e4bbd510dc24e5f9",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTemplate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTemplate.json
new file mode 100644
index 000000000000..d1e4ec675736
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTemplate.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "templateName": "newIssueNotificationMessage"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/templates/NewIssueNotificationMessage",
+        "type": "Microsoft.ApiManagement/service/templates",
+        "name": "NewIssueNotificationMessage",
+        "properties": {
+          "subject": "Your request $IssueName was received",
+          "body": "<!DOCTYPE html >\r\n<html>\r\n  <head />\r\n  <body>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Dear $DevFirstName $DevLastName,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Thank you for contacting us. Our API team will review your issue and get back to you soon.</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">\r\n          Click this <a href=\"http://$DevPortalUrl/issues/$IssueId\">link</a> to view or edit your request.\r\n        </p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Best,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">The $OrganizationName API Team</p>\r\n  </body>\r\n</html>",
+          "title": "New issue received",
+          "description": "This email is sent to developers after they create a new topic on the Issues page of the developer portal.",
+          "isDefault": true,
+          "parameters": [
+            {
+              "name": "DevFirstName",
+              "title": "Developer first name"
+            },
+            {
+              "name": "DevLastName",
+              "title": "Developer last name"
+            },
+            {
+              "name": "IssueId",
+              "title": "Issue id"
+            },
+            {
+              "name": "IssueName",
+              "title": "Issue name"
+            },
+            {
+              "name": "OrganizationName",
+              "title": "Organization name"
+            },
+            {
+              "name": "DevPortalUrl",
+              "title": "Developer portal URL"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantAccess.json
new file mode 100644
index 000000000000..888f2c440d0a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantAccess.json
@@ -0,0 +1,21 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "accessName": "access"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/access",
+        "type": "Microsoft.ApiManagement/service/tenant",
+        "name": "access",
+        "properties": {
+          "enabled": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantGitAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantGitAccess.json
new file mode 100644
index 000000000000..57721d74716d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantGitAccess.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "accessName": "gitAccess"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/gitAccess",
+        "type": "Microsoft.ApiManagement/service/tenant",
+        "name": "gitAccess",
+        "properties": {
+          "principalId": "git",
+          "enabled": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantSettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantSettings.json
new file mode 100644
index 000000000000..28ab3dbaa851
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetTenantSettings.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "settingsType": "public"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/settings/public",
+        "type": "Microsoft.ApiManagement/service/settings",
+        "name": "public",
+        "properties": {
+          "settings": {
+            "CustomPortalSettings.UserRegistrationTerms": null,
+            "CustomPortalSettings.UserRegistrationTermsEnabled": "False",
+            "CustomPortalSettings.UserRegistrationTermsConsentRequired": "False",
+            "CustomPortalSettings.DelegationEnabled": "False",
+            "CustomPortalSettings.DelegationUrl": "",
+            "CustomPortalSettings.DelegatedSubscriptionEnabled": "False"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetUser.json
new file mode 100644
index 000000000000..762eaa48aa58
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetUser.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512a88c680b"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/5931a75ae4bbd512a88c680b",
+        "type": "Microsoft.ApiManagement/service/users",
+        "name": "5931a75ae4bbd512a88c680b",
+        "properties": {
+          "firstName": "foo",
+          "lastName": "bar",
+          "email": "foobar@outlook.com",
+          "state": "active",
+          "registrationDate": "2017-06-02T17:58:50.357Z",
+          "identities": [
+            {
+              "provider": "Microsoft",
+              "id": "*************"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetUserSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetUserSubscription.json
new file mode 100644
index 000000000000..ae19311545d9
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementGetUserSubscription.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "1",
+    "sid": "5fa9b096f3df14003c070001"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1/subscriptions/5fa9b096f3df14003c070001",
+        "type": "Microsoft.ApiManagement/service/users/subscriptions",
+        "name": "5fa9b096f3df14003c070001",
+        "properties": {
+          "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+          "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/starter",
+          "state": "active",
+          "createdDate": "2020-11-09T21:11:50.58Z",
+          "allowTracing": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApi.json
new file mode 100644
index 000000000000..7205dbb6e56f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApi.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d1f7558aa04f15146d9d8a"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiDiagnostic.json
new file mode 100644
index 000000000000..796346ec0c81
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiDiagnostic.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights",
+    "apiId": "57d1f7558aa04f15146d9d8a"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssue.json
new file mode 100644
index 000000000000..16b17a5e866e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssue.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "issueId": "57d2ef278aa04f0ad01d6cdc"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssueAttachment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssueAttachment.json
new file mode 100644
index 000000000000..7d6af5239750
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssueAttachment.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "attachmentId": "57d2ef278aa04f0888cba3f3"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssueComment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssueComment.json
new file mode 100644
index 000000000000..b38c02f72d0a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiIssueComment.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "commentId": "599e29ab193c3c0bd0b3e2fb"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperation.json
new file mode 100644
index 000000000000..3b4391ad8f4f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperation.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "operationId": "57d2ef278aa04f0ad01d6cdc"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperationPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperationPolicy.json
new file mode 100644
index 000000000000..8992c92af083
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperationPolicy.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5600b539c53f5b0062040001",
+    "operationId": "5600b53ac53f5b0062080006",
+    "policyId": "policy"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperationTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperationTag.json
new file mode 100644
index 000000000000..18374880c175
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiOperationTag.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d6bb8f1f7fab13dc67ec9b",
+    "operationId": "59d6bb8f1f7fab13dc67ec9a",
+    "tagId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Etag": "AAAAAAAACCI="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiPolicy.json
new file mode 100644
index 000000000000..101104fb75fb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiPolicy.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "policyId": "policy"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiRelease.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiRelease.json
new file mode 100644
index 000000000000..a42ca3ed0224
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiRelease.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "a1",
+    "releaseId": "5a7cb545298324c53224a799"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiSchema.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiSchema.json
new file mode 100644
index 000000000000..fe0ffa26e819
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiSchema.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "schemaId": "ec12520d-9d48-4e7b-8f39-698ca2ac63f1"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiTag.json
new file mode 100644
index 000000000000..8a5df4ad9dfc
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiTag.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d6bb8f1f7fab13dc67ec9b",
+    "tagId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Etag": "AAAAAAAACCI="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiTagDescription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiTagDescription.json
new file mode 100644
index 000000000000..ccd40e80710b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiTagDescription.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d6bb8f1f7fab13dc67ec9b",
+    "tagDescriptionId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Etag": "AAAAAAAACCI="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiVersionSet.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiVersionSet.json
new file mode 100644
index 000000000000..28cccfe635bd
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadApiVersionSet.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "versionSetId": "vs1"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadAuthorizationServer.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadAuthorizationServer.json
new file mode 100644
index 000000000000..49756d1ef1b0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadAuthorizationServer.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "authsid": "newauthServer2"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadBackend.json
new file mode 100644
index 000000000000..a9a463c1aebb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadBackend.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "backendId": "sfbackend"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadCache.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadCache.json
new file mode 100644
index 000000000000..2a9cbf1aa8bc
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadCache.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "cacheId": "default"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadCertificate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadCertificate.json
new file mode 100644
index 000000000000..9b9a913afd9b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadCertificate.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "certificateId": "templateCert1"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadContentTypeContentItem.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadContentTypeContentItem.json
new file mode 100644
index 000000000000..6f805622b932
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadContentTypeContentItem.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "contentTypeId": "page",
+    "contentItemId": "4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadDelegationSettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadDelegationSettings.json
new file mode 100644
index 000000000000..7407089f02d3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadDelegationSettings.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadDiagnostic.json
new file mode 100644
index 000000000000..5a132911d25e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadDiagnostic.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadEmailTemplate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadEmailTemplate.json
new file mode 100644
index 000000000000..bc81fc49210c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadEmailTemplate.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "templateName": "newIssueNotificationMessage"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGateway.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGateway.json
new file mode 100644
index 000000000000..39b4e2af5a0a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGateway.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "mygateway"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayApi.json
new file mode 100644
index 000000000000..613a5359219e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayApi.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "apiId": "api1"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Etag": "AAAAAAAACCI="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayCertificateAuthority.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayCertificateAuthority.json
new file mode 100644
index 000000000000..88b0baf85a10
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayCertificateAuthority.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "certificateId": "cert1"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayHostnameConfiguration.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayHostnameConfiguration.json
new file mode 100644
index 000000000000..b25c2bd8b112
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGatewayHostnameConfiguration.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "hcId": "default"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGroup.json
new file mode 100644
index 000000000000..cac81f39eef7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGroup.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGroupUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGroupUser.json
new file mode 100644
index 000000000000..59f5ff266466
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadGroupUser.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "59306a29e4bbd510dc24e5f9",
+    "userId": "5931a75ae4bbd512a88c680b"
+  },
+  "responses": {
+    "204": {},
+    "404": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadIdentityProvider.json
new file mode 100644
index 000000000000..570bea92b747
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadIdentityProvider.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "identityProviderName": "aadB2C"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadLogger.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadLogger.json
new file mode 100644
index 000000000000..754bb99051ed
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadLogger.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "loggerId": "templateLogger"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNamedValue.json
new file mode 100644
index 000000000000..86d3cd845ef9
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNamedValue.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testarmTemplateproperties2"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNotificationRecipientEmail.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNotificationRecipientEmail.json
new file mode 100644
index 000000000000..47c6517e8697
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNotificationRecipientEmail.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage",
+    "email": "contoso@live.com"
+  },
+  "responses": {
+    "204": {},
+    "404": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNotificationRecipientUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNotificationRecipientUser.json
new file mode 100644
index 000000000000..3f745b841c81
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadNotificationRecipientUser.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage",
+    "userId": "576823d0a40f7e74ec07d642"
+  },
+  "responses": {
+    "204": {},
+    "404": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadOpenIdConnectProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadOpenIdConnectProvider.json
new file mode 100644
index 000000000000..b13b8ae61e8e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadOpenIdConnectProvider.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "opid": "templateOpenIdConnect2"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadPolicy.json
new file mode 100644
index 000000000000..0c4a0d5daad0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadPolicy.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "policyId": "policy"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadPortalRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadPortalRevision.json
new file mode 100644
index 000000000000..5817f0be66f0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadPortalRevision.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "portalRevisionId": "20201112101010"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProduct.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProduct.json
new file mode 100644
index 000000000000..d1037d98d8de
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProduct.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "unlimited"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductApi.json
new file mode 100644
index 000000000000..382f2883a442
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductApi.json
@@ -0,0 +1,13 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "5931a75ae4bbd512a88c680b",
+    "apiId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductGroup.json
new file mode 100644
index 000000000000..11d10f403276
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductGroup.json
@@ -0,0 +1,13 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "5931a75ae4bbd512a88c680b",
+    "groupId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductPolicy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductPolicy.json
new file mode 100644
index 000000000000..56dec48e20ee
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductPolicy.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "unlimited",
+    "policyId": "policy"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductTag.json
new file mode 100644
index 000000000000..759eb29e39e0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadProductTag.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "59306a29e4bbd510dc24e5f8",
+    "tagId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Etag": "AAAAAAAACCI="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSignInSettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSignInSettings.json
new file mode 100644
index 000000000000..7407089f02d3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSignInSettings.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSignUpSettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSignUpSettings.json
new file mode 100644
index 000000000000..7407089f02d3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSignUpSettings.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSubscription.json
new file mode 100644
index 000000000000..707c5aa5a858
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadSubscription.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "sid": "5931a769d8d14f0ad8ce13b8"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadTag.json
new file mode 100644
index 000000000000..7bb68e37856c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadTag.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "tagId": "59306a29e4bbd510dc24e5f9"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Etag": "AAAAAAAACCI="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadTenantAccess.json
new file mode 100644
index 000000000000..b39672053d76
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadTenantAccess.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "accessName": "access"
+  },
+  "responses": {
+    "200": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadUser.json
new file mode 100644
index 000000000000..42686ac9317b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementHeadUser.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512a88c680b"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "etag": "AAAAAAAAAAa="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementIdentityProviderListSecrets.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementIdentityProviderListSecrets.json
new file mode 100644
index 000000000000..6f1cc26604ca
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementIdentityProviderListSecrets.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "identityProviderName": "aadB2C"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "clientSecret": "XXXXXXX"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiDiagnostics.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiDiagnostics.json
new file mode 100644
index 000000000000..69cb8bb3444f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiDiagnostics.json
@@ -0,0 +1,61 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echo-api"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api/diagnostics/applicationinsights",
+            "type": "Microsoft.ApiManagement/service/apis/diagnostics",
+            "name": "applicationinsights",
+            "properties": {
+              "alwaysLog": "allErrors",
+              "httpCorrelationProtocol": "Legacy",
+              "logClientIp": true,
+              "loggerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/aisamplingtest",
+              "sampling": {
+                "samplingType": "fixed",
+                "percentage": 100
+              },
+              "frontend": {
+                "request": {
+                  "headers": [],
+                  "body": {
+                    "bytes": 100
+                  }
+                },
+                "response": {
+                  "headers": [],
+                  "body": {
+                    "bytes": 100
+                  }
+                }
+              },
+              "backend": {
+                "request": {
+                  "headers": [],
+                  "body": {
+                    "bytes": 100
+                  }
+                },
+                "response": {
+                  "headers": [],
+                  "body": {
+                    "bytes": 100
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "count": 1
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssueAttachments.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssueAttachments.json
new file mode 100644
index 000000000000..6ead6fed5457
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssueAttachments.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "issueId": "57d2ef278aa04f0ad01d6cdc"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc/attachments/57d2ef278aa04f0888cba3f3",
+            "type": "Microsoft.ApiManagement/service/apis/issues/attachments",
+            "name": "57d2ef278aa04f0888cba3f3",
+            "properties": {
+              "title": "Issue attachment.",
+              "contentFormat": "link",
+              "content": "https://.../image.jpg"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssueComments.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssueComments.json
new file mode 100644
index 000000000000..39658e67effb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssueComments.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "issueId": "57d2ef278aa04f0ad01d6cdc"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc/comments/599e29ab193c3c0bd0b3e2fb",
+            "type": "Microsoft.ApiManagement/service/apis/issues/comments",
+            "name": "599e29ab193c3c0bd0b3e2fb",
+            "properties": {
+              "text": "Issue comment.",
+              "createdDate": "2018-02-01T22:21:20.467Z",
+              "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssues.json
new file mode 100644
index 000000000000..506d42f95cb7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiIssues.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d1f7558aa04f15146d9d8a"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc",
+            "type": "Microsoft.ApiManagement/service/apis/issues",
+            "name": "57d2ef278aa04f0ad01d6cdc",
+            "properties": {
+              "title": "New API issue",
+              "description": "New API issue description",
+              "createdDate": "2018-02-01T22:21:20.467Z",
+              "state": "open",
+              "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+              "apiId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationPolicies.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationPolicies.json
new file mode 100644
index 000000000000..b1aa1efb47f2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationPolicies.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "599e2953193c3c0bd0b3e2fa",
+    "operationId": "599e29ab193c3c0bd0b3e2fb"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/599e2953193c3c0bd0b3e2fa/operations/599e29ab193c3c0bd0b3e2fb/policies/policy",
+            "type": "Microsoft.ApiManagement/service/apis/operations/policies",
+            "name": "policy",
+            "properties": {
+              "value": "<!--\r\n    IMPORTANT:\r\n    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.\r\n    - Only the <forward-request> policy element can appear within the <backend> section element.\r\n    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.\r\n    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.\r\n    - To add a policy position the cursor at the desired insertion point and click on the round button associated with the policy.\r\n    - To remove a policy, delete the corresponding policy statement from the policy document.\r\n    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.\r\n    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.\r\n    - Policies are applied in the order of their appearance, from the top down.\r\n-->\r\n<policies>\r\n  <inbound>\r\n    <validate-jwt header-name=\"dd\">\r\n      <required-claims>\r\n        <claim name=\"bla\" separator=\"\">\r\n          <value>xxx</value>\r\n        </claim>\r\n      </required-claims>\r\n    </validate-jwt>\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <base />\r\n  </outbound>\r\n</policies>"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationTags.json
new file mode 100644
index 000000000000..52da145b0809
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationTags.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "operationId": "57d2ef278aa04f0888cba3f6"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/5600b539c53f5b0062060002",
+            "type": "Microsoft.ApiManagement/service/tags",
+            "name": "5600b539c53f5b0062060002",
+            "properties": {
+              "displayName": "tag1"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperations.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperations.json
new file mode 100644
index 000000000000..e0472bd8f192
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperations.json
@@ -0,0 +1,70 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3",
+    "operationId": "57d2ef278aa04f0ad01d6cdc"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d2ef278aa04f0888cba3f3/operations/57d2ef278aa04f0ad01d6cdc",
+            "type": "Microsoft.ApiManagement/service/apis/operations",
+            "name": "57d2ef278aa04f0ad01d6cdc",
+            "properties": {
+              "displayName": "CancelOrder",
+              "method": "POST",
+              "urlTemplate": "/?soapAction=http://tempuri.org/IFazioService/CancelOrder"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d2ef278aa04f0888cba3f3/operations/57d2ef278aa04f0ad01d6cda",
+            "type": "Microsoft.ApiManagement/service/apis/operations",
+            "name": "57d2ef278aa04f0ad01d6cda",
+            "properties": {
+              "displayName": "GetMostRecentOrder",
+              "method": "POST",
+              "urlTemplate": "/?soapAction=http://tempuri.org/IFazioService/GetMostRecentOrder"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d2ef278aa04f0888cba3f3/operations/57d2ef278aa04f0ad01d6cd9",
+            "type": "Microsoft.ApiManagement/service/apis/operations",
+            "name": "57d2ef278aa04f0ad01d6cd9",
+            "properties": {
+              "displayName": "GetOpenOrders",
+              "method": "POST",
+              "urlTemplate": "/?soapAction=http://tempuri.org/IFazioService/GetOpenOrders"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d2ef278aa04f0888cba3f3/operations/57d2ef278aa04f0ad01d6cdb",
+            "type": "Microsoft.ApiManagement/service/apis/operations",
+            "name": "57d2ef278aa04f0ad01d6cdb",
+            "properties": {
+              "displayName": "GetOrder",
+              "method": "POST",
+              "urlTemplate": "/?soapAction=http://tempuri.org/IFazioService/GetOrder"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d2ef278aa04f0888cba3f3/operations/57d2ef278aa04f0ad01d6cd8",
+            "type": "Microsoft.ApiManagement/service/apis/operations",
+            "name": "57d2ef278aa04f0ad01d6cd8",
+            "properties": {
+              "displayName": "submitOrder",
+              "method": "POST",
+              "urlTemplate": "/?soapAction=http://tempuri.org/IFazioService/submitOrder"
+            }
+          }
+        ],
+        "count": 5,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationsByTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationsByTags.json
new file mode 100644
index 000000000000..11ca8d8bfa10
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiOperationsByTags.json
@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "a1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "tag": {
+              "id": "/tags/apitag123",
+              "name": "awesomeTag"
+            },
+            "operation": {
+              "id": "/apis/echo-api/operations/create-resource",
+              "apiName": "Echo API",
+              "apiRevision": "1",
+              "name": "Create resource",
+              "method": "POST",
+              "urlTemplate": "/resource",
+              "description": "A demonstration of a POST call based on the echo backend above. The request body is expected to contain JSON-formatted data (see example below). A policy is used to automatically transform any request sent in JSON directly to XML. In a real-world scenario this could be used to enable modern clients to speak to a legacy backend."
+            }
+          }
+        ],
+        "count": 1
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiPolicies.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiPolicies.json
new file mode 100644
index 000000000000..0e6e8b93e004
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiPolicies.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "5600b59475ff190048040001"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5600b59475ff190048040001/policies/policy",
+            "type": "Microsoft.ApiManagement/service/apis/policies",
+            "name": "policy",
+            "properties": {
+              "value": "<!--\r\n    IMPORTANT:\r\n    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.\r\n    - Only the <forward-request> policy element can appear within the <backend> section element.\r\n    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.\r\n    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.\r\n    - To add a policy position the cursor at the desired insertion point and click on the round button associated with the policy.\r\n    - To remove a policy, delete the corresponding policy statement from the policy document.\r\n    - Position the <base> element within a section element to inherit all policies from the corresponding section element in the enclosing scope.\r\n    - Remove the <base> element to prevent inheriting policies from the corresponding section element in the enclosing scope.\r\n    - Policies are applied in the order of their appearance, from the top down.\r\n-->\r\n<policies>\r\n  <inbound>\r\n    <quota-by-key calls=\"5\" bandwidth=\"2\" renewal-period=\"&#x9;P3Y6M4DT12H30M5S\" counter-key=\"ba\" />\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <log-to-eventhub logger-id=\"apimService1\" partition-key=\"@(context.Subscription.Id)\">\r\n@{\r\n\tRandom Random = new Random();\r\n\t\t\t\tconst string Chars = \"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz \";                \r\n                return string.Join(\",\", DateTime.UtcNow, new string(\r\n                    Enumerable.Repeat(Chars, Random.Next(2150400))\r\n                              .Select(s =&gt; s[Random.Next(s.Length)])\r\n                              .ToArray()));\r\n          }                           \r\n                        </log-to-eventhub>\r\n    <base />\r\n  </outbound>\r\n</policies>"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiProducts.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiProducts.json
new file mode 100644
index 000000000000..9f9e498fee2a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiProducts.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b539c53f5b0062060002",
+            "type": "Microsoft.ApiManagement/service/apis/products",
+            "name": "5600b539c53f5b0062060002",
+            "properties": {
+              "displayName": "Unlimited",
+              "description": "Subscribers have completely unlimited access to the API. Administrator approval is required.",
+              "subscriptionRequired": true,
+              "approvalRequired": true,
+              "subscriptionsLimit": 1,
+              "state": "published"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiReleases.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiReleases.json
new file mode 100644
index 000000000000..4ef44217a6e6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiReleases.json
@@ -0,0 +1,29 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "a1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1/releases/5a7cb545298324c53224a799",
+            "type": "Microsoft.ApiManagement/service/apis/releases",
+            "name": "5a7cb545298324c53224a799",
+            "properties": {
+              "createdDateTime": "2018-02-08T20:38:29.173Z",
+              "updatedDateTime": "2018-02-08T20:38:29.173Z",
+              "notes": "yahoo"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiRevisions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiRevisions.json
new file mode 100644
index 000000000000..b2dc39a78e58
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiRevisions.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "apiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1;rev=1",
+            "apiRevision": "1",
+            "createdDateTime": "2018-02-01T22:21:20.467Z",
+            "updatedDateTime": "2018-02-01T22:21:20.467Z",
+            "isOnline": true,
+            "isCurrent": true
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiSchemas.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiSchemas.json
new file mode 100644
index 000000000000..0e206dfb1de6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiSchemas.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "59d5b28d1f7fab116c282650"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/59d5b28d1f7fab116c282650/schemas/59d5b28e1f7fab116402044e",
+            "type": "Microsoft.ApiManagement/service/apis/schemas",
+            "name": "59d5b28e1f7fab116402044e",
+            "properties": {
+              "contentType": "application/vnd.ms-azure-apim.swagger.definitions+json"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiTagDescriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiTagDescriptions.json
new file mode 100644
index 000000000000..639f2a709fe0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiTagDescriptions.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tagDescriptions/5600b539c53f5b0062060002",
+            "type": "Microsoft.ApiManagement/service/tags",
+            "name": "5600b539c53f5b0062060002",
+            "properties": {
+              "tagId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/5600b539c53f5b0062060002",
+              "displayName": "tag1",
+              "externalDocsDescription": "some additional info",
+              "externalDocsUrl": "http://some_url.com"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiTags.json
new file mode 100644
index 000000000000..0309cc029dcd
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiTags.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "57d2ef278aa04f0888cba3f3"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/5600b539c53f5b0062060002",
+            "type": "Microsoft.ApiManagement/service/tags",
+            "name": "5600b539c53f5b0062060002",
+            "properties": {
+              "displayName": "tag1"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiVersionSets.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiVersionSets.json
new file mode 100644
index 000000000000..b270d310778b
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApiVersionSets.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/vs1",
+            "type": "Microsoft.ApiManagement/service/api-version-sets",
+            "name": "vs1",
+            "properties": {
+              "displayName": "api set 1",
+              "versioningScheme": "Segment",
+              "description": "Version configuration"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/vs2",
+            "type": "Microsoft.ApiManagement/service/api-version-sets",
+            "name": "vs2",
+            "properties": {
+              "displayName": "api set 2",
+              "versioningScheme": "Query",
+              "description": "Version configuration 2"
+            }
+          }
+        ],
+        "count": 2,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApis.json
new file mode 100644
index 000000000000..b63d4ca57a7f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApis.json
@@ -0,0 +1,82 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1",
+            "type": "Microsoft.ApiManagement/service/apis",
+            "name": "a1",
+            "properties": {
+              "displayName": "api1",
+              "apiRevision": "1",
+              "serviceUrl": "http://echoapi.cloudapp.net/api",
+              "path": "api1",
+              "protocols": [
+                "https"
+              ],
+              "isCurrent": true,
+              "apiVersionSetId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/c48f96c9-1385-4e2d-b410-5ab591ce0fc4"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5a73933b8f27f7cc82a2d533",
+            "type": "Microsoft.ApiManagement/service/apis",
+            "name": "5a73933b8f27f7cc82a2d533",
+            "properties": {
+              "displayName": "api1",
+              "apiRevision": "1",
+              "serviceUrl": "http://echoapi.cloudapp.net/api",
+              "path": "api1",
+              "protocols": [
+                "https"
+              ],
+              "isCurrent": true,
+              "apiVersion": "v1",
+              "apiVersionSetId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/c48f96c9-1385-4e2d-b410-5ab591ce0fc4"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api",
+            "type": "Microsoft.ApiManagement/service/apis",
+            "name": "echo-api",
+            "properties": {
+              "displayName": "Echo API",
+              "apiRevision": "1",
+              "serviceUrl": "http://echoapi.cloudapp.net/api",
+              "path": "echo",
+              "protocols": [
+                "https"
+              ],
+              "isCurrent": true
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/5a7390baa5816a110435aee0",
+            "type": "Microsoft.ApiManagement/service/apis",
+            "name": "5a7390baa5816a110435aee0",
+            "properties": {
+              "displayName": "Swagger Petstore Extensive",
+              "apiRevision": "1",
+              "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+              "serviceUrl": "http://petstore.swagger.wordnik.com/api",
+              "path": "vvv",
+              "protocols": [
+                "https"
+              ],
+              "isCurrent": true
+            }
+          }
+        ],
+        "count": 4,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApisByTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApisByTags.json
new file mode 100644
index 000000000000..8560bccc526f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListApisByTags.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "tag": {
+              "id": "/tags/apitag123",
+              "name": "awesomeTag"
+            },
+            "api": {
+              "id": "/apis/echo-api",
+              "name": "Echo API",
+              "apiRevision": "1",
+              "serviceUrl": "http://echoapi.cloudapp.net/api",
+              "path": "echo",
+              "isCurrent": true
+            }
+          }
+        ],
+        "count": 1
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListAuthorizationServers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListAuthorizationServers.json
new file mode 100644
index 000000000000..6f8c89e65974
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListAuthorizationServers.json
@@ -0,0 +1,74 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/authorizationServers/newauthServer",
+            "type": "Microsoft.ApiManagement/service/authorizationServers",
+            "name": "newauthServer",
+            "properties": {
+              "displayName": "test2",
+              "description": "test server",
+              "clientRegistrationEndpoint": "https://www.contoso.com/apps",
+              "authorizationEndpoint": "https://www.contoso.com/oauth2/auth",
+              "authorizationMethods": [
+                "GET"
+              ],
+              "tokenEndpoint": "https://www.contoso.com/oauth2/token",
+              "supportState": true,
+              "defaultScope": "read write",
+              "grantTypes": [
+                "authorizationCode",
+                "implicit"
+              ],
+              "bearerTokenSendingMethods": [
+                "authorizationHeader"
+              ],
+              "clientId": "1",
+              "resourceOwnerUsername": "un",
+              "resourceOwnerPassword": "pwd"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/authorizationServers/newauthServer2",
+            "type": "Microsoft.ApiManagement/service/authorizationServers",
+            "name": "newauthServer2",
+            "properties": {
+              "displayName": "test3",
+              "description": "test server",
+              "clientRegistrationEndpoint": "https://www.contoso.com/apps",
+              "authorizationEndpoint": "https://www.contoso.com/oauth2/auth",
+              "authorizationMethods": [
+                "GET"
+              ],
+              "clientAuthenticationMethod": [
+                "Basic"
+              ],
+              "tokenEndpoint": "https://www.contoso.com/oauth2/token",
+              "supportState": true,
+              "defaultScope": "read write",
+              "grantTypes": [
+                "authorizationCode",
+                "implicit"
+              ],
+              "bearerTokenSendingMethods": [
+                "authorizationHeader"
+              ],
+              "clientId": "1",
+              "resourceOwnerUsername": "un",
+              "resourceOwnerPassword": "pwd"
+            }
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListBackends.json
new file mode 100644
index 000000000000..240aa53e6fe9
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListBackends.json
@@ -0,0 +1,81 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/backends/proxybackend",
+            "type": "Microsoft.ApiManagement/service/backends",
+            "name": "proxybackend",
+            "properties": {
+              "description": "description5308",
+              "url": "https://backendname2644/",
+              "protocol": "http",
+              "credentials": {
+                "query": {
+                  "sv": [
+                    "xx",
+                    "bb",
+                    "cc"
+                  ]
+                },
+                "header": {
+                  "x-my-1": [
+                    "val1",
+                    "val2"
+                  ]
+                },
+                "authorization": {
+                  "scheme": "Basic",
+                  "parameter": "opensesma"
+                }
+              },
+              "proxy": {
+                "url": "http://192.168.1.1:8080",
+                "username": "Contoso\\admin",
+                "password": "<password>"
+              },
+              "tls": {
+                "validateCertificateChain": false,
+                "validateCertificateName": false
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/backends/sfbackend",
+            "type": "Microsoft.ApiManagement/service/backends",
+            "name": "sfbackend",
+            "properties": {
+              "description": "Service Fabric Test App 1",
+              "url": "fabric:/mytestapp/mytestservice",
+              "protocol": "http",
+              "properties": {
+                "serviceFabricCluster": {
+                  "managementEndpoints": [
+                    "https://somecluster.com"
+                  ],
+                  "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+                  "serverX509Names": [
+                    {
+                      "name": "ServerCommonName1",
+                      "issuerCertificateThumbprint": "IssuerCertificateThumbprint1"
+                    }
+                  ],
+                  "maxPartitionResolutionRetries": 5
+                }
+              }
+            }
+          }
+        ],
+        "count": 2,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListCaches.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListCaches.json
new file mode 100644
index 000000000000..b7dbedafb6fd
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListCaches.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "serviceName": "apimService1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
+            "type": "Microsoft.ApiManagement/service/caches",
+            "name": "c1",
+            "properties": {
+              "useFromLocation": "default",
+              "description": "Redis cache instances in West India",
+              "connectionString": "{{5f7fbca77a891a2200f3db38}}",
+              "resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
+            }
+          }
+        ],
+        "count": 1
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListCertificates.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListCertificates.json
new file mode 100644
index 000000000000..84f15470263f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListCertificates.json
@@ -0,0 +1,46 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "serviceName": "apimService1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/kjoshiarmtemplateCert1",
+            "type": "Microsoft.ApiManagement/service/certificates",
+            "name": "templateCert1",
+            "properties": {
+              "subject": "CN=mutual-authcert",
+              "thumbprint": "EBA************************48594A6",
+              "expirationDate": "2017-04-23T17:03:41Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
+            "type": "Microsoft.ApiManagement/service/certificates",
+            "name": "templateCertkv",
+            "properties": {
+              "subject": "CN=*.msitesting.net",
+              "thumbprint": "EA**********************9AD690",
+              "expirationDate": "2037-01-01T07:00:00Z",
+              "keyVault": {
+                "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+                "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+                "lastStatus": {
+                  "code": "Success",
+                  "timeStampUtc": "2020-09-22T00:24:53.3191468Z"
+                }
+              }
+            }
+          }
+        ],
+        "count": 2,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListContentTypeContentItems.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListContentTypeContentItems.json
new file mode 100644
index 000000000000..a37fc9c049fc
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListContentTypeContentItems.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "serviceName": "apimService1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "contentTypeId": "page"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/contentTypes/page/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+            "type": "Microsoft.ApiManagement/service/contentTypes/contentItems",
+            "name": "4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+            "properties": {
+              "en_us": {
+                "title": "About",
+                "description": "Short story about the company.",
+                "keywords": "company, about",
+                "documentId": "contentTypes/document/contentItems/4e3cf6a5-574a-ba08-1f23-2e7a38faa6d8",
+                "permalink": "/about"
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListContentTypes.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListContentTypes.json
new file mode 100644
index 000000000000..9f12aa1af322
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListContentTypes.json
@@ -0,0 +1,71 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "serviceName": "apimService1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/contentTypes/page",
+            "type": "Microsoft.ApiManagement/service/contentTypes",
+            "name": "page",
+            "properties": {
+              "name": "Page",
+              "description": "A regular page",
+              "schema": {
+                "properties": {
+                  "en_us": {
+                    "type": "object",
+                    "properties": {
+                      "title": {
+                        "title": "Title",
+                        "description": "Page title. This property gets included in SEO attributes.",
+                        "type": "string",
+                        "indexed": true
+                      },
+                      "description": {
+                        "title": "Description",
+                        "description": "Page description. This property gets included in SEO attributes.",
+                        "type": "string",
+                        "indexed": true
+                      },
+                      "keywords": {
+                        "title": "Keywords",
+                        "description": "Page keywords. This property gets included in SEO attributes.",
+                        "type": "string",
+                        "indexed": true
+                      },
+                      "permalink": {
+                        "title": "Permalink",
+                        "description": "Page permalink, e.g. '/about'.",
+                        "type": "string",
+                        "indexed": true
+                      },
+                      "documentId": {
+                        "title": "Document ID",
+                        "description": "Reference to page content document.",
+                        "type": "string"
+                      }
+                    },
+                    "additionalProperties": false,
+                    "required": [
+                      "title",
+                      "permalink",
+                      "documentId"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              },
+              "version": "1.0.0"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListDiagnostics.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListDiagnostics.json
new file mode 100644
index 000000000000..d780dbe123fb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListDiagnostics.json
@@ -0,0 +1,74 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/diagnostics/applicationinsights",
+            "type": "Microsoft.ApiManagement/service/diagnostics",
+            "name": "applicationinsights",
+            "properties": {
+              "alwaysLog": "allErrors",
+              "httpCorrelationProtocol": "Legacy",
+              "verbosity": "information",
+              "logClientIp": true,
+              "loggerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/aisamplingtest",
+              "sampling": {
+                "samplingType": "fixed",
+                "percentage": 100
+              },
+              "frontend": {
+                "request": {
+                  "headers": [],
+                  "body": {
+                    "bytes": 0
+                  }
+                },
+                "response": {
+                  "headers": [],
+                  "body": {
+                    "bytes": 0
+                  }
+                }
+              },
+              "backend": {
+                "request": {
+                  "headers": [],
+                  "body": {
+                    "bytes": 0
+                  }
+                },
+                "response": {
+                  "headers": [],
+                  "body": {
+                    "bytes": 0
+                  }
+                }
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/diagnostics/azuremonitor",
+            "type": "Microsoft.ApiManagement/service/diagnostics",
+            "name": "azuremonitor",
+            "properties": {
+              "logClientIp": true,
+              "loggerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/azuremonitor",
+              "sampling": {
+                "samplingType": "fixed",
+                "percentage": 100
+              }
+            }
+          }
+        ],
+        "count": 1
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayApis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayApis.json
new file mode 100644
index 000000000000..ab95b5dbaf21
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayApis.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/apis/57681820a40f7eb6c49f6aca",
+            "type": "Microsoft.ApiManagement/service/gateways/apis",
+            "name": "57681820a40f7eb6c49f6aca",
+            "properties": {
+              "displayName": "api_57681820a40f7eb6c49f6acb",
+              "apiRevision": "1",
+              "description": "description_57681820a40f7eb6c49f6acc",
+              "serviceUrl": "http://contoso/57681820a40f7eb6c49f6acd",
+              "path": "suffix_57681820a40f7eb6c49f6ace",
+              "protocols": [
+                "https"
+              ],
+              "isCurrent": true
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayCertificateAuthorities.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayCertificateAuthorities.json
new file mode 100644
index 000000000000..0fcb8acc3686
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayCertificateAuthorities.json
@@ -0,0 +1,34 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/certificateAuthorities/cert1",
+            "type": "Microsoft.ApiManagement/service/gateways/certificateAuthorities",
+            "name": "cert1",
+            "properties": {
+              "isTrusted": false
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/certificateAuthorities/cert2",
+            "type": "Microsoft.ApiManagement/service/gateways/certificateAuthorities",
+            "name": "cert2",
+            "properties": {
+              "isTrusted": true
+            }
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayHostnameConfigurations.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayHostnameConfigurations.json
new file mode 100644
index 000000000000..8ae2e2cff261
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGatewayHostnameConfigurations.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/hostnameConfigurations/default",
+            "type": "Microsoft.ApiManagement/service/gateways/hostnameConfigurations",
+            "name": "default",
+            "properties": {
+              "hostname": "*",
+              "certificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1",
+              "negotiateClientCertificate": false
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1/hostnameConfigurations/hostname1",
+            "type": "Microsoft.ApiManagement/service/gateways/hostnameConfigurations",
+            "name": "default",
+            "properties": {
+              "hostname": "foo.bar.com",
+              "certificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert2",
+              "negotiateClientCertificate": true
+            }
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGateways.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGateways.json
new file mode 100644
index 000000000000..55011adc3895
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGateways.json
@@ -0,0 +1,40 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1",
+            "type": "Microsoft.ApiManagement/service/gateways",
+            "name": "a1",
+            "properties": {
+              "description": "my gateway 1",
+              "locationData": {
+                "name": "my location 1"
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw2",
+            "type": "Microsoft.ApiManagement/service/gateways",
+            "name": "5a73933b8f27f7cc82a2d533",
+            "properties": {
+              "description": "my gateway 2",
+              "locationData": {
+                "name": "my location 2"
+              }
+            }
+          }
+        ],
+        "count": 2,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGroupUsers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGroupUsers.json
new file mode 100644
index 000000000000..e120cce81a84
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGroupUsers.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "57d2ef278aa04f0888cba3f3"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/kjoshiarmTemplateUser1",
+            "type": "Microsoft.ApiManagement/service/groups/users",
+            "name": "armTemplateUser1",
+            "properties": {
+              "firstName": "user1",
+              "lastName": "lastname1",
+              "email": "user1@live.com",
+              "state": "active",
+              "registrationDate": "2017-05-31T18:54:41.447Z",
+              "note": "note for user 1",
+              "identities": [
+                {
+                  "provider": "Basic",
+                  "id": "user1@live.com"
+                }
+              ]
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGroups.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGroups.json
new file mode 100644
index 000000000000..7aa18612d736
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListGroups.json
@@ -0,0 +1,63 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/5600b59375ff190048020001",
+            "type": "Microsoft.ApiManagement/service/groups",
+            "name": "5600b59375ff190048020001",
+            "properties": {
+              "displayName": "Administrators",
+              "description": "Administrators is a built-in group. Its membership is managed by the system. Microsoft Azure subscription administrators fall into this group.",
+              "builtIn": true,
+              "type": "system"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/59306a29e4bbd510dc24e5f9",
+            "type": "Microsoft.ApiManagement/service/groups",
+            "name": "59306a29e4bbd510dc24e5f9",
+            "properties": {
+              "displayName": "AwesomeGroup (samiraad.onmicrosoft.com)",
+              "description": "awesome group of people",
+              "builtIn": false,
+              "type": "external",
+              "externalId": "aad://samiraad.onmicrosoft.com/groups/3773adf4-032e-4d25-9988-eaff9ca72eca"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/5600b59375ff190048020002",
+            "type": "Microsoft.ApiManagement/service/groups",
+            "name": "5600b59375ff190048020002",
+            "properties": {
+              "displayName": "Developers",
+              "description": "Developers is a built-in group. Its membership is managed by the system. Signed-in users fall into this group.",
+              "builtIn": true,
+              "type": "system"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/5600b59375ff190048020003",
+            "type": "Microsoft.ApiManagement/service/groups",
+            "name": "5600b59375ff190048020003",
+            "properties": {
+              "displayName": "Guests",
+              "description": "Guests is a built-in group. Its membership is managed by the system. Unauthenticated users visiting the developer portal fall into this group.",
+              "builtIn": true,
+              "type": "system"
+            }
+          }
+        ],
+        "count": 4,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListIdentityProviders.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListIdentityProviders.json
new file mode 100644
index 000000000000..634e9e64b7c8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListIdentityProviders.json
@@ -0,0 +1,53 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/identityProviders/Google",
+            "type": "Microsoft.ApiManagement/service/identityProviders",
+            "name": "Google",
+            "properties": {
+              "clientId": "googleId",
+              "type": "google"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/identityProviders/Aad",
+            "type": "Microsoft.ApiManagement/service/identityProviders",
+            "name": "Aad",
+            "properties": {
+              "clientId": "aadapplicationid",
+              "type": "aad",
+              "allowedTenants": [
+                "samiraad.onmicrosoft.com"
+              ]
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/identityProviders/AadB2C",
+            "type": "Microsoft.ApiManagement/service/identityProviders",
+            "name": "AadB2C",
+            "properties": {
+              "clientId": "aadb2clientId",
+              "type": "aadB2C",
+              "allowedTenants": [
+                "samirtestbc.onmicrosoft.com"
+              ],
+              "signupPolicyName": "B2C_1_Signup_Default",
+              "signinPolicyName": "B2C_1_Signin_Default"
+            }
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListIssues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListIssues.json
new file mode 100644
index 000000000000..a09178752a54
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListIssues.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/issues/57d2ef278aa04f0ad01d6cdc",
+            "type": "Microsoft.ApiManagement/service/issues",
+            "name": "57d2ef278aa04f0ad01d6cdc",
+            "properties": {
+              "title": "New API issue",
+              "description": "New API issue description",
+              "createdDate": "2018-02-01T22:21:20.467Z",
+              "state": "open",
+              "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+              "apiId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListLoggers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListLoggers.json
new file mode 100644
index 000000000000..5a314438929e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListLoggers.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "serviceName": "apimService1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/azuremonitor",
+            "type": "Microsoft.ApiManagement/service/loggers",
+            "name": "azuremonitor",
+            "properties": {
+              "loggerType": "azureMonitor",
+              "isBuffered": true
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/vvktest",
+            "type": "Microsoft.ApiManagement/service/loggers",
+            "name": "vvktest",
+            "properties": {
+              "loggerType": "applicationInsights",
+              "credentials": {
+                "instrumentationKey": "{{Logger-Credentials-5b1a17ef2b3f91153004b10d}}"
+              },
+              "isBuffered": true
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/applicationinsights",
+            "type": "Microsoft.ApiManagement/service/loggers",
+            "name": "applicationinsights",
+            "properties": {
+              "loggerType": "applicationInsights",
+              "description": "miaoappinsight",
+              "credentials": {
+                "instrumentationKey": "{{Logger-Credentials-5b2056062b3f911ae84a3069}}"
+              },
+              "isBuffered": true
+            }
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNamedValues.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNamedValues.json
new file mode 100644
index 000000000000..8b181146ff04
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNamedValues.json
@@ -0,0 +1,49 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/592f1174cc83890dc4f32686",
+            "type": "Microsoft.ApiManagement/service/namedValues",
+            "name": "592f1174cc83890dc4f32686",
+            "properties": {
+              "displayName": "Logger-Credentials-592f1174cc83890dc4f32687",
+              "value": "propValue",
+              "secret": false
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop6",
+            "type": "Microsoft.ApiManagement/service/namedValues",
+            "name": "testprop6",
+            "properties": {
+              "displayName": "prop6namekv",
+              "keyVault": {
+                "secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
+                "identityClientId": "2d2df842-44d8-4885-8dec-77cc1a984a31",
+                "lastStatus": {
+                  "code": "Success",
+                  "timeStampUtc": "2020-09-11T00:54:31.8024882Z"
+                }
+              },
+              "tags": [
+                "foo",
+                "bar"
+              ],
+              "secret": true
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotificationRecipientEmails.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotificationRecipientEmails.json
new file mode 100644
index 000000000000..df2576660dcb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotificationRecipientEmails.json
@@ -0,0 +1,43 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/contoso@live.com",
+            "type": "Microsoft.ApiManagement/service/notifications/recipientEmails",
+            "name": "contoso@live.com",
+            "properties": {
+              "email": "contoso@live.com"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/foobar!live",
+            "type": "Microsoft.ApiManagement/service/notifications/recipientEmails",
+            "name": "foobar!live",
+            "properties": {
+              "email": "foobar!live"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/foobar@live.com",
+            "type": "Microsoft.ApiManagement/service/notifications/recipientEmails",
+            "name": "foobar@live.com",
+            "properties": {
+              "email": "foobar@live.com"
+            }
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotificationRecipientUsers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotificationRecipientUsers.json
new file mode 100644
index 000000000000..cce26e68830d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotificationRecipientUsers.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "notificationName": "RequestPublisherNotificationMessage"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientUsers/576823d0a40f7e74ec07d642",
+            "type": "Microsoft.ApiManagement/service/notifications/recipientUsers",
+            "name": "576823d0a40f7e74ec07d642",
+            "properties": {
+              "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/576823d0a40f7e74ec07d642"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotifications.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotifications.json
new file mode 100644
index 000000000000..c1a2abcbda3d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListNotifications.json
@@ -0,0 +1,127 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage",
+            "type": "Microsoft.ApiManagement/service/notifications",
+            "name": "RequestPublisherNotificationMessage",
+            "properties": {
+              "title": "Subscription requests (requiring approval)",
+              "description": "The following email recipients and users will receive email notifications about subscription requests for API products requiring approval.",
+              "recipients": {
+                "emails": [
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/contoso@live.com",
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/foobar!live",
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/foobar@live.com"
+                ],
+                "users": [
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/576823d0a40f7e74ec07d642"
+                ]
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/PurchasePublisherNotificationMessage",
+            "type": "Microsoft.ApiManagement/service/notifications",
+            "name": "PurchasePublisherNotificationMessage",
+            "properties": {
+              "title": "New subscriptions",
+              "description": "The following email recipients and users will receive email notifications about new API product subscriptions.",
+              "recipients": {
+                "emails": [
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/contoso@live.com"
+                ],
+                "users": [
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+                ]
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/NewApplicationNotificationMessage",
+            "type": "Microsoft.ApiManagement/service/notifications",
+            "name": "NewApplicationNotificationMessage",
+            "properties": {
+              "title": "Application gallery requests",
+              "description": "The following email recipients and users will receive email notifications when new applications are submitted to the application gallery.",
+              "recipients": {
+                "emails": [
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/contoso@live.com"
+                ],
+                "users": []
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/BCC",
+            "type": "Microsoft.ApiManagement/service/notifications",
+            "name": "BCC",
+            "properties": {
+              "title": "BCC",
+              "description": "The following recipients will receive blind carbon copies of all emails sent to developers.",
+              "recipients": {
+                "emails": [],
+                "users": []
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/NewIssuePublisherNotificationMessage",
+            "type": "Microsoft.ApiManagement/service/notifications",
+            "name": "NewIssuePublisherNotificationMessage",
+            "properties": {
+              "title": "New issue or comment",
+              "description": "The following email recipients and users will receive email notifications when a new issue or comment is submitted on the developer portal.",
+              "recipients": {
+                "emails": [],
+                "users": [
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+                ]
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/AccountClosedPublisher",
+            "type": "Microsoft.ApiManagement/service/notifications",
+            "name": "AccountClosedPublisher",
+            "properties": {
+              "title": "Close account message",
+              "description": "The following email recipients and users will receive email notifications when developer closes his account",
+              "recipients": {
+                "emails": [
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/RequestPublisherNotificationMessage/recipientEmails/contoso@live.com"
+                ],
+                "users": []
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/notifications/QuotaLimitApproachingPublisherNotificationMessage",
+            "type": "Microsoft.ApiManagement/service/notifications",
+            "name": "QuotaLimitApproachingPublisherNotificationMessage",
+            "properties": {
+              "title": "Approaching subscription quota limit",
+              "description": "The following email recipients and users will receive email notifications when subscription usage gets close to usage quota.",
+              "recipients": {
+                "emails": [],
+                "users": [
+                  "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1"
+                ]
+              }
+            }
+          }
+        ],
+        "count": 7,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListOpenIdConnectProviders.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListOpenIdConnectProviders.json
new file mode 100644
index 000000000000..ec481245f469
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListOpenIdConnectProviders.json
@@ -0,0 +1,29 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "serviceName": "apimService1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/openidConnectProviders/templateOpenIdConnect2",
+            "type": "Microsoft.ApiManagement/service/openidconnectproviders",
+            "name": "templateOpenIdConnect2",
+            "properties": {
+              "displayName": "templateoidprovider2",
+              "description": "open id provider template2",
+              "metadataEndpoint": "https://oidprovider-template2.net",
+              "clientId": "oidprovidertemplate2"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListOperations.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListOperations.json
new file mode 100644
index 000000000000..ca5a752b4084
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListOperations.json
@@ -0,0 +1,59 @@
+{
+  "parameters": {
+    "api-version": "2021-04-01-preview"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "Microsoft.ApiManagement/service/write",
+            "display": {
+              "provider": "Microsoft API Management",
+              "resource": "Service",
+              "operation": "Create a new instance of API Management Service",
+              "description": "Create a new instance of API Management Service"
+            }
+          },
+          {
+            "name": "Microsoft.ApiManagement/service/read",
+            "display": {
+              "provider": "Microsoft API Management",
+              "resource": "Service",
+              "operation": "Read metadata for an API Management Service instance",
+              "description": "Read metadata for an API Management Service instance"
+            }
+          },
+          {
+            "name": "Microsoft.ApiManagement/service/delete",
+            "display": {
+              "provider": "Microsoft API Management",
+              "resource": "Service",
+              "operation": "Delete API Management Service instance",
+              "description": "Delete API Management Service instance"
+            }
+          },
+          {
+            "origin": "system",
+            "name": "Microsoft.ApiManagement/service/providers/Microsoft.Insights/diagnosticSettings/write",
+            "display": {
+              "provider": "Microsoft API Management",
+              "resource": "Service",
+              "operation": "Write diagnostic setting",
+              "description": "Creates or updates the diagnostic setting for API Management service"
+            }
+          },
+          {
+            "name": "Microsoft.ApiManagement/service/tenant/operationResults/read",
+            "display": {
+              "provider": "Microsoft API Management",
+              "resource": "Results of async operations",
+              "operation": "Get operation results or Get operation result",
+              "description": "Get list of operation results or Get result of a specific operation"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPolicies.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPolicies.json
new file mode 100644
index 000000000000..535e5157638a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPolicies.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/policies/policy",
+            "type": "Microsoft.ApiManagement/service/policies",
+            "name": "policy",
+            "properties": {
+              "value": "<!--\r\n    IMPORTANT:\r\n    - Policy elements can appear only within the <inbound>, <outbound>, <backend> section elements.\r\n    - Only the <forward-request> policy element can appear within the <backend> section element.\r\n    - To apply a policy to the incoming request (before it is forwarded to the backend service), place a corresponding policy element within the <inbound> section element.\r\n    - To apply a policy to the outgoing response (before it is sent back to the caller), place a corresponding policy element within the <outbound> section element.\r\n    - To add a policy position the cursor at the desired insertion point and click on the round button associated with the policy.\r\n    - To remove a policy, delete the corresponding policy statement from the policy document.\r\n    - Policies are applied in the order of their appearance, from the top down.\r\n-->\r\n<policies>\r\n  <inbound />\r\n  <backend>\r\n    <forward-request />\r\n  </backend>\r\n  <outbound />\r\n</policies>"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPolicyDescriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPolicyDescriptions.json
new file mode 100644
index 000000000000..546bf2af6c2c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPolicyDescriptions.json
@@ -0,0 +1,36 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "scope": "Api"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/policyDescriptions/authentication-basic",
+            "type": "Microsoft.ApiManagement/service/policyDescriptions",
+            "name": "authentication-basic",
+            "properties": {
+              "description": "Authenticate with the backend service using Basic authentication. Use in the inbound section at API scope.",
+              "scope": 268435471
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/policyDescriptions/authentication-certificate",
+            "type": "Microsoft.ApiManagement/service/policyDescriptions",
+            "name": "authentication-certificate",
+            "properties": {
+              "description": "Authenticate with the backend service using a client certificate. Use in the inbound section at API scope.",
+              "scope": 268435471
+            }
+          }
+        ],
+        "count": 2
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPortalRevisions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPortalRevisions.json
new file mode 100644
index 000000000000..4bfaea691f96
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPortalRevisions.json
@@ -0,0 +1,42 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112000000",
+            "type": "Microsoft.ApiManagement/service/portalRevisions",
+            "name": "20201112000000",
+            "properties": {
+              "description": "portal revision",
+              "statusDetails": null,
+              "status": "completed",
+              "isCurrent": false,
+              "createdDateTime": "2020-11-12T22:10:09.673Z",
+              "updatedDateTime": "2020-11-12T22:12:41.46Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010",
+            "type": "Microsoft.ApiManagement/service/portalRevisions",
+            "name": "20201112101010",
+            "properties": {
+              "description": "portal revision 1",
+              "statusDetails": null,
+              "status": "completed",
+              "isCurrent": true,
+              "createdDateTime": "2020-11-12T22:51:36.47Z",
+              "updatedDateTime": "2020-11-12T22:52:00.097Z"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPortalSettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPortalSettings.json
new file mode 100644
index 000000000000..34028d6fb596
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPortalSettings.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/delegation",
+            "type": "Microsoft.ApiManagement/service/portalsettings",
+            "name": "delegation",
+            "properties": {
+              "subscriptions": {
+                "enabled": false
+              },
+              "userRegistration": {
+                "enabled": false
+              },
+              "enabled": false
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/signin",
+            "type": "Microsoft.ApiManagement/service/portalsettings",
+            "name": "signin",
+            "properties": {
+              "enabled": false
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/signup",
+            "type": "Microsoft.ApiManagement/service/portalsettings",
+            "name": "signup",
+            "properties": {
+              "enabled": true,
+              "termsOfService": {
+                "text": "Terms of service",
+                "enabled": false,
+                "consentRequired": false
+              }
+            }
+          }
+        ],
+        "count": 3
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPrivateEndpointConnections.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPrivateEndpointConnections.json
new file mode 100644
index 000000000000..cdfcd3a04cf2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPrivateEndpointConnections.json
@@ -0,0 +1,48 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateEndpointConnections/connectionName",
+            "type": "Microsoft.ApiManagement/service/privateEndpointConnections",
+            "name": "privateEndpointProxyName",
+            "properties": {
+              "provisioningState": "Pending",
+              "privateEndpoint": {
+                "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateEndpoints/privateEndpointName"
+              },
+              "privateLinkServiceConnectionState": {
+                "status": "Pending",
+                "description": "Please approve my request, thanks",
+                "actionsRequired": "None"
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateEndpointConnections/privateEndpointProxyName2",
+            "type": "Microsoft.ApiManagement/service/privateEndpointConnections",
+            "name": "privateEndpointProxyName2",
+            "properties": {
+              "provisioningState": "Pending",
+              "privateEndpoint": {
+                "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateEndpoints/privateEndpointName2"
+              },
+              "privateLinkServiceConnectionState": {
+                "status": "Pending",
+                "description": "Please approve my request, thanks",
+                "actionsRequired": "None"
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPrivateLinkGroupResources.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPrivateLinkGroupResources.json
new file mode 100644
index 000000000000..01a7e0b23377
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListPrivateLinkGroupResources.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateLinkResources/Gateway",
+            "name": "Gateway",
+            "type": "Microsoft.ApiManagement/service/privateLinkResources",
+            "properties": {
+              "groupId": "Gateway",
+              "requiredMembers": [
+                "Gateway_west_us"
+              ],
+              "requiredZoneNames": [
+                "privateLink.azure.api.net"
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductApis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductApis.json
new file mode 100644
index 000000000000..06888a680706
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductApis.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "5768181ea40f7eb6c49f6ac7"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5768181ea40f7eb6c49f6ac7/apis/57681820a40f7eb6c49f6aca",
+            "type": "Microsoft.ApiManagement/service/products/apis",
+            "name": "57681820a40f7eb6c49f6aca",
+            "properties": {
+              "displayName": "api_57681820a40f7eb6c49f6acb",
+              "apiRevision": "1",
+              "description": "description_57681820a40f7eb6c49f6acc",
+              "serviceUrl": "http://contoso/57681820a40f7eb6c49f6acd",
+              "path": "suffix_57681820a40f7eb6c49f6ace",
+              "protocols": [
+                "https"
+              ],
+              "isCurrent": true
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductGroups.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductGroups.json
new file mode 100644
index 000000000000..c049e607731a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductGroups.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "5600b57e7e8880006a060002"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002/groups/5600b57e7e8880006a020001",
+            "type": "Microsoft.ApiManagement/service/products/groups",
+            "name": "5600b57e7e8880006a020001",
+            "properties": {
+              "displayName": "Administrators",
+              "description": "Administrators is a built-in group. Its membership is managed by the system. Microsoft Azure subscription administrators fall into this group.",
+              "builtIn": true,
+              "type": "system"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002/groups/5600b57e7e8880006a020002",
+            "type": "Microsoft.ApiManagement/service/products/groups",
+            "name": "5600b57e7e8880006a020002",
+            "properties": {
+              "displayName": "Developers",
+              "description": "Developers is a built-in group. Its membership is managed by the system. Signed-in users fall into this group.",
+              "builtIn": true,
+              "type": "system"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002/groups/5600b57e7e8880006a020003",
+            "type": "Microsoft.ApiManagement/service/products/groups",
+            "name": "5600b57e7e8880006a020003",
+            "properties": {
+              "displayName": "Guests",
+              "description": "Guests is a built-in group. Its membership is managed by the system. Unauthenticated users visiting the developer portal fall into this group.",
+              "builtIn": true,
+              "type": "system"
+            }
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductPolicies.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductPolicies.json
new file mode 100644
index 000000000000..09b5e6f3cd37
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductPolicies.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "armTemplateProduct4"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/armTemplateProduct4/policies/policy",
+            "type": "Microsoft.ApiManagement/service/products/policies",
+            "name": "policy",
+            "properties": {
+              "value": "<policies>\r\n  <inbound>\r\n    <base />\r\n  </inbound>\r\n  <backend>\r\n    <base />\r\n  </backend>\r\n  <outbound>\r\n    <base />\r\n  </outbound>\r\n  <on-error>\r\n    <base />\r\n  </on-error>\r\n</policies>"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductSubscriptions.json
new file mode 100644
index 000000000000..d80b2712ed74
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductSubscriptions.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "5600b57e7e8880006a060002"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002/subscriptions/5600b57e7e8880006a070002",
+            "type": "Microsoft.ApiManagement/service/products/subscriptions",
+            "name": "5600b57e7e8880006a070002",
+            "properties": {
+              "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+              "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b57e7e8880006a060002",
+              "state": "active",
+              "createdDate": "2015-09-22T01:57:18.723Z"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductTags.json
new file mode 100644
index 000000000000..da3737fbc598
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductTags.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "57d2ef278aa04f0888cba3f1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/5600b539c53f5b0062060002",
+            "type": "Microsoft.ApiManagement/service/tags",
+            "name": "5600b539c53f5b0062060002",
+            "properties": {
+              "displayName": "tag1"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProducts.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProducts.json
new file mode 100644
index 000000000000..23125de4693e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProducts.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/kjoshiarmtemplateCert1",
+            "type": "Microsoft.ApiManagement/service/products",
+            "name": "kjoshiarmtemplateCert1",
+            "properties": {
+              "displayName": "Dev",
+              "description": "Development Product",
+              "subscriptionRequired": false,
+              "state": "published"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/starter",
+            "type": "Microsoft.ApiManagement/service/products",
+            "name": "starter",
+            "properties": {
+              "displayName": "Starter",
+              "description": "Subscribers will be able to run 5 calls/minute up to a maximum of 100 calls/week.",
+              "terms": "",
+              "subscriptionRequired": true,
+              "approvalRequired": false,
+              "subscriptionsLimit": 1,
+              "state": "published"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/unlimited",
+            "type": "Microsoft.ApiManagement/service/products",
+            "name": "unlimited",
+            "properties": {
+              "displayName": "Unlimited",
+              "description": "Subscribers have completely unlimited access to the API. Administrator approval is required.",
+              "subscriptionRequired": true,
+              "approvalRequired": true,
+              "subscriptionsLimit": 1,
+              "state": "published"
+            }
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductsByTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductsByTags.json
new file mode 100644
index 000000000000..4edaf3030df6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListProductsByTags.json
@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "tag": {
+              "id": "/tags/apitag123",
+              "name": "awesomeTag"
+            },
+            "product": {
+              "id": "/products/starter",
+              "name": "Starter",
+              "description": "Subscribers will be able to run 5 calls/minute up to a maximum of 100 calls/week.",
+              "terms": "",
+              "subscriptionRequired": true,
+              "approvalRequired": false,
+              "subscriptionsLimit": 1,
+              "state": "published"
+            }
+          }
+        ],
+        "count": 1
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListRegions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListRegions.json
new file mode 100644
index 000000000000..a342c8fe5a6f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListRegions.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "West US",
+            "isMasterRegion": true,
+            "isDeleted": false
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSKUs-Consumption.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSKUs-Consumption.json
new file mode 100644
index 000000000000..cb63bcdbadbe
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSKUs-Consumption.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "api-version": "2021-04-01-preview",
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "resourceType": "Microsoft.ApiManagement/service",
+            "sku": {
+              "name": "Consumption"
+            },
+            "capacity": null
+          }
+        ],
+        "nextLink": null
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSKUs-Dedicated.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSKUs-Dedicated.json
new file mode 100644
index 000000000000..0355744fcc74
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSKUs-Dedicated.json
@@ -0,0 +1,77 @@
+{
+  "parameters": {
+    "api-version": "2021-04-01-preview",
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "resourceType": "Microsoft.ApiManagement/service",
+            "sku": {
+              "name": "Developer"
+            },
+            "capacity": {
+              "minimum": 1,
+              "maximum": 1,
+              "default": 1,
+              "scaleType": "none"
+            }
+          },
+          {
+            "resourceType": "Microsoft.ApiManagement/service",
+            "sku": {
+              "name": "Basic"
+            },
+            "capacity": {
+              "minimum": 1,
+              "maximum": 2,
+              "default": 1,
+              "scaleType": "manual"
+            }
+          },
+          {
+            "resourceType": "Microsoft.ApiManagement/service",
+            "sku": {
+              "name": "Standard"
+            },
+            "capacity": {
+              "minimum": 1,
+              "maximum": 4,
+              "default": 1,
+              "scaleType": "automatic"
+            }
+          },
+          {
+            "resourceType": "Microsoft.ApiManagement/service",
+            "sku": {
+              "name": "Premium"
+            },
+            "capacity": {
+              "minimum": 1,
+              "maximum": 10,
+              "default": 1,
+              "scaleType": "automatic"
+            }
+          },
+          {
+            "resourceType": "Microsoft.ApiManagement/service",
+            "sku": {
+              "name": "Isolated"
+            },
+            "capacity": {
+              "minimum": 1,
+              "maximum": 1,
+              "default": 1,
+              "scaleType": "automatic"
+            }
+          }
+        ],
+        "nextLink": null
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
new file mode 100644
index 000000000000..4a0487619be9
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSecretsPortalSettingsValidationKey.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "validationKey": "<validationKey>"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSecretsTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSecretsTenantAccess.json
new file mode 100644
index 000000000000..120ce8302bc6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSecretsTenantAccess.json
@@ -0,0 +1,19 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "accessName": "access"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "5600b59375ff190048030003",
+        "primaryKey": "<primaryKey>",
+        "secondaryKey": "<secondaryKey>",
+        "enabled": true
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListServiceBySubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListServiceBySubscription.json
new file mode 100644
index 000000000000..63f6394ff943
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListServiceBySubscription.json
@@ -0,0 +1,355 @@
+{
+  "parameters": {
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/OGF-Z3-06162021-Premium",
+            "name": "OGF-Z3-06162021-Premium",
+            "type": "Microsoft.ApiManagement/service",
+            "tags": {
+              "owner": "v-aswmoh",
+              "ReleaseName": "Z3"
+            },
+            "location": "East US",
+            "etag": "AAAAAAAWN/4=",
+            "properties": {
+              "publisherEmail": "bar@contoso.com",
+              "publisherName": "Test Premium",
+              "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+              "provisioningState": "Succeeded",
+              "targetProvisioningState": "",
+              "createdAtUtc": "2021-06-16T09:40:00.9453556Z",
+              "gatewayUrl": "https://ogf-z3-06162021-premium.azure-api.net",
+              "gatewayRegionalUrl": "https://ogf-z3-06162021-premium-eastus-01.regional.azure-api.net",
+              "portalUrl": "https://ogf-z3-06162021-premium.portal.azure-api.net",
+              "developerPortalUrl": "https://ogf-z3-06162021-premium.developer.azure-api.net",
+              "managementApiUrl": "https://ogf-z3-06162021-premium.management.azure-api.net",
+              "scmUrl": "https://ogf-z3-06162021-premium.scm.azure-api.net",
+              "hostnameConfigurations": [
+                {
+                  "type": "Proxy",
+                  "hostName": "ogf-z3-06162021-premium.azure-api.net",
+                  "negotiateClientCertificate": false,
+                  "defaultSslBinding": false,
+                  "certificateSource": "BuiltIn"
+                },
+                {
+                  "type": "Proxy",
+                  "hostName": "gateway.current.int-azure-api.net",
+                  "keyVaultId": "https://ogf-testing.vault-int.azure-int.net/secrets/current-ssl",
+                  "negotiateClientCertificate": true,
+                  "certificate": {
+                    "expiry": "2022-01-08T22:32:32+00:00",
+                    "thumbprint": "BA0C286F71AF3B6A01BDB240C58A4A507E3DBD51",
+                    "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+                  },
+                  "defaultSslBinding": true,
+                  "certificateSource": "Custom"
+                },
+                {
+                  "type": "DeveloperPortal",
+                  "hostName": "developer.current.int-azure-api.net",
+                  "keyVaultId": "https://ogf-testing.vault-int.azure-int.net/secrets/current-ssl",
+                  "negotiateClientCertificate": false,
+                  "certificate": {
+                    "expiry": "2022-01-08T22:32:32+00:00",
+                    "thumbprint": "BA0C286F71AF3B6A01BDB240C58A4A507E3DBD51",
+                    "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+                  },
+                  "defaultSslBinding": false,
+                  "certificateSource": "Custom"
+                },
+                {
+                  "type": "Management",
+                  "hostName": "mgmt.current.int-azure-api.net",
+                  "keyVaultId": "https://ogf-testing.vault-int.azure-int.net/secrets/current-ssl",
+                  "negotiateClientCertificate": false,
+                  "certificate": {
+                    "expiry": "2022-01-08T22:32:32+00:00",
+                    "thumbprint": "BA0C286F71AF3B6A01BDB240C58A4A507E3DBD51",
+                    "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+                  },
+                  "defaultSslBinding": false,
+                  "certificateSource": "Custom"
+                }
+              ],
+              "publicIPAddresses": [
+                "13.92.130.49"
+              ],
+              "additionalLocations": [
+                {
+                  "location": "East US 2",
+                  "sku": {
+                    "name": "Premium",
+                    "capacity": 1
+                  },
+                  "zones": [],
+                  "publicIPAddresses": [
+                    "40.70.24.106"
+                  ],
+                  "gatewayRegionalUrl": "https://ogf-z3-06162021-premium-eastus2-01.regional.azure-api.net",
+                  "disableGateway": false
+                }
+              ],
+              "customProperties": {
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false"
+              },
+              "virtualNetworkType": "None",
+              "certificates": [],
+              "disableGateway": false,
+              "apiVersionConstraint": {
+                "minApiVersion": "2019-12-01"
+              },
+              "publicNetworkAccess": "Enabled"
+            },
+            "sku": {
+              "name": "Premium",
+              "capacity": 1
+            },
+            "identity": {
+              "type": "SystemAssigned, UserAssigned",
+              "principalId": "306205e7-b21a-41bf-92e2-3e28af30041e",
+              "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd",
+              "userAssignedIdentities": {
+                "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ogf-identity": {
+                  "principalId": "713784d2-ee37-412a-95f0-3768f397f82d",
+                  "clientId": "8d9791f2-0cdf-41f4-9e66-cdc39b496789"
+                }
+              }
+            },
+            "systemData": {
+              "createdBy": "bar@contoso.com",
+              "createdByType": "User",
+              "createdAt": "2021-06-16T09:40:00.7106733Z",
+              "lastModifiedBy": "foo@contoso.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2021-06-20T06:33:09.6159006Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/vvktestcons",
+            "name": "vvktestcons",
+            "type": "Microsoft.ApiManagement/service",
+            "tags": {
+              "Owner": "vitaliik"
+            },
+            "location": "East US",
+            "etag": "AAAAAAAWKwo=",
+            "properties": {
+              "publisherEmail": "bar@contoso.com",
+              "publisherName": "vvktestcons",
+              "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+              "provisioningState": "Succeeded",
+              "targetProvisioningState": "",
+              "createdAtUtc": "2020-08-10T18:07:23.4565211Z",
+              "gatewayUrl": "https://vvktestcons.azure-api.net",
+              "hostnameConfigurations": [
+                {
+                  "type": "Proxy",
+                  "hostName": "vvktestcons.azure-api.net",
+                  "negotiateClientCertificate": false,
+                  "defaultSslBinding": true,
+                  "certificateSource": "BuiltIn"
+                }
+              ],
+              "customProperties": {
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+              },
+              "virtualNetworkType": "None",
+              "enableClientCertificate": false,
+              "disableGateway": false,
+              "publicNetworkAccess": "Enabled"
+            },
+            "sku": {
+              "name": "Consumption",
+              "capacity": 0
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/OGF-Z3-06162021-Standard",
+            "name": "OGF-Z3-06162021-Standard",
+            "type": "Microsoft.ApiManagement/service",
+            "tags": {},
+            "location": "East US",
+            "etag": "AAAAAAAWF7M=",
+            "properties": {
+              "publisherEmail": "bar@contoso.com",
+              "publisherName": "Test Standard",
+              "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+              "provisioningState": "Succeeded",
+              "targetProvisioningState": "",
+              "createdAtUtc": "2021-06-16T09:39:58.6555759Z",
+              "gatewayUrl": "https://ogf-z3-06162021-standard.azure-api.net",
+              "gatewayRegionalUrl": "https://ogf-z3-06162021-standard-eastus-01.regional.azure-api.net",
+              "portalUrl": "https://ogf-z3-06162021-standard.portal.azure-api.net",
+              "developerPortalUrl": "https://ogf-z3-06162021-standard.developer.azure-api.net",
+              "managementApiUrl": "https://ogf-z3-06162021-standard.management.azure-api.net",
+              "scmUrl": "https://ogf-z3-06162021-standard.scm.azure-api.net",
+              "hostnameConfigurations": [
+                {
+                  "type": "Proxy",
+                  "hostName": "ogf-z3-06162021-standard.azure-api.net",
+                  "negotiateClientCertificate": false,
+                  "defaultSslBinding": true,
+                  "certificateSource": "BuiltIn"
+                }
+              ],
+              "publicIPAddresses": [
+                "13.82.208.32"
+              ],
+              "customProperties": {
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA": "true",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False"
+              },
+              "virtualNetworkType": "None",
+              "disableGateway": false,
+              "apiVersionConstraint": {
+                "minApiVersion": "2019-12-01"
+              },
+              "publicNetworkAccess": "Enabled"
+            },
+            "sku": {
+              "name": "Standard",
+              "capacity": 2
+            },
+            "identity": {
+              "type": "SystemAssigned, UserAssigned",
+              "principalId": "347a5800-ca99-475a-9202-fe38ca79ee41",
+              "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd",
+              "userAssignedIdentities": {
+                "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ogf-identity": {
+                  "principalId": "713784d2-ee37-412a-95f0-3768f397f82d",
+                  "clientId": "8d9791f2-0cdf-41f4-9e66-cdc39b496789"
+                }
+              }
+            },
+            "systemData": {
+              "createdBy": "bar@contoso.com",
+              "createdByType": "User",
+              "createdAt": "2021-06-16T09:39:58.4591834Z",
+              "lastModifiedBy": "bar@contoso.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2021-06-17T15:05:13.5494721Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/ogf-dev-060921",
+            "name": "ogf-dev-060921",
+            "type": "Microsoft.ApiManagement/service",
+            "tags": {},
+            "location": "East US",
+            "etag": "AAAAAAAWEFg=",
+            "properties": {
+              "publisherEmail": "v-ssaiprasan@microsoft.com",
+              "publisherName": "TechM",
+              "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+              "provisioningState": "Succeeded",
+              "targetProvisioningState": "",
+              "createdAtUtc": "2021-06-09T10:06:22.2133978Z",
+              "gatewayUrl": "https://ogf-dev-060921.azure-api.net",
+              "gatewayRegionalUrl": "https://ogf-dev-060921-eastus-01.regional.azure-api.net",
+              "portalUrl": "https://ogf-dev-060921.portal.azure-api.net",
+              "developerPortalUrl": "https://ogf-dev-060921.developer.azure-api.net",
+              "managementApiUrl": "https://ogf-dev-060921.management.azure-api.net",
+              "scmUrl": "https://ogf-dev-060921.scm.azure-api.net",
+              "hostnameConfigurations": [
+                {
+                  "type": "Proxy",
+                  "hostName": "ogf-dev-060921.azure-api.net",
+                  "negotiateClientCertificate": false,
+                  "defaultSslBinding": true,
+                  "certificateSource": "BuiltIn"
+                }
+              ],
+              "publicIPAddresses": [
+                "168.62.39.172"
+              ],
+              "additionalLocations": [
+                {
+                  "location": "South Central US",
+                  "sku": {
+                    "name": "Premium",
+                    "capacity": 9
+                  },
+                  "zones": [],
+                  "publicIPAddresses": [
+                    "13.84.208.29"
+                  ],
+                  "gatewayRegionalUrl": "https://ogf-dev-060921-southcentralus-01.regional.azure-api.net",
+                  "disableGateway": false
+                }
+              ],
+              "customProperties": {
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false"
+              },
+              "virtualNetworkType": "None",
+              "certificates": [
+                {
+                  "storeName": "Root",
+                  "certificate": {
+                    "expiry": "2021-11-25T22:51:47+00:00",
+                    "thumbprint": "4E8234312EC69245D1AE296C4882D46FB84076A3",
+                    "subject": "CN=*.apim.net"
+                  }
+                }
+              ],
+              "disableGateway": false,
+              "apiVersionConstraint": {
+                "minApiVersion": "2019-12-01"
+              },
+              "publicNetworkAccess": "Enabled"
+            },
+            "sku": {
+              "name": "Premium",
+              "capacity": 3
+            },
+            "identity": {
+              "type": "SystemAssigned",
+              "principalId": "c9bd4c05-205e-4431-b232-112cf2e9e0aa",
+              "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd"
+            },
+            "systemData": {
+              "createdBy": "v-ssaiprasan@microsoft.com",
+              "createdByType": "User",
+              "createdAt": "2021-06-09T10:06:21.7336597Z",
+              "lastModifiedBy": "v-ssaiprasan@microsoft.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2021-06-10T14:27:05.546816Z"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListServiceBySubscriptionAndResourceGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListServiceBySubscriptionAndResourceGroup.json
new file mode 100644
index 000000000000..de100238c52a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListServiceBySubscriptionAndResourceGroup.json
@@ -0,0 +1,356 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/OGF-Z3-06162021-Premium",
+            "name": "OGF-Z3-06162021-Premium",
+            "type": "Microsoft.ApiManagement/service",
+            "tags": {
+              "owner": "v-aswmoh",
+              "ReleaseName": "Z3"
+            },
+            "location": "East US",
+            "etag": "AAAAAAAWN/4=",
+            "properties": {
+              "publisherEmail": "bar@contoso.com",
+              "publisherName": "Test Premium",
+              "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+              "provisioningState": "Succeeded",
+              "targetProvisioningState": "",
+              "createdAtUtc": "2021-06-16T09:40:00.9453556Z",
+              "gatewayUrl": "https://ogf-z3-06162021-premium.azure-api.net",
+              "gatewayRegionalUrl": "https://ogf-z3-06162021-premium-eastus-01.regional.azure-api.net",
+              "portalUrl": "https://ogf-z3-06162021-premium.portal.azure-api.net",
+              "developerPortalUrl": "https://ogf-z3-06162021-premium.developer.azure-api.net",
+              "managementApiUrl": "https://ogf-z3-06162021-premium.management.azure-api.net",
+              "scmUrl": "https://ogf-z3-06162021-premium.scm.azure-api.net",
+              "hostnameConfigurations": [
+                {
+                  "type": "Proxy",
+                  "hostName": "ogf-z3-06162021-premium.azure-api.net",
+                  "negotiateClientCertificate": false,
+                  "defaultSslBinding": false,
+                  "certificateSource": "BuiltIn"
+                },
+                {
+                  "type": "Proxy",
+                  "hostName": "gateway.current.int-azure-api.net",
+                  "keyVaultId": "https://ogf-testing.vault-int.azure-int.net/secrets/current-ssl",
+                  "negotiateClientCertificate": true,
+                  "certificate": {
+                    "expiry": "2022-01-08T22:32:32+00:00",
+                    "thumbprint": "BA0C286F71AF3B6A01BDB240C58A4A507E3DBD51",
+                    "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+                  },
+                  "defaultSslBinding": true,
+                  "certificateSource": "Custom"
+                },
+                {
+                  "type": "DeveloperPortal",
+                  "hostName": "developer.current.int-azure-api.net",
+                  "keyVaultId": "https://ogf-testing.vault-int.azure-int.net/secrets/current-ssl",
+                  "negotiateClientCertificate": false,
+                  "certificate": {
+                    "expiry": "2022-01-08T22:32:32+00:00",
+                    "thumbprint": "BA0C286F71AF3B6A01BDB240C58A4A507E3DBD51",
+                    "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+                  },
+                  "defaultSslBinding": false,
+                  "certificateSource": "Custom"
+                },
+                {
+                  "type": "Management",
+                  "hostName": "mgmt.current.int-azure-api.net",
+                  "keyVaultId": "https://ogf-testing.vault-int.azure-int.net/secrets/current-ssl",
+                  "negotiateClientCertificate": false,
+                  "certificate": {
+                    "expiry": "2022-01-08T22:32:32+00:00",
+                    "thumbprint": "BA0C286F71AF3B6A01BDB240C58A4A507E3DBD51",
+                    "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+                  },
+                  "defaultSslBinding": false,
+                  "certificateSource": "Custom"
+                }
+              ],
+              "publicIPAddresses": [
+                "13.92.130.49"
+              ],
+              "additionalLocations": [
+                {
+                  "location": "East US 2",
+                  "sku": {
+                    "name": "Premium",
+                    "capacity": 1
+                  },
+                  "zones": [],
+                  "publicIPAddresses": [
+                    "40.70.24.106"
+                  ],
+                  "gatewayRegionalUrl": "https://ogf-z3-06162021-premium-eastus2-01.regional.azure-api.net",
+                  "disableGateway": false
+                }
+              ],
+              "customProperties": {
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false"
+              },
+              "virtualNetworkType": "None",
+              "certificates": [],
+              "disableGateway": false,
+              "apiVersionConstraint": {
+                "minApiVersion": "2019-12-01"
+              },
+              "publicNetworkAccess": "Enabled"
+            },
+            "sku": {
+              "name": "Premium",
+              "capacity": 1
+            },
+            "identity": {
+              "type": "SystemAssigned, UserAssigned",
+              "principalId": "306205e7-b21a-41bf-92e2-3e28af30041e",
+              "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd",
+              "userAssignedIdentities": {
+                "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ogf-identity": {
+                  "principalId": "713784d2-ee37-412a-95f0-3768f397f82d",
+                  "clientId": "8d9791f2-0cdf-41f4-9e66-cdc39b496789"
+                }
+              }
+            },
+            "systemData": {
+              "createdBy": "bar@contoso.com",
+              "createdByType": "User",
+              "createdAt": "2021-06-16T09:40:00.7106733Z",
+              "lastModifiedBy": "foo@contoso.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2021-06-20T06:33:09.6159006Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/vvktestcons",
+            "name": "vvktestcons",
+            "type": "Microsoft.ApiManagement/service",
+            "tags": {
+              "Owner": "vitaliik"
+            },
+            "location": "East US",
+            "etag": "AAAAAAAWKwo=",
+            "properties": {
+              "publisherEmail": "bar@contoso.com",
+              "publisherName": "vvktestcons",
+              "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+              "provisioningState": "Succeeded",
+              "targetProvisioningState": "",
+              "createdAtUtc": "2020-08-10T18:07:23.4565211Z",
+              "gatewayUrl": "https://vvktestcons.azure-api.net",
+              "hostnameConfigurations": [
+                {
+                  "type": "Proxy",
+                  "hostName": "vvktestcons.azure-api.net",
+                  "negotiateClientCertificate": false,
+                  "defaultSslBinding": true,
+                  "certificateSource": "BuiltIn"
+                }
+              ],
+              "customProperties": {
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+              },
+              "virtualNetworkType": "None",
+              "enableClientCertificate": false,
+              "disableGateway": false,
+              "publicNetworkAccess": "Enabled"
+            },
+            "sku": {
+              "name": "Consumption",
+              "capacity": 0
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/OGF-Z3-06162021-Standard",
+            "name": "OGF-Z3-06162021-Standard",
+            "type": "Microsoft.ApiManagement/service",
+            "tags": {},
+            "location": "East US",
+            "etag": "AAAAAAAWF7M=",
+            "properties": {
+              "publisherEmail": "bar@contoso.com",
+              "publisherName": "Test Standard",
+              "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+              "provisioningState": "Succeeded",
+              "targetProvisioningState": "",
+              "createdAtUtc": "2021-06-16T09:39:58.6555759Z",
+              "gatewayUrl": "https://ogf-z3-06162021-standard.azure-api.net",
+              "gatewayRegionalUrl": "https://ogf-z3-06162021-standard-eastus-01.regional.azure-api.net",
+              "portalUrl": "https://ogf-z3-06162021-standard.portal.azure-api.net",
+              "developerPortalUrl": "https://ogf-z3-06162021-standard.developer.azure-api.net",
+              "managementApiUrl": "https://ogf-z3-06162021-standard.management.azure-api.net",
+              "scmUrl": "https://ogf-z3-06162021-standard.scm.azure-api.net",
+              "hostnameConfigurations": [
+                {
+                  "type": "Proxy",
+                  "hostName": "ogf-z3-06162021-standard.azure-api.net",
+                  "negotiateClientCertificate": false,
+                  "defaultSslBinding": true,
+                  "certificateSource": "BuiltIn"
+                }
+              ],
+              "publicIPAddresses": [
+                "13.82.208.32"
+              ],
+              "customProperties": {
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA": "true",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False"
+              },
+              "virtualNetworkType": "None",
+              "disableGateway": false,
+              "apiVersionConstraint": {
+                "minApiVersion": "2019-12-01"
+              },
+              "publicNetworkAccess": "Enabled"
+            },
+            "sku": {
+              "name": "Standard",
+              "capacity": 2
+            },
+            "identity": {
+              "type": "SystemAssigned, UserAssigned",
+              "principalId": "347a5800-ca99-475a-9202-fe38ca79ee41",
+              "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd",
+              "userAssignedIdentities": {
+                "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ogf-identity": {
+                  "principalId": "713784d2-ee37-412a-95f0-3768f397f82d",
+                  "clientId": "8d9791f2-0cdf-41f4-9e66-cdc39b496789"
+                }
+              }
+            },
+            "systemData": {
+              "createdBy": "bar@contoso.com",
+              "createdByType": "User",
+              "createdAt": "2021-06-16T09:39:58.4591834Z",
+              "lastModifiedBy": "bar@contoso.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2021-06-17T15:05:13.5494721Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/ogf-dev-060921",
+            "name": "ogf-dev-060921",
+            "type": "Microsoft.ApiManagement/service",
+            "tags": {},
+            "location": "East US",
+            "etag": "AAAAAAAWEFg=",
+            "properties": {
+              "publisherEmail": "v-ssaiprasan@microsoft.com",
+              "publisherName": "TechM",
+              "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+              "provisioningState": "Succeeded",
+              "targetProvisioningState": "",
+              "createdAtUtc": "2021-06-09T10:06:22.2133978Z",
+              "gatewayUrl": "https://ogf-dev-060921.azure-api.net",
+              "gatewayRegionalUrl": "https://ogf-dev-060921-eastus-01.regional.azure-api.net",
+              "portalUrl": "https://ogf-dev-060921.portal.azure-api.net",
+              "developerPortalUrl": "https://ogf-dev-060921.developer.azure-api.net",
+              "managementApiUrl": "https://ogf-dev-060921.management.azure-api.net",
+              "scmUrl": "https://ogf-dev-060921.scm.azure-api.net",
+              "hostnameConfigurations": [
+                {
+                  "type": "Proxy",
+                  "hostName": "ogf-dev-060921.azure-api.net",
+                  "negotiateClientCertificate": false,
+                  "defaultSslBinding": true,
+                  "certificateSource": "BuiltIn"
+                }
+              ],
+              "publicIPAddresses": [
+                "168.62.39.172"
+              ],
+              "additionalLocations": [
+                {
+                  "location": "South Central US",
+                  "sku": {
+                    "name": "Premium",
+                    "capacity": 9
+                  },
+                  "zones": [],
+                  "publicIPAddresses": [
+                    "13.84.208.29"
+                  ],
+                  "gatewayRegionalUrl": "https://ogf-dev-060921-southcentralus-01.regional.azure-api.net",
+                  "disableGateway": false
+                }
+              ],
+              "customProperties": {
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "false",
+                "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false"
+              },
+              "virtualNetworkType": "None",
+              "certificates": [
+                {
+                  "storeName": "Root",
+                  "certificate": {
+                    "expiry": "2021-11-25T22:51:47+00:00",
+                    "thumbprint": "4E8234312EC69245D1AE296C4882D46FB84076A3",
+                    "subject": "CN=*.apim.net"
+                  }
+                }
+              ],
+              "disableGateway": false,
+              "apiVersionConstraint": {
+                "minApiVersion": "2019-12-01"
+              },
+              "publicNetworkAccess": "Enabled"
+            },
+            "sku": {
+              "name": "Premium",
+              "capacity": 3
+            },
+            "identity": {
+              "type": "SystemAssigned",
+              "principalId": "c9bd4c05-205e-4431-b232-112cf2e9e0aa",
+              "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd"
+            },
+            "systemData": {
+              "createdBy": "v-ssaiprasan@microsoft.com",
+              "createdByType": "User",
+              "createdAt": "2021-06-09T10:06:21.7336597Z",
+              "lastModifiedBy": "v-ssaiprasan@microsoft.com",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2021-06-10T14:27:05.546816Z"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSku.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSku.json
new file mode 100644
index 000000000000..235df5da6ff8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSku.json
@@ -0,0 +1,224 @@
+{
+  "parameters": {
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "resourceType": "service",
+            "name": "Developer",
+            "locations": [
+              "centralindia"
+            ],
+            "locationInfo": [
+              {
+                "location": "centralindia",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 1,
+              "default": 1,
+              "scaleType": "None"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Standard",
+            "locations": [
+              "centralindia"
+            ],
+            "locationInfo": [
+              {
+                "location": "centralindia",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 4,
+              "default": 1,
+              "scaleType": "Automatic"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Premium",
+            "locations": [
+              "centralindia"
+            ],
+            "locationInfo": [
+              {
+                "location": "centralindia",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 10,
+              "default": 1,
+              "scaleType": "Automatic"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Basic",
+            "locations": [
+              "centralindia"
+            ],
+            "locationInfo": [
+              {
+                "location": "centralindia",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 2,
+              "default": 1,
+              "scaleType": "Manual"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Consumption",
+            "locations": [
+              "centralindia"
+            ],
+            "locationInfo": [
+              {
+                "location": "centralindia",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 0,
+              "maximum": 0,
+              "default": 0,
+              "scaleType": "None"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Developer",
+            "locations": [
+              "uaenorth"
+            ],
+            "locationInfo": [
+              {
+                "location": "uaenorth",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 1,
+              "default": 1,
+              "scaleType": "None"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Standard",
+            "locations": [
+              "uaenorth"
+            ],
+            "locationInfo": [
+              {
+                "location": "uaenorth",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 4,
+              "default": 1,
+              "scaleType": "Automatic"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Premium",
+            "locations": [
+              "uaenorth"
+            ],
+            "locationInfo": [
+              {
+                "location": "uaenorth",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 10,
+              "default": 1,
+              "scaleType": "Automatic"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Basic",
+            "locations": [
+              "uaenorth"
+            ],
+            "locationInfo": [
+              {
+                "location": "uaenorth",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 2,
+              "default": 1,
+              "scaleType": "Manual"
+            },
+            "restrictions": []
+          },
+          {
+            "resourceType": "service",
+            "name": "Developer",
+            "locations": [
+              "australiacentral"
+            ],
+            "locationInfo": [
+              {
+                "location": "australiacentral",
+                "zones": [],
+                "zoneDetails": []
+              }
+            ],
+            "capacity": {
+              "minimum": 1,
+              "maximum": 1,
+              "default": 1,
+              "scaleType": "None"
+            },
+            "restrictions": []
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSubscriptions.json
new file mode 100644
index 000000000000..2b1022466177
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListSubscriptions.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/subscriptions/5600b59475ff190048070001",
+            "type": "Microsoft.ApiManagement/service/subscriptions",
+            "name": "5600b59475ff190048070001",
+            "properties": {
+              "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+              "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060001",
+              "state": "active",
+              "createdDate": "2015-09-22T01:57:40.3Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/subscriptions/56eaed3dbaf08b06e46d27fe",
+            "type": "Microsoft.ApiManagement/service/subscriptions",
+            "name": "56eaed3dbaf08b06e46d27fe",
+            "properties": {
+              "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/56eaec62baf08b06e46d27fd",
+              "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060001",
+              "displayName": "Starter",
+              "state": "active",
+              "createdDate": "2016-03-17T17:45:33.837Z",
+              "startDate": "2016-03-17T00:00:00Z",
+              "expirationDate": "2016-04-01T00:00:00Z",
+              "notificationDate": "2016-03-20T00:00:00Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/subscriptions/5931a769d8d14f0ad8ce13b8",
+            "type": "Microsoft.ApiManagement/service/subscriptions",
+            "name": "5931a769d8d14f0ad8ce13b8",
+            "properties": {
+              "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/5931a75ae4bbd512a88c680b",
+              "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060002",
+              "displayName": "Unlimited",
+              "state": "submitted",
+              "createdDate": "2017-06-02T17:59:06.223Z"
+            }
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTagResources.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTagResources.json
new file mode 100644
index 000000000000..8163f51e0b73
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTagResources.json
@@ -0,0 +1,61 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "tag": {
+              "id": "/tags/apitag123",
+              "name": "awesomeTag"
+            },
+            "operation": {
+              "id": "/apis/echo-api/operations/create-resource",
+              "apiName": "Echo API",
+              "apiRevision": "1",
+              "name": "Create resource",
+              "method": "POST",
+              "urlTemplate": "/resource",
+              "description": "A demonstration of a POST call based on the echo backend above. The request body is expected to contain JSON-formatted data (see example below). A policy is used to automatically transform any request sent in JSON directly to XML. In a real-world scenario this could be used to enable modern clients to speak to a legacy backend."
+            }
+          },
+          {
+            "tag": {
+              "id": "/tags/apitag123",
+              "name": "awesomeTag"
+            },
+            "api": {
+              "id": "/apis/echo-api",
+              "name": "Echo API",
+              "apiRevision": "1",
+              "serviceUrl": "http://echoapi.cloudapp.net/api",
+              "path": "echo",
+              "isCurrent": true
+            }
+          },
+          {
+            "tag": {
+              "id": "/tags/apitag123",
+              "name": "awesomeTag"
+            },
+            "product": {
+              "id": "/products/starter",
+              "name": "Starter",
+              "description": "Subscribers will be able to run 5 calls/minute up to a maximum of 100 calls/week.",
+              "terms": "",
+              "subscriptionRequired": true,
+              "approvalRequired": false,
+              "subscriptionsLimit": 1,
+              "state": "published"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTags.json
new file mode 100644
index 000000000000..4d7a82d37999
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTags.json
@@ -0,0 +1,34 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/5600b59375ff190048020001",
+            "type": "Microsoft.ApiManagement/service/tags",
+            "name": "5600b59375ff190048020001",
+            "properties": {
+              "displayName": "tag1"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/5600b59375ff190048020002",
+            "type": "Microsoft.ApiManagement/service/tags",
+            "name": "5600b59375ff190048020002",
+            "properties": {
+              "displayName": "tag2"
+            }
+          }
+        ],
+        "count": 2,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTemplates.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTemplates.json
new file mode 100644
index 000000000000..afc1ebbf5451
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTemplates.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "serviceName": "apimService1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/templates/ApplicationApprovedNotificationMessage",
+            "type": "Microsoft.ApiManagement/service/templates",
+            "name": "ApplicationApprovedNotificationMessage",
+            "properties": {
+              "subject": "Your application $AppName is published in the application gallery",
+              "body": "<!DOCTYPE html >\r\n<html>\r\n  <head />\r\n  <body>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Dear $DevFirstName $DevLastName,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">\r\n          We are happy to let you know that your request to publish the $AppName application in the application gallery has been approved. Your application has been published and can be viewed <a href=\"http://$DevPortalUrl/Applications/Details/$AppId\">here</a>.\r\n        </p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Best,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">The $OrganizationName API Team</p>\r\n  </body>\r\n</html>",
+              "title": "Application gallery submission approved",
+              "description": "Developers who submitted their application for publication in the application gallery on the developer portal receive this email after their submission is approved.",
+              "isDefault": true,
+              "parameters": [
+                {
+                  "name": "AppId",
+                  "title": "Application id"
+                },
+                {
+                  "name": "AppName",
+                  "title": "Application name"
+                },
+                {
+                  "name": "DevFirstName",
+                  "title": "Developer first name"
+                },
+                {
+                  "name": "DevLastName",
+                  "title": "Developer last name"
+                },
+                {
+                  "name": "OrganizationName",
+                  "title": "Organization name"
+                },
+                {
+                  "name": "DevPortalUrl",
+                  "title": "Developer portal URL"
+                }
+              ]
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTenantAccess.json
new file mode 100644
index 000000000000..c22068abf260
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTenantAccess.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/access",
+            "type": "Microsoft.ApiManagement/service/tenant",
+            "name": "access",
+            "properties": {
+              "enabled": true
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTenantSettings.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTenantSettings.json
new file mode 100644
index 000000000000..9b4f05eff4c7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListTenantSettings.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/settings/public",
+            "type": "Microsoft.ApiManagement/service/settings",
+            "name": "public",
+            "properties": {
+              "settings": {
+                "CustomPortalSettings.UserRegistrationTerms": null,
+                "CustomPortalSettings.UserRegistrationTermsEnabled": "False",
+                "CustomPortalSettings.UserRegistrationTermsConsentRequired": "False",
+                "CustomPortalSettings.DelegationEnabled": "False",
+                "CustomPortalSettings.DelegationUrl": "",
+                "CustomPortalSettings.DelegatedSubscriptionEnabled": "False"
+              }
+            }
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserGroups.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserGroups.json
new file mode 100644
index 000000000000..3596b3d97ed0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserGroups.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "57681833a40f7eb6c49f6acf"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/57681833a40f7eb6c49f6acf/groups/5600b57e7e8880006a020002",
+            "type": "Microsoft.ApiManagement/service/users/groups",
+            "name": "5600b57e7e8880006a020002",
+            "properties": {
+              "displayName": "Developers",
+              "description": "Developers is a built-in group. Its membership is managed by the system. Signed-in users fall into this group.",
+              "builtIn": true,
+              "type": "system"
+            }
+          }
+        ],
+        "count": 1,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserIdentities.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserIdentities.json
new file mode 100644
index 000000000000..dff5fa3ebb97
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserIdentities.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "57f2af53bb17172280f44057"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "provider": "Microsoft",
+            "id": "086cf9********55ab"
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserSubscriptions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserSubscriptions.json
new file mode 100644
index 000000000000..d481244d27c4
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUserSubscriptions.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "57681833a40f7eb6c49f6acf"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/57681833a40f7eb6c49f6acf/subscriptions/57681850a40f7eb6c49f6ae3",
+            "type": "Microsoft.ApiManagement/service/users/subscriptions",
+            "name": "57681850a40f7eb6c49f6ae3",
+            "properties": {
+              "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/57681833a40f7eb6c49f6acf",
+              "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5768181ea40f7eb6c49f6ac7",
+              "displayName": "57681850a40f7eb6c49f6ae5",
+              "state": "active",
+              "createdDate": "2016-06-20T16:22:39.547Z",
+              "startDate": "2016-06-20T00:00:00Z"
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/57681833a40f7eb6c49f6acf/subscriptions/57681850a40f7eb6c49f6b2b",
+            "type": "Microsoft.ApiManagement/service/users/subscriptions",
+            "name": "57681850a40f7eb6c49f6b2b",
+            "properties": {
+              "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/57681833a40f7eb6c49f6acf",
+              "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5768181ea40f7eb6c49f6ac7",
+              "displayName": "57681850a40f7eb6c49f6b2d",
+              "state": "active",
+              "createdDate": "2016-06-20T16:22:41.103Z",
+              "startDate": "2016-06-20T00:00:00Z"
+            }
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUsers.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUsers.json
new file mode 100644
index 000000000000..f513824bcca5
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementListUsers.json
@@ -0,0 +1,72 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "serviceName": "apimService1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+            "type": "Microsoft.ApiManagement/service/users",
+            "name": "1",
+            "properties": {
+              "firstName": "Administrator",
+              "lastName": "",
+              "email": "admin@live.com",
+              "state": "active",
+              "registrationDate": "2015-09-22T01:57:39.677Z",
+              "identities": [
+                {
+                  "provider": "Azure",
+                  "id": "admin@live.com"
+                }
+              ]
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/56eaec62baf08b06e46d27fd",
+            "type": "Microsoft.ApiManagement/service/users",
+            "name": "56eaec62baf08b06e46d27fd",
+            "properties": {
+              "firstName": "foo",
+              "lastName": "bar",
+              "email": "foo.bar.83@gmail.com",
+              "state": "active",
+              "registrationDate": "2016-03-17T17:41:56.327Z",
+              "identities": [
+                {
+                  "provider": "Basic",
+                  "id": "foo.bar.83@gmail.com"
+                }
+              ]
+            }
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/5931a75ae4bbd512a88c680b",
+            "type": "Microsoft.ApiManagement/service/users",
+            "name": "5931a75ae4bbd512a88c680b",
+            "properties": {
+              "firstName": "foo",
+              "lastName": "bar",
+              "email": "foobar@outlook.com",
+              "state": "active",
+              "registrationDate": "2017-06-02T17:58:50.357Z",
+              "identities": [
+                {
+                  "provider": "Microsoft",
+                  "id": "*************"
+                }
+              ]
+            }
+          }
+        ],
+        "count": 3,
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementNamedValueListValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementNamedValueListValue.json
new file mode 100644
index 000000000000..7f1843b639eb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementNamedValueListValue.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testarmTemplateproperties2"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": "propValue"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementOpenidConnectProviderListSecrets.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementOpenidConnectProviderListSecrets.json
new file mode 100644
index 000000000000..c0c98d745ca4
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementOpenidConnectProviderListSecrets.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "opid": "templateOpenIdConnect2"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "clientSecret": "oidsecretproviderTemplate2"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPerformConnectivityCheck.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPerformConnectivityCheck.json
new file mode 100644
index 000000000000..da775301b303
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPerformConnectivityCheck.json
@@ -0,0 +1,54 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "connectivityCheckRequestParams": {
+      "source": {
+        "region": "northeurope"
+      },
+      "destination": {
+        "address": "8.8.8.8",
+        "port": 53
+      },
+      "preferredIPVersion": "IPv4"
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/connectivityCheck/operationresults/bmljb2xhLW5ldHdvcmt3YXRjaGVyNF9Db25uZWN0aXRpdml0eUNoZWNrXzE2MmExNmZl?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "hops": [
+          {
+            "type": "Source",
+            "id": "7dbbe7aa-60ba-4650-831e-63d775d38e9e",
+            "address": "10.1.1.4",
+            "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+            "nextHopIds": [
+              "75c8d819-b208-4584-a311-1aa45ce753f9"
+            ],
+            "issues": []
+          },
+          {
+            "type": "Internet",
+            "id": "75c8d819-b208-4584-a311-1aa45ce753f9",
+            "address": "8.8.8.8",
+            "nextHopIds": [],
+            "issues": []
+          }
+        ],
+        "connectionStatus": "Connected",
+        "avgLatencyInMs": 1,
+        "minLatencyInMs": 1,
+        "maxLatencyInMs": 4,
+        "probesSent": 100,
+        "probesFailed": 0
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPerformConnectivityCheckHttpConnect.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPerformConnectivityCheckHttpConnect.json
new file mode 100644
index 000000000000..9f9ba588bd97
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPerformConnectivityCheckHttpConnect.json
@@ -0,0 +1,69 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "connectivityCheckRequestParams": {
+      "source": {
+        "region": "northeurope"
+      },
+      "destination": {
+        "address": "https://microsoft.com",
+        "port": 3306
+      },
+      "protocol": "HTTPS",
+      "protocolConfiguration": {
+        "HTTPConfiguration": {
+          "method": "GET",
+          "validStatusCodes": [
+            200,
+            204
+          ],
+          "headers": [
+            {
+              "name": "Authorization",
+              "value": "Bearer myPreciousToken"
+            }
+          ]
+        }
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/connectivityCheck/operationresults/bmljb2xhLW5ldHdvcmt3YXRjaGVyNF9Db25uZWN0aXRpdml0eUNoZWNrXzE2MmExNmZl?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "hops": [
+          {
+            "type": "Source",
+            "id": "c60e2296-5ebc-48cc-80e8-7e6d2981e7b2",
+            "address": "20.82.216.48",
+            "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+            "nextHopIds": [
+              "26aa44e7-04f1-462f-aa5d-5951957b5650"
+            ],
+            "issues": []
+          },
+          {
+            "type": "Internet",
+            "id": "26aa44e7-04f1-462f-aa5d-5951957b5650",
+            "address": "40.113.200.201",
+            "nextHopIds": [],
+            "issues": []
+          }
+        ],
+        "connectionStatus": "Reachable",
+        "avgLatencyInMs": 260,
+        "minLatencyInMs": 250,
+        "maxLatencyInMs": 281,
+        "probesSent": 3,
+        "probesFailed": 0
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json
new file mode 100644
index 000000000000..6b9d9c264557
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetDelegation.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/delegation",
+        "type": "Microsoft.ApiManagement/service/portalsettings",
+        "name": "delegation",
+        "properties": {
+          "url": "http://contoso.com/delegation",
+          "subscriptions": {
+            "enabled": true
+          },
+          "userRegistration": {
+            "enabled": true
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetSignIn.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetSignIn.json
new file mode 100644
index 000000000000..6b1e718fb703
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetSignIn.json
@@ -0,0 +1,20 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/signin",
+        "type": "Microsoft.ApiManagement/service/portalsettings",
+        "name": "signin",
+        "properties": {
+          "enabled": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetSignUp.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetSignUp.json
new file mode 100644
index 000000000000..527035b94708
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsGetSignUp.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/signup",
+        "type": "Microsoft.ApiManagement/service/portalsettings",
+        "name": "signup",
+        "properties": {
+          "enabled": true,
+          "termsOfService": {
+            "text": "Terms of service text.",
+            "enabled": true,
+            "consentRequired": true
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
new file mode 100644
index 000000000000..6ab381e234fd
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutDelegation.json
@@ -0,0 +1,40 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512288c680b",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "url": "http://contoso.com/delegation",
+        "validationKey": "<validationKey>",
+        "subscriptions": {
+          "enabled": true
+        },
+        "userRegistration": {
+          "enabled": true
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/delegation",
+        "type": "Microsoft.ApiManagement/service/portalsettings",
+        "name": "delegation",
+        "properties": {
+          "url": "http://contoso.com/delegation",
+          "subscriptions": {
+            "enabled": true
+          },
+          "userRegistration": {
+            "enabled": true
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutSignIn.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutSignIn.json
new file mode 100644
index 000000000000..a66993e86bf7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutSignIn.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512288c680b",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "enabled": true
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/signin",
+        "type": "Microsoft.ApiManagement/service/portalsettings",
+        "name": "signin",
+        "properties": {
+          "enabled": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutSignUp.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutSignUp.json
new file mode 100644
index 000000000000..3f2fd66084a7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsPutSignUp.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512288c680b",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "enabled": true,
+        "termsOfService": {
+          "enabled": true,
+          "text": "Terms of service text.",
+          "consentRequired": true
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalsettings/signup",
+        "type": "Microsoft.ApiManagement/service/portalsettings",
+        "name": "signup",
+        "properties": {
+          "enabled": true,
+          "termsOfService": {
+            "text": "Terms of service text.",
+            "enabled": true,
+            "consentRequired": true
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
new file mode 100644
index 000000000000..ebeaac1cbdcb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateDelegation.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512288c680b",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "url": "http://contoso.com/delegation",
+        "validationKey": "<validationKey>",
+        "subscriptions": {
+          "enabled": true
+        },
+        "userRegistration": {
+          "enabled": true
+        }
+      }
+    }
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateSignIn.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateSignIn.json
new file mode 100644
index 000000000000..5adac81da7f8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateSignIn.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512288c680b",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "enabled": true
+      }
+    }
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateSignUp.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateSignUp.json
new file mode 100644
index 000000000000..8a27edcefff3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementPortalSettingsUpdateSignUp.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512288c680b",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "enabled": true,
+        "termsOfService": {
+          "enabled": true,
+          "text": "Terms of service text.",
+          "consentRequired": true
+        }
+      }
+    }
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRefreshCertificate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRefreshCertificate.json
new file mode 100644
index 000000000000..bc260ea2d6d2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRefreshCertificate.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "certificateId": "templateCertkv"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
+        "type": "Microsoft.ApiManagement/service/certificates",
+        "name": "templateCertkv",
+        "properties": {
+          "subject": "CN=*.msitesting.net",
+          "thumbprint": "EA**********************9AD690",
+          "expirationDate": "2037-01-01T07:00:00Z",
+          "keyVault": {
+            "secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
+            "identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
+            "lastStatus": {
+              "code": "Success",
+              "timeStampUtc": "2020-09-22T00:24:53.3191468Z"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRefreshNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRefreshNamedValue.json
new file mode 100644
index 000000000000..53fe3d23e7c7
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRefreshNamedValue.json
@@ -0,0 +1,39 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testprop2"
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop6/refreshSecret?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=201"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop6",
+        "type": "Microsoft.ApiManagement/service/namedValues",
+        "name": "testprop6",
+        "properties": {
+          "displayName": "prop6namekv",
+          "keyVault": {
+            "secretIdentifier": "https://rpbvtkeyvaultintegration.vault.azure.net/secrets/msitestingCert",
+            "identityClientId": "2d2df842-44d8-4885-8dec-77cc1a984a31",
+            "lastStatus": {
+              "code": "Success",
+              "timeStampUtc": "2020-09-11T00:54:31.8024882Z"
+            }
+          },
+          "tags": [
+            "foo",
+            "bar"
+          ],
+          "secret": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRestoreWithAccessKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRestoreWithAccessKey.json
new file mode 100644
index 000000000000..a31b3d7c57ff
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementRestoreWithAccessKey.json
@@ -0,0 +1,127 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "storageAccount": "teststorageaccount",
+      "containerName": "backupContainer",
+      "backupName": "apimService1backup_2017_03_19",
+      "accessType": "AccessKey",
+      "accessKey": "**************************************************"
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAACXok=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-12-18T06:26:20.3348609Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-westus-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false
+            },
+            {
+              "type": "Proxy",
+              "hostName": "gateway1.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": true
+            },
+            {
+              "type": "Management",
+              "hostName": "mgmt.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false
+            },
+            {
+              "type": "Portal",
+              "hostName": "portal1.msitesting.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2036-01-01T07:00:00+00:00",
+                "thumbprint": "8E989XXXXXXXXXXXXXXXXB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": false
+            }
+          ],
+          "publicIPAddresses": [
+            "13.91.32.113"
+          ],
+          "additionalLocations": [
+            {
+              "location": "East US",
+              "sku": {
+                "name": "Premium",
+                "capacity": 1
+              },
+              "publicIPAddresses": [
+                "23.101.138.153"
+              ],
+              "gatewayRegionalUrl": "https://apimService1-eastus-01.regional.azure-api.net",
+              "disableGateway": true
+            }
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "apiVersionConstraint": {
+            "minApiVersion": "2019-01-01"
+          }
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceCheckNameAvailability.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceCheckNameAvailability.json
new file mode 100644
index 000000000000..99381b5122d8
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceCheckNameAvailability.json
@@ -0,0 +1,19 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "name": "apimService1"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "nameAvailable": true,
+        "reason": "Valid",
+        "message": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceDeleteService.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceDeleteService.json
new file mode 100644
index 000000000000..ac600169cc35
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceDeleteService.json
@@ -0,0 +1,60 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/TGV2eTExMDZtMDJfVGVybV9jMmZlY2QwMA==?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {},
+        "location": "West US",
+        "etag": "AAAAAAFfhHY=",
+        "properties": {
+          "publisherEmail": "contoso@live.com",
+          "publisherName": "Microsoft",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "Deleting",
+          "createdAtUtc": "2016-12-20T19:41:21.5823069Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-westus-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [],
+          "publicIPAddresses": [
+            "40.XX.XXX.168"
+          ],
+          "virtualNetworkConfiguration": {
+            "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/BlockVNETSamir/subnets/default"
+          },
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "External"
+        },
+        "sku": {
+          "name": "Developer",
+          "capacity": 1
+        }
+      }
+    },
+    "204": {},
+    "200": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetDomainOwnershipIdentifier.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetDomainOwnershipIdentifier.json
new file mode 100644
index 000000000000..580a0e46010c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetDomainOwnershipIdentifier.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "domainOwnershipIdentifier": "KLE1vdMblVeHECAi4nCe3oNaXXXXvNlLrXt2ev84KM="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json
new file mode 100644
index 000000000000..8098b3c0f9ad
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json
@@ -0,0 +1,100 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimservice1",
+        "name": "apimservice1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {},
+        "location": "West US",
+        "etag": "AAAAAADqC0c=",
+        "properties": {
+          "publisherEmail": "abcs@contoso.com",
+          "publisherName": "contoso publisher",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-12-02T01:42:09.1268424Z",
+          "gatewayUrl": "https://apimservice1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimservice1-westus-01.regional.azure-api.net",
+          "portalUrl": "https://apimservice1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimservice1.management.azure-api.net",
+          "scmUrl": "https://apimservice1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false,
+              "certificateSource": "BuiltIn"
+            },
+            {
+              "type": "Proxy",
+              "hostName": "apimgatewaytest.preview.net",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2019-08-16T16:51:34+00:00",
+                "thumbprint": "B4330123DBAXXXXXXXXX1F35E84493476",
+                "subject": "CN=*.preview.net"
+              },
+              "defaultSslBinding": true,
+              "certificateSource": "Custom"
+            }
+          ],
+          "publicIPAddresses": [
+            "137.XXX.11.74"
+          ],
+          "privateIPAddresses": [
+            "172.XX.0.5"
+          ],
+          "additionalLocations": [
+            {
+              "location": "West US 2",
+              "sku": {
+                "name": "Premium",
+                "capacity": 1
+              },
+              "publicIPAddresses": [
+                "40.XXX.79.187"
+              ],
+              "privateIPAddresses": [
+                "10.0.X.6"
+              ],
+              "virtualNetworkConfiguration": {
+                "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/APIMVNet/subnets/apim-internal-sub"
+              },
+              "gatewayRegionalUrl": "https://apimservice1-westus2-01.regional.azure-api.net",
+              "disableGateway": false
+            }
+          ],
+          "virtualNetworkConfiguration": {
+            "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apim-appGateway-vnet/subnets/apim-subnet"
+          },
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False"
+          },
+          "virtualNetworkType": "Internal",
+          "disableGateway": false,
+          "apiVersionConstraint": {}
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetNetworkStatus.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetNetworkStatus.json
new file mode 100644
index 000000000000..1882b4ef77b3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetNetworkStatus.json
@@ -0,0 +1,150 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": [
+        {
+          "location": "West US",
+          "networkStatus": {
+            "dnsServers": [
+              "10.82.98.10"
+            ],
+            "connectivityStatus": [
+              {
+                "name": "apimgmtst6xxxxxxxxxxx.blob.core.windows.net",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:55:14.7035899Z",
+                "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
+                "resourceType": "BlobStorage",
+                "isOptional": false
+              },
+              {
+                "name": "apimgmtst6xxxxxxxxxxx.file.core.windows.net",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:55:41.5322463Z",
+                "lastStatusChange": "2020-11-20T07:54:55.9265938Z",
+                "resourceType": "FileStorage",
+                "isOptional": true
+              },
+              {
+                "name": "apimgmtst6xxxxxxxxxxx.queue.core.windows.net",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:55:30.645994Z",
+                "lastStatusChange": "2020-11-20T07:54:55.8410477Z",
+                "resourceType": "Queue",
+                "isOptional": true
+              },
+              {
+                "name": "apimgmtst6xxxxxxxxxxx.table.core.windows.net",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:55:23.8789171Z",
+                "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
+                "resourceType": "TableStorage",
+                "isOptional": false
+              },
+              {
+                "name": "gcs.prod.monitoring.core.windows.net",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:57:34.8666833Z",
+                "lastStatusChange": "2020-11-20T08:07:37.5486932Z",
+                "resourceType": "Monitoring",
+                "isOptional": true
+              },
+              {
+                "name": "https://gcs.ppe.warm.ingestion.monitoring.azure.com",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:56:26.1870188Z",
+                "lastStatusChange": "2020-11-20T07:54:56.1060523Z",
+                "resourceType": "Monitoring",
+                "isOptional": true
+              },
+              {
+                "name": "https://global.metrics.nsatc.net/",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:56:35.9620612Z",
+                "lastStatusChange": "2020-11-20T07:54:56.0510519Z",
+                "resourceType": "Monitoring",
+                "isOptional": true
+              },
+              {
+                "name": "https://login.windows.net",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:56:30.8047708Z",
+                "lastStatusChange": "2020-11-20T07:54:56.1060523Z",
+                "resourceType": "AzureActiveDirectory",
+                "isOptional": true
+              },
+              {
+                "name": "https://prod2.metrics.nsatc.net:1886/RecoveryService",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:56:45.2095302Z",
+                "lastStatusChange": "2020-11-20T07:54:56.2796235Z",
+                "resourceType": "Metrics",
+                "isOptional": true
+              },
+              {
+                "name": "LocalGatewayRedis",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:55:15.1345836Z",
+                "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
+                "resourceType": "InternalCache",
+                "isOptional": true
+              },
+              {
+                "name": "prod.warmpath.msftcloudes.com",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:55:57.8992141Z",
+                "lastStatusChange": "2020-11-20T07:54:55.8410477Z",
+                "resourceType": "Monitoring",
+                "isOptional": false
+              },
+              {
+                "name": "Scm",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T23:01:24.0553684Z",
+                "lastStatusChange": "2019-07-20T02:25:48.7066996Z",
+                "resourceType": "SourceControl",
+                "isOptional": true
+              },
+              {
+                "name": "smtpi-ch1.msn.com:25028",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:58:22.2430074Z",
+                "lastStatusChange": "2020-11-20T07:54:56.3510577Z",
+                "resourceType": "Email",
+                "isOptional": true
+              },
+              {
+                "name": "zwcvuxxxx.database.windows.net",
+                "status": "success",
+                "error": "",
+                "lastUpdated": "2020-11-24T22:55:44.3582171Z",
+                "lastStatusChange": "2020-11-20T07:54:56.0410467Z",
+                "resourceType": "SQLDatabase",
+                "isOptional": false
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetNetworkStatusByLocation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetNetworkStatusByLocation.json
new file mode 100644
index 000000000000..acbb5e4f411a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetNetworkStatusByLocation.json
@@ -0,0 +1,146 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "locationName": "North Central US"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "dnsServers": [
+          "10.82.98.10"
+        ],
+        "connectivityStatus": [
+          {
+            "name": "apimgmtst6tnxxxxxxxxxxx.blob.core.windows.net",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:55:14.7035899Z",
+            "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
+            "resourceType": "BlobStorage",
+            "isOptional": false
+          },
+          {
+            "name": "apimgmtst6tnxxxxxxxxxxx.file.core.windows.net",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:55:41.5322463Z",
+            "lastStatusChange": "2020-11-20T07:54:55.9265938Z",
+            "resourceType": "FileStorage",
+            "isOptional": true
+          },
+          {
+            "name": "apimgmtst6tnxxxxxxxxxxx.queue.core.windows.net",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:55:30.645994Z",
+            "lastStatusChange": "2020-11-20T07:54:55.8410477Z",
+            "resourceType": "Queue",
+            "isOptional": true
+          },
+          {
+            "name": "apimgmtst6tnxxxxxxxxxxx.table.core.windows.net",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:55:23.8789171Z",
+            "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
+            "resourceType": "TableStorage",
+            "isOptional": false
+          },
+          {
+            "name": "gcs.prod.monitoring.core.windows.net",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:57:34.8666833Z",
+            "lastStatusChange": "2020-11-20T08:07:37.5486932Z",
+            "resourceType": "Monitoring",
+            "isOptional": true
+          },
+          {
+            "name": "https://gcs.ppe.warm.ingestion.monitoring.azure.com",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:56:26.1870188Z",
+            "lastStatusChange": "2020-11-20T07:54:56.1060523Z",
+            "resourceType": "Monitoring",
+            "isOptional": true
+          },
+          {
+            "name": "https://global.metrics.nsatc.net/",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:56:35.9620612Z",
+            "lastStatusChange": "2020-11-20T07:54:56.0510519Z",
+            "resourceType": "Monitoring",
+            "isOptional": true
+          },
+          {
+            "name": "https://login.windows.net",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:56:30.8047708Z",
+            "lastStatusChange": "2020-11-20T07:54:56.1060523Z",
+            "resourceType": "AzureActiveDirectory",
+            "isOptional": true
+          },
+          {
+            "name": "https://prod2.metrics.nsatc.net:1886/RecoveryService",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:56:45.2095302Z",
+            "lastStatusChange": "2020-11-20T07:54:56.2796235Z",
+            "resourceType": "Metrics",
+            "isOptional": true
+          },
+          {
+            "name": "LocalGatewayRedis",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:55:15.1345836Z",
+            "lastStatusChange": "2020-11-20T07:54:55.9365931Z",
+            "resourceType": "InternalCache",
+            "isOptional": true
+          },
+          {
+            "name": "prod.warmpath.msftcloudes.com",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:55:57.8992141Z",
+            "lastStatusChange": "2020-11-20T07:54:55.8410477Z",
+            "resourceType": "Monitoring",
+            "isOptional": false
+          },
+          {
+            "name": "Scm",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T23:03:57.6187917Z",
+            "lastStatusChange": "2020-11-20T07:54:57.325384Z",
+            "resourceType": "SourceControl",
+            "isOptional": true
+          },
+          {
+            "name": "smtpi-xxx.msn.com:25028",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:58:22.2430074Z",
+            "lastStatusChange": "2020-11-20T07:54:56.3510577Z",
+            "resourceType": "Email",
+            "isOptional": true
+          },
+          {
+            "name": "zwcvuxxxx.database.windows.net",
+            "status": "success",
+            "error": "",
+            "lastUpdated": "2020-11-24T22:55:44.3582171Z",
+            "lastStatusChange": "2020-11-20T07:54:56.0410467Z",
+            "resourceType": "SQLDatabase",
+            "isOptional": false
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetOutboundNetworkDependenciesEndpoints.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetOutboundNetworkDependenciesEndpoints.json
new file mode 100644
index 000000000000..1bb113394bdb
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetOutboundNetworkDependenciesEndpoints.json
@@ -0,0 +1,463 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "category": "Azure SMTP",
+            "endpoints": [
+              {
+                "domainName": "smtpi-ch1.msn.com",
+                "endpointDetails": [
+                  {
+                    "port": 25028,
+                    "region": "West US"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "category": "Azure SQL",
+            "endpoints": [
+              {
+                "domainName": "xxxx1345234.database.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 1433,
+                    "region": "West US"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "category": "Azure Storage",
+            "endpoints": [
+              {
+                "domainName": "xxxx32storagedgfbay.blob.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx1362629927xt.blob.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx1362629927xt.table.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx141483183xt.blob.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx141483183xt.table.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx1949864718xt.blob.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx1949864718xt.table.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx3292114122xt.blob.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx3292114122xt.table.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx32tst4oto8t0mlesawmm.blob.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx32tst4oto8t0mlesawmm.file.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 445,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx32tst4oto8t0mlesawmm.queue.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx32tst4oto8t0mlesawmm.table.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "category": "Azure Event Hub",
+            "endpoints": [
+              {
+                "domainName": "xxxx1362629927eh.servicebus.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  },
+                  {
+                    "port": 5671,
+                    "region": "West US"
+                  },
+                  {
+                    "port": 5672,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx1949864718eh.servicebus.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  },
+                  {
+                    "port": 5671,
+                    "region": "West US"
+                  },
+                  {
+                    "port": 5672,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx3292114122eh.servicebus.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  },
+                  {
+                    "port": 5671,
+                    "region": "West US"
+                  },
+                  {
+                    "port": 5672,
+                    "region": "West US"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxxx141483183eh.servicebus.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "West US"
+                  },
+                  {
+                    "port": 5671,
+                    "region": "West US"
+                  },
+                  {
+                    "port": 5672,
+                    "region": "West US"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "category": "SSL Certificate Verification",
+            "endpoints": [
+              {
+                "domainName": "ocsp.msocsp.com",
+                "endpointDetails": [
+                  {
+                    "port": 80,
+                    "region": "Global"
+                  },
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "mscrl.microsoft.com",
+                "endpointDetails": [
+                  {
+                    "port": 80,
+                    "region": "Global"
+                  },
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "crl.microsoft.com",
+                "endpointDetails": [
+                  {
+                    "port": 80,
+                    "region": "Global"
+                  },
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "crl3.digicert.com",
+                "endpointDetails": [
+                  {
+                    "port": 80,
+                    "region": "Global"
+                  },
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "ocsp.digicert.com",
+                "endpointDetails": [
+                  {
+                    "port": 80,
+                    "region": "Global"
+                  },
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "cacerts.digicert.com",
+                "endpointDetails": [
+                  {
+                    "port": 80,
+                    "region": "Global"
+                  },
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "category": "Azure Monitor",
+            "endpoints": [
+              {
+                "domainName": "gcs.ppe.monitoring.core.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "global.prod.microsoftmetrics.com",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxx3.prod.microsoftmetrics.com",
+                "endpointDetails": [
+                  {
+                    "port": 1886,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxx3-red.prod.microsoftmetrics.com",
+                "endpointDetails": [
+                  {
+                    "port": 1886,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "xxx3-black.prod.microsoftmetrics.com",
+                "endpointDetails": [
+                  {
+                    "port": 1886,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "gcs.ppe.warm.ingestion.monitoring.azure.com",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "metrichost23.prod.microsoftmetrics.com",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "metrichost23-red.prod.microsoftmetrics.com",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "metrichost23-black.prod.microsoftmetrics.com",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "category": "Portal Captcha",
+            "endpoints": [
+              {
+                "domainName": "client.xxx.live.com",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "partner.xxx.live.com",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "category": "Azure Active Directory",
+            "endpoints": [
+              {
+                "domainName": "login.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "graph.windows.net",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              },
+              {
+                "domainName": "login.microsoftonline.com",
+                "endpointDetails": [
+                  {
+                    "port": 443,
+                    "region": "Global"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetService.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetService.json
new file mode 100644
index 000000000000..c1187f23046e
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetService.json
@@ -0,0 +1,166 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/OGF-Z3-06162021-Premium",
+        "name": "OGF-Z3-06162021-Premium",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "owner": "v-aswmoh",
+          "ReleaseName": "Z3"
+        },
+        "location": "East US",
+        "etag": "AAAAAAAWN/4=",
+        "properties": {
+          "publisherEmail": "string",
+          "publisherName": "Test Premium",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2021-06-16T09:40:00.9453556Z",
+          "gatewayUrl": "https://ogf-z3-06162021-premium.azure-api.net",
+          "gatewayRegionalUrl": "https://ogf-z3-06162021-premium-eastus-01.regional.azure-api.net",
+          "portalUrl": "https://ogf-z3-06162021-premium.portal.azure-api.net",
+          "developerPortalUrl": "https://ogf-z3-06162021-premium.developer.azure-api.net",
+          "managementApiUrl": "https://ogf-z3-06162021-premium.management.azure-api.net",
+          "scmUrl": "https://ogf-z3-06162021-premium.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "ogf-z3-06162021-premium.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false,
+              "certificateSource": "BuiltIn"
+            },
+            {
+              "type": "Proxy",
+              "hostName": "gateway.current.int-azure-api.net",
+              "keyVaultId": "https://ogf-testing.vault.azure.net/secrets/current-ssl",
+              "negotiateClientCertificate": true,
+              "certificate": {
+                "expiry": "2022-01-08T22:32:32+00:00",
+                "thumbprint": "BA0C286XXXXXXXX58A4A507E3DBD51",
+                "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+              },
+              "defaultSslBinding": true,
+              "certificateSource": "Custom"
+            },
+            {
+              "type": "DeveloperPortal",
+              "hostName": "developer.current.int-azure-api.net",
+              "keyVaultId": "https://ogf-testing.vault.azure.net/secrets/current-ssl",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2022-01-08T22:32:32+00:00",
+                "thumbprint": "BA0C286XXXXXXXX58A4A507E3DBD51",
+                "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+              },
+              "defaultSslBinding": false,
+              "certificateSource": "Custom"
+            },
+            {
+              "type": "Management",
+              "hostName": "mgmt.current.int-azure-api.net",
+              "keyVaultId": "https://ogf-testing.vault.azure.net/secrets/current-ssl",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2022-01-08T22:32:32+00:00",
+                "thumbprint": "BA0C286XXXXXXXX58A4A507E3DBD51",
+                "subject": "CN=*.current.int-azure-api.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US"
+              },
+              "defaultSslBinding": false,
+              "certificateSource": "Custom"
+            }
+          ],
+          "publicIPAddresses": [
+            "13.92.130.49"
+          ],
+          "additionalLocations": [
+            {
+              "location": "East US 2",
+              "sku": {
+                "name": "Premium",
+                "capacity": 1
+              },
+              "zones": [],
+              "publicIPAddresses": [
+                "40.70.24.106"
+              ],
+              "gatewayRegionalUrl": "https://ogf-z3-06162021-premium-eastus2-01.regional.azure-api.net",
+              "disableGateway": false,
+              "platformVersion": "stv2"
+            }
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "false",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "false",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "false",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "false",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "false",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false"
+          },
+          "virtualNetworkType": "None",
+          "certificates": [],
+          "disableGateway": false,
+          "apiVersionConstraint": {
+            "minApiVersion": "2019-12-01"
+          },
+          "publicNetworkAccess": "Enabled",
+          "privateEndpointConnections": [
+            {
+              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateEndpointConnections/privateEndpointProxyName",
+              "type": "Microsoft.ApiManagement/service/privateEndpointConnections",
+              "name": "privateEndpointProxyName",
+              "properties": {
+                "provisioningState": "Pending",
+                "privateEndpoint": {
+                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateEndpoints/privateEndpointName"
+                },
+                "privateLinkServiceConnectionState": {
+                  "status": "Pending",
+                  "description": "Please approve my request, thanks",
+                  "actionsRequired": "None"
+                },
+                "groupIds": [
+                  "Gateway"
+                ]
+              }
+            }
+          ],
+          "platformVersion": "stv2"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        },
+        "identity": {
+          "type": "SystemAssigned, UserAssigned",
+          "principalId": "306205e7-b21a-41bf-92e2-3e28af30041e",
+          "tenantId": "f686d426-8d16-42db-81b7-ab578e110ccd",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ogf-identity": {
+              "principalId": "713784d2-ee37-412a-95f0-3768f397f82d",
+              "clientId": "8d9791f2-0cdf-41f4-9e66-cdc39b496789"
+            }
+          }
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2021-06-16T09:40:00.7106733Z",
+          "lastModifiedBy": "foo@contoso.com",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2021-06-20T06:33:09.6159006Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json
new file mode 100644
index 000000000000..afd687d849d2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json
@@ -0,0 +1,89 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {},
+        "location": "West Europe",
+        "etag": "AAAAAAAENfI=",
+        "properties": {
+          "publisherEmail": "foo@contoso.com",
+          "publisherName": "Contoso",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2016-04-12T00:20:15.6018952Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-westeurope-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false,
+              "certificateSource": "BuiltIn"
+            },
+            {
+              "type": "Proxy",
+              "hostName": "proxy.msitesting.net",
+              "keyVaultId": "https://samir-msi-keyvault.vault.azure.net/secrets/msicertificate",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2020-12-18T11:11:47+00:00",
+                "thumbprint": "9833D531D7A45XXXXXA85908BD3692E0BD3F",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": true,
+              "certificateSource": "KeyVault"
+            }
+          ],
+          "publicIPAddresses": [
+            "13.94.xxx.188"
+          ],
+          "virtualNetworkConfiguration": {
+            "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/dfVirtualNetwork/subnets/backendSubnet"
+          },
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "External",
+          "disableGateway": false
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        },
+        "identity": {
+          "type": "SystemAssigned, UserAssigned",
+          "principalId": "ca1d33f7-xxxx-42ec-xxxx-d526a1ee953a",
+          "tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47",
+          "userAssignedIdentities": {
+            "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/apimService1": {
+              "principalId": "95194df2-9208-xxxx-xxxx-a10d2af9b5a3",
+              "clientId": "aaff9c7d-xxxx-4db2-xxxx-ab0e3e7806cf"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetSsoToken.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetSsoToken.json
new file mode 100644
index 000000000000..401ab8e10de5
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementServiceGetSsoToken.json
@@ -0,0 +1,15 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "redirectUri": "https://apimService1.portal.azure-api.net:443/signin-sso?token=1%26201705301929%26eIkr3%2fnfaLs1GVJ0OVbzkJjAcwPFkEZAPM8VUXvXPf7cJ6lWsB9oUwsk2zln9x0KLkn21txCPJWWheSPq7SNeA%3d%3d"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionListSecrets.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionListSecrets.json
new file mode 100644
index 000000000000..03b33a8ed321
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionListSecrets.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "sid": "5931a769d8d14f0ad8ce13b8"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "primaryKey": "<primaryKey>",
+        "secondaryKey": "<secondaryKey>"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionRegeneratePrimaryKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionRegeneratePrimaryKey.json
new file mode 100644
index 000000000000..ac49930da3ef
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionRegeneratePrimaryKey.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "sid": "testsub"
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionRegenerateSecondaryKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionRegenerateSecondaryKey.json
new file mode 100644
index 000000000000..ac49930da3ef
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementSubscriptionRegenerateSecondaryKey.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "sid": "testsub"
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantAccessRegenerateKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantAccessRegenerateKey.json
new file mode 100644
index 000000000000..7c8a59358d12
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantAccessRegenerateKey.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "accessName": "access"
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantAccessSyncState.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantAccessSyncState.json
new file mode 100644
index 000000000000..a284113f2479
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantAccessSyncState.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "configurationName": "configuration"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/configuration/syncState",
+        "type": "Microsoft.ApiManagement/service/tenant/syncState",
+        "name": "syncState",
+        "properties": {
+          "branch": "master",
+          "commitId": "de891c2342c7058dde45e5e624eae7e558c94683",
+          "isExport": true,
+          "isSynced": true,
+          "isGitEnabled": true,
+          "syncDate": "2021-04-13T01:15:53.9824995Z",
+          "configurationChangeDate": "2021-04-13T00:11:43.862781Z",
+          "lastOperationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/configuration/operationResults/6074f0bd093a9d0dac3d7347"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationDeploy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationDeploy.json
new file mode 100644
index 000000000000..e21459b14a79
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationDeploy.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "configurationName": "configuration",
+    "parameters": {
+      "properties": {
+        "branch": "master"
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/5a1af4ae2a6d2e0b688d7517?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "6074e652093a9d0dac3d733c",
+        "type": "Microsoft.ApiManagement/service/tenant/operationResults",
+        "name": "6074e652093a9d0dac3d733c",
+        "properties": {
+          "status": "Failed",
+          "started": "2017-11-26T17:06:54.303Z",
+          "updated": "2017-11-26T17:07:21.777Z",
+          "error": {
+            "code": "ValidationError",
+            "message": "File not found: 'api-management/configuration.json'"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationSave.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationSave.json
new file mode 100644
index 000000000000..44cf73365960
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationSave.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "configurationName": "configuration",
+    "parameters": {
+      "properties": {
+        "branch": "master"
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/5a1af57d2a6d2e0b688d751b?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "6074e652093a9d0dac3d733c",
+        "type": "Microsoft.ApiManagement/service/tenant/operationResults",
+        "name": "6074e652093a9d0dac3d733c",
+        "properties": {
+          "status": "Succeeded",
+          "started": "2021-04-13T00:31:14.94Z",
+          "updated": "2021-04-13T00:31:27.59Z",
+          "resultInfo": "The configuration was successfully saved to master as commit c0ae274f6046912107bad734834cbf65918668b6.",
+          "actionLog": []
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationValidate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationValidate.json
new file mode 100644
index 000000000000..43432b9869ec
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementTenantConfigurationValidate.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "configurationName": "configuration",
+    "parameters": {
+      "properties": {
+        "branch": "master"
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/5a1af64e2a6d2e0b688d751e?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "6074ec02093a9d0dac3d7345",
+        "type": "Microsoft.ApiManagement/service/tenant/operationResults",
+        "name": "6074ec02093a9d0dac3d7345",
+        "properties": {
+          "status": "Succeeded",
+          "started": "2021-04-13T00:55:30.62Z",
+          "updated": "2021-04-13T00:55:39.857Z",
+          "resultInfo": "Validation is successfull",
+          "actionLog": []
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUndelete.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUndelete.json
new file mode 100644
index 000000000000..4003b13cbb92
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUndelete.json
@@ -0,0 +1,113 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "publisherEmail": "foo@contoso.com",
+        "publisherName": "foo",
+        "restore": true
+      },
+      "sku": {
+        "name": "Developer",
+        "capacity": 1
+      },
+      "location": "South Central US"
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2021-04-01-preview"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "location": "South Central US",
+        "etag": "AAAAAAAp3P0=",
+        "properties": {
+          "publisherEmail": "foo@contoso.com",
+          "publisherName": "foo",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2019-12-18T06:10:56.0327105Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "apiVersionConstraint": {}
+        },
+        "sku": {
+          "name": "Developer",
+          "capacity": 1
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "location": "South Central US",
+        "etag": "AAAAAAAp3T4=",
+        "properties": {
+          "publisherEmail": "foo@contoso.com",
+          "publisherName": "foo",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-12-18T06:10:56.0327105Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-southcentralus-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
+          "publicIPAddresses": [
+            "23.102.171.124"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "virtualNetworkType": "None",
+          "disableGateway": false,
+          "apiVersionConstraint": {}
+        },
+        "sku": {
+          "name": "Developer",
+          "capacity": 1
+        }
+      }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/c2RrdGVzdGFwaW0xNTkxX0FjdF9jZTkyMmNmOQ==?api-version=2021-04-01-preview"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApi.json
new file mode 100644
index 000000000000..1324dd871fe0
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApi.json
@@ -0,0 +1,41 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echo-api",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "displayName": "Echo API New",
+        "serviceUrl": "http://echoapi.cloudapp.net/api2",
+        "path": "newecho"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "echo-api",
+        "properties": {
+          "displayName": "Echo API New",
+          "apiRevision": "1",
+          "serviceUrl": "http://echoapi.cloudapp.net/api2",
+          "path": "newecho",
+          "protocols": [
+            "https"
+          ],
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true,
+          "isOnline": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiDiagnostic.json
new file mode 100644
index 000000000000..2a7b6b09620c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiDiagnostic.json
@@ -0,0 +1,104 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights",
+    "apiId": "echo-api",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "alwaysLog": "allErrors",
+        "loggerId": "/loggers/applicationinsights",
+        "sampling": {
+          "samplingType": "fixed",
+          "percentage": 50
+        },
+        "frontend": {
+          "request": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          },
+          "response": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          }
+        },
+        "backend": {
+          "request": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          },
+          "response": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api/diagnostics/applicationinsights",
+        "type": "Microsoft.ApiManagement/service/apis/diagnostics",
+        "name": "applicationinsights",
+        "properties": {
+          "alwaysLog": "allErrors",
+          "httpCorrelationProtocol": "Legacy",
+          "logClientIp": true,
+          "loggerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/aisamplingtest",
+          "sampling": {
+            "samplingType": "fixed",
+            "percentage": 100
+          },
+          "frontend": {
+            "request": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            },
+            "response": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            }
+          },
+          "backend": {
+            "request": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            },
+            "response": {
+              "headers": [],
+              "body": {
+                "bytes": 100
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiIssue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiIssue.json
new file mode 100644
index 000000000000..23ef5a1d9952
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiIssue.json
@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "issueId": "57d2ef278aa04f0ad01d6cdc",
+    "apiId": "57d1f7558aa04f15146d9d8a",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "state": "closed"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a/issues/57d2ef278aa04f0ad01d6cdc",
+        "type": "Microsoft.ApiManagement/service/apis/issues",
+        "name": "57d2ef278aa04f0ad01d6cdc",
+        "properties": {
+          "title": "New API issue",
+          "description": "New API issue description",
+          "createdDate": "2018-02-01T22:21:20.467Z",
+          "state": "open",
+          "userId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/1",
+          "apiId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d1f7558aa04f15146d9d8a"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiOperation.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiOperation.json
new file mode 100644
index 000000000000..a573a0583cf6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiOperation.json
@@ -0,0 +1,88 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "echo-api",
+    "operationId": "operationId",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "displayName": "Retrieve resource",
+        "method": "GET",
+        "urlTemplate": "/resource",
+        "templateParameters": [],
+        "request": {
+          "queryParameters": [
+            {
+              "name": "param1",
+              "description": "A sample parameter that is required and has a default value of \"sample\".",
+              "type": "string",
+              "defaultValue": "sample",
+              "required": true,
+              "values": [
+                "sample"
+              ]
+            }
+          ]
+        },
+        "responses": [
+          {
+            "statusCode": 200,
+            "description": "Returned in all cases.",
+            "representations": [],
+            "headers": []
+          },
+          {
+            "statusCode": 500,
+            "description": "Server Error.",
+            "representations": [],
+            "headers": []
+          }
+        ]
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/57d2ef278aa04f0888cba3f3/operations/57d2ef278aa04f0ad01d6cdc",
+        "type": "Microsoft.ApiManagement/service/apis/operations",
+        "name": "57d2ef278aa04f0ad01d6cdc",
+        "properties": {
+          "displayName": "CancelOrder",
+          "method": "POST",
+          "urlTemplate": "/?soapAction=http://tempuri.org/IFazioService/CancelOrder",
+          "templateParameters": [],
+          "request": {
+            "description": "IFazioService_CancelOrder_InputMessage",
+            "queryParameters": [],
+            "headers": [],
+            "representations": [
+              {
+                "contentType": "text/xml",
+                "schemaId": "6980a395-f08b-4a59-8295-1440cbd909b8",
+                "typeName": "CancelOrder"
+              }
+            ]
+          },
+          "responses": [
+            {
+              "statusCode": 200,
+              "description": "IFazioService_CancelOrder_OutputMessage",
+              "representations": [
+                {
+                  "contentType": "text/xml",
+                  "schemaId": "6980a395-f08b-4a59-8295-1440cbd909b8",
+                  "typeName": "CancelOrderResponse"
+                }
+              ],
+              "headers": []
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiRelease.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiRelease.json
new file mode 100644
index 000000000000..9ac9a79d91df
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiRelease.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "a1",
+    "releaseId": "testrev",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "apiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1",
+        "notes": "yahooagain"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1/releases/testrev",
+        "type": "Microsoft.ApiManagement/service/apis/releases",
+        "name": "testrev",
+        "properties": {
+          "apiId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/a1",
+          "createdDateTime": "2018-02-08T20:38:29.173Z",
+          "updatedDateTime": "2018-02-08T20:38:29.173Z",
+          "notes": "yahoo"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiVersionSet.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiVersionSet.json
new file mode 100644
index 000000000000..a881bc1fd7ae
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateApiVersionSet.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "versionSetId": "vs1",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "displayName": "api set 1",
+        "versioningScheme": "Segment",
+        "description": "Version configuration"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apiVersionSets/vs1",
+        "type": "Microsoft.ApiManagement/service/api-version-sets",
+        "name": "vs1",
+        "properties": {
+          "displayName": "api set 1",
+          "versioningScheme": "Segment",
+          "description": "Version configuration"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateAuthorizationServer.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateAuthorizationServer.json
new file mode 100644
index 000000000000..a094586ee6ca
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateAuthorizationServer.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "authsid": "newauthServer",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "clientId": "update",
+        "clientSecret": "updated"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/authorizationServers/newauthServer",
+        "type": "Microsoft.ApiManagement/service/authorizationServers",
+        "name": "newauthServer",
+        "properties": {
+          "displayName": "test3",
+          "description": "test server",
+          "clientRegistrationEndpoint": "https://www.contoso.com/apps",
+          "authorizationEndpoint": "https://www.contoso.com/oauth2/auth",
+          "authorizationMethods": [
+            "GET"
+          ],
+          "clientAuthenticationMethod": [
+            "Basic"
+          ],
+          "tokenEndpoint": "https://www.contoso.com/oauth2/token",
+          "supportState": true,
+          "defaultScope": "read write",
+          "grantTypes": [
+            "authorizationCode",
+            "implicit"
+          ],
+          "bearerTokenSendingMethods": [
+            "authorizationHeader"
+          ],
+          "clientId": "updated",
+          "resourceOwnerUsername": "un",
+          "resourceOwnerPassword": "pwd"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateBackend.json
new file mode 100644
index 000000000000..4d637580d284
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateBackend.json
@@ -0,0 +1,61 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "backendId": "proxybackend",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "description": "description5308",
+        "tls": {
+          "validateCertificateChain": false,
+          "validateCertificateName": true
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/backends/proxybackend",
+        "type": "Microsoft.ApiManagement/service/backends",
+        "name": "proxybackend",
+        "properties": {
+          "description": "description5308",
+          "url": "https://backendname2644/",
+          "protocol": "http",
+          "credentials": {
+            "query": {
+              "sv": [
+                "xx",
+                "bb",
+                "cc"
+              ]
+            },
+            "header": {
+              "x-my-1": [
+                "val1",
+                "val2"
+              ]
+            },
+            "authorization": {
+              "scheme": "Basic",
+              "parameter": "opensesma"
+            }
+          },
+          "proxy": {
+            "url": "http://192.168.1.1:8080",
+            "username": "Contoso\\admin",
+            "password": "<password>"
+          },
+          "tls": {
+            "validateCertificateChain": false,
+            "validateCertificateName": true
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateCache.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateCache.json
new file mode 100644
index 000000000000..9e1b47c37fb1
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateCache.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "cacheId": "c1",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "useFromLocation": "westindia"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
+        "type": "Microsoft.ApiManagement/service/caches",
+        "name": "c1",
+        "properties": {
+          "useFromLocation": "westindia",
+          "description": "Redis cache instances in West India",
+          "connectionString": "{{5f7fbca77a891a2200f3db38}}",
+          "resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateDiagnostic.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateDiagnostic.json
new file mode 100644
index 000000000000..0813d7bfb56d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateDiagnostic.json
@@ -0,0 +1,111 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "diagnosticId": "applicationinsights",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "alwaysLog": "allErrors",
+        "loggerId": "/loggers/applicationinsights",
+        "sampling": {
+          "samplingType": "fixed",
+          "percentage": 50
+        },
+        "frontend": {
+          "request": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          },
+          "response": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          }
+        },
+        "backend": {
+          "request": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          },
+          "response": {
+            "headers": [
+              "Content-type"
+            ],
+            "body": {
+              "bytes": 512
+            }
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/diagnostics/applicationinsights",
+        "type": "Microsoft.ApiManagement/service/diagnostics",
+        "name": "applicationinsights",
+        "properties": {
+          "alwaysLog": "allErrors",
+          "httpCorrelationProtocol": "Legacy",
+          "logClientIp": true,
+          "loggerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/aisamplingtest",
+          "sampling": {
+            "samplingType": "fixed",
+            "percentage": 50
+          },
+          "frontend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          },
+          "backend": {
+            "request": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            },
+            "response": {
+              "headers": [
+                "Content-type"
+              ],
+              "body": {
+                "bytes": 512
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateGateway.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateGateway.json
new file mode 100644
index 000000000000..6620e2051817
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateGateway.json
@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "gatewayId": "gw1",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "description": "my gateway 1",
+        "locationData": {
+          "name": "my location"
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/gateways/gw1",
+        "type": "Microsoft.ApiManagement/service/gateways",
+        "name": "a1",
+        "properties": {
+          "description": "my gateway 1",
+          "locationData": {
+            "name": "my location"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateGroup.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateGroup.json
new file mode 100644
index 000000000000..b442993799bd
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateGroup.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "groupId": "tempgroup",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "displayName": "temp group"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/groups/tempgroup",
+        "type": "Microsoft.ApiManagement/service/groups",
+        "name": "tempgroup",
+        "properties": {
+          "displayName": "tempgroup",
+          "description": "awesome group of people",
+          "builtIn": false,
+          "type": "external",
+          "externalId": "aad://samiraad.onmicrosoft.com/groups/3773adf4-032e-4d25-9988-eaff9ca72eca"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateIdentityProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateIdentityProvider.json
new file mode 100644
index 000000000000..65fc5eebb791
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateIdentityProvider.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "identityProviderName": "facebook",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "clientId": "updatedfacebookid",
+        "clientSecret": "updatedfacebooksecret"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/identityProviders/AadB2C",
+        "type": "Microsoft.ApiManagement/service/identityProviders",
+        "name": "AadB2C",
+        "properties": {
+          "clientId": "f02dafe2-b8b8-48ec-a38e-27e5c16c51e5",
+          "type": "aadB2C",
+          "authority": "login.microsoftonline.com",
+          "signinTenant": "contosoaadb2c.onmicrosoft.com",
+          "allowedTenants": [
+            "contosoaadb2c.onmicrosoft.com",
+            "contoso2aadb2c.onmicrosoft.com"
+          ],
+          "signupPolicyName": "B2C_1_policy-signup",
+          "signinPolicyName": "B2C_1_policy-signin"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateLogger.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateLogger.json
new file mode 100644
index 000000000000..577a7884a124
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateLogger.json
@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "loggerId": "eh1",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "loggerType": "azureEventHub",
+        "description": "updating description"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/loggers/eh1",
+        "type": "Microsoft.ApiManagement/service/loggers",
+        "name": "eh1",
+        "properties": {
+          "loggerType": "azureEventHub",
+          "description": "updating description",
+          "credentials": {
+            "connectionString": "{{Logger-Credentials-5f28745bbebeeb13cc3f7301}}"
+          },
+          "isBuffered": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateNamedValue.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateNamedValue.json
new file mode 100644
index 000000000000..e90d8cbf9625
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateNamedValue.json
@@ -0,0 +1,43 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "namedValueId": "testprop2",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "displayName": "prop3name",
+        "value": "propValue",
+        "tags": [
+          "foo",
+          "bar2"
+        ],
+        "secret": false
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop2?api-version=2021-04-01-preview&asyncId=5c730e343244df1b9cb56e85&asyncCode=204"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop2",
+        "type": "Microsoft.ApiManagement/service/namedValues",
+        "properties": {
+          "displayName": "prop3name",
+          "value": "propValue",
+          "tags": [
+            "foo",
+            "bar2"
+          ],
+          "secret": false
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateOpenIdConnectProvider.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateOpenIdConnectProvider.json
new file mode 100644
index 000000000000..d25bf3884bd6
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateOpenIdConnectProvider.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "opid": "templateOpenIdConnect2",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "clientSecret": "updatedsecret"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/openidConnectProviders/templateOpenIdConnect2",
+        "type": "Microsoft.ApiManagement/service/openidconnectproviders",
+        "name": "templateOpenIdConnect2",
+        "properties": {
+          "displayName": "templateoidprovider2",
+          "description": "open id provider template2",
+          "metadataEndpoint": "https://oidprovider-template2.net",
+          "clientId": "oidprovidertemplate2"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdatePortalRevision.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdatePortalRevision.json
new file mode 100644
index 000000000000..a2d1c25232c9
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdatePortalRevision.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "portalRevisionId": "20201112101010",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "description": "portal revision update",
+        "isCurrent": true
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/portalRevisions/20201112101010?api-version=2021-04-01-preview&asyncId=5faf16b81d9a028970d0bfbb&asyncCode=200"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/namedValues/testprop2",
+        "type": "Microsoft.ApiManagement/service/portalRevisions",
+        "name": "20201112101010",
+        "properties": {
+          "description": "portal revision update",
+          "statusDetails": null,
+          "status": "completed",
+          "isCurrent": true,
+          "createdDateTime": "2020-11-13T22:47:13.397Z",
+          "updatedDateTime": "2020-11-13T23:29:25.34Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateProduct.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateProduct.json
new file mode 100644
index 000000000000..acd883a93548
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateProduct.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "productId": "testproduct",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "displayName": "Test Template ProductName 4"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/testproduct",
+        "type": "Microsoft.ApiManagement/service/products",
+        "name": "testproduct",
+        "properties": {
+          "displayName": "Test Template ProductName 4",
+          "description": "Subscribers have completely unlimited access to the API. Administrator approval is required.",
+          "subscriptionRequired": true,
+          "approvalRequired": true,
+          "subscriptionsLimit": 1,
+          "state": "published"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateQuotaCounterKey.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateQuotaCounterKey.json
new file mode 100644
index 000000000000..056ba0db5bcf
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateQuotaCounterKey.json
@@ -0,0 +1,34 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "quotaCounterKey": "ba",
+    "parameters": {
+      "properties": {
+        "callsCount": 0,
+        "kbTransferred": 2.5630078125
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "counterKey": "ba",
+            "periodKey": "0_P3Y6M4DT12H30M5S",
+            "periodStartTime": "2014-08-04T04:24:35Z",
+            "periodEndTime": "2018-02-08T16:54:40Z",
+            "value": {
+              "callsCount": 5,
+              "kbTransferred": 2.5830078125
+            }
+          }
+        ],
+        "nextLink": ""
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateQuotaCounterKeyByQuotaPeriod.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateQuotaCounterKeyByQuotaPeriod.json
new file mode 100644
index 000000000000..68f2e7669465
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateQuotaCounterKeyByQuotaPeriod.json
@@ -0,0 +1,30 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "quotaCounterKey": "ba",
+    "quotaPeriodKey": "0_P3Y6M4DT12H30M5S",
+    "parameters": {
+      "properties": {
+        "callsCount": 0,
+        "kbTransferred": 0
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "counterKey": "ba",
+        "periodKey": "0_P3Y6M4DT12H30M5S",
+        "periodStartTime": "2014-08-04T04:24:35Z",
+        "periodEndTime": "2018-02-08T16:54:40Z",
+        "value": {
+          "callsCount": 0,
+          "kbTransferred": 2.5625
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceDisableTls10.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceDisableTls10.json
new file mode 100644
index 000000000000..26b61f4579d2
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceDisableTls10.json
@@ -0,0 +1,92 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "customProperties": {
+          "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false"
+        }
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+      "name": "apimService1",
+      "type": "Microsoft.ApiManagement/service",
+      "tags": {
+        "TestExpiration": "Thu, 29 Jun 2017 18:50:40 GMT"
+      },
+      "location": "West US",
+      "etag": "AAAAAAAYRPs=",
+      "properties": {
+        "publisherEmail": "admin@live.com",
+        "publisherName": "Contoso",
+        "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+        "provisioningState": "Succeeded",
+        "targetProvisioningState": "",
+        "createdAtUtc": "2017-06-29T17:50:42.3191122Z",
+        "gatewayUrl": "https://apimService1.azure-api.net",
+        "portalUrl": "https://apimService1.portal.azure-api.net",
+        "managementApiUrl": "https://apimService1.management.azure-api.net",
+        "scmUrl": "https://apimService1.scm.azure-api.net",
+        "hostnameConfigurations": [],
+        "publicIPAddresses": [
+          "40.86.176.232"
+        ],
+        "customProperties": {
+          "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False"
+        },
+        "virtualNetworkType": "None"
+      },
+      "sku": {
+        "name": "Standard",
+        "capacity": 1
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "Owner": "sasolank",
+          "UID": "4f5025fe-0669-4e2e-8320-5199466e5eb3",
+          "Reserved": "",
+          "TestExpiration": "Thu, 29 Jun 2017 18:50:40 GMT",
+          "Pool": "Manual",
+          "TestSuiteExpiration": "Thu, 29 Jun 2017 18:51:46 GMT"
+        },
+        "location": "West US",
+        "etag": "AAAAAAAYRPs=",
+        "properties": {
+          "publisherEmail": "admin@live.com",
+          "publisherName": "Contoso",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2017-06-29T17:50:42.3191122Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [],
+          "publicIPAddresses": [
+            "40.86.176.232"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False"
+          },
+          "virtualNetworkType": "None"
+        },
+        "sku": {
+          "name": "Standard",
+          "capacity": 1
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServicePublisherDetails.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServicePublisherDetails.json
new file mode 100644
index 000000000000..f8d92e9c669f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServicePublisherDetails.json
@@ -0,0 +1,91 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "publisherEmail": "foobar@live.com",
+        "publisherName": "Contoso Vnext"
+      }
+    }
+  },
+  "responses": {
+    "202": {
+      "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+      "name": "apimService1",
+      "type": "Microsoft.ApiManagement/service",
+      "tags": {
+        "TestExpiration": "Thu, 29 Jun 2017 18:50:40 GMT"
+      },
+      "location": "West US",
+      "etag": "AAAAAAAYRPs=",
+      "properties": {
+        "publisherEmail": "admin@live.com",
+        "publisherName": "Contoso",
+        "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+        "provisioningState": "Succeeded",
+        "targetProvisioningState": "",
+        "createdAtUtc": "2017-06-29T17:50:42.3191122Z",
+        "gatewayUrl": "https://apimService1.azure-api.net",
+        "portalUrl": "https://apimService1.portal.azure-api.net",
+        "managementApiUrl": "https://apimService1.management.azure-api.net",
+        "scmUrl": "https://apimService1.scm.azure-api.net",
+        "hostnameConfigurations": [],
+        "publicIPAddresses": [
+          "40.86.176.232"
+        ],
+        "customProperties": {
+          "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False"
+        },
+        "virtualNetworkType": "None"
+      },
+      "sku": {
+        "name": "Standard",
+        "capacity": 1
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {
+          "Owner": "sasolank",
+          "UID": "4f5025fe-0669-4e2e-8320-5199466e5eb3",
+          "Reserved": "",
+          "TestExpiration": "Thu, 29 Jun 2017 18:50:40 GMT",
+          "Pool": "Manual",
+          "TestSuiteExpiration": "Thu, 29 Jun 2017 18:51:46 GMT"
+        },
+        "location": "West US",
+        "etag": "AAAAAAAYRPs=",
+        "properties": {
+          "publisherEmail": "foobar@live.com",
+          "publisherName": "Contoso Vnext",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2017-06-29T17:50:42.3191122Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [],
+          "publicIPAddresses": [
+            "40.86.176.232"
+          ],
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "False"
+          },
+          "virtualNetworkType": "None"
+        },
+        "sku": {
+          "name": "Standard",
+          "capacity": 1
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json
new file mode 100644
index 000000000000..59d901ecd262
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json
@@ -0,0 +1,110 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "parameters": {
+      "properties": {
+        "virtualNetworkConfiguration": {
+          "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimService1v2/subnets/default"
+        },
+        "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apimService1ip",
+        "virtualNetworkType": "External"
+      },
+      "sku": {
+        "name": "Premium",
+        "capacity": 2
+      },
+      "zones": [
+        "1",
+        "2"
+      ]
+    }
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/TGV2eTExMDZtMDJfVGVybV9jMmZlY2QwMA==?api-version=2021-04-01-preview"
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {},
+        "location": "West Europe",
+        "etag": "AAAAAABlaZ0=",
+        "properties": {
+          "publisherEmail": "foobar@contoso.com",
+          "publisherName": "Microsoft",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2016-04-12T00:20:15.6018952Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-westeurope-01.regional.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "developerPortalUrl": "https://apimService1.developer.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": false,
+              "certificateSource": "BuiltIn"
+            },
+            {
+              "type": "Proxy",
+              "hostName": "proxy.msitesting.net",
+              "keyVaultId": "https://demo-msi-keyvault.vault.azure.net/secrets/msicertificate",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2020-12-18T11:11:47+00:00",
+                "thumbprint": "9833D531D7A4XXXX766F2A85908BD3692E0BD3F",
+                "subject": "CN=*.msitesting.net"
+              },
+              "defaultSslBinding": true,
+              "certificateSource": "Custom"
+            }
+          ],
+          "publicIPAddresses": [
+            "13.94.XXX.188"
+          ],
+          "virtualNetworkConfiguration": {
+            "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimService1v2/subnets/default"
+          },
+          "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apimService1ip",
+          "virtualNetworkType": "External",
+          "customProperties": {
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "True",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False",
+            "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False"
+          },
+          "disableGateway": false
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 2
+        },
+        "identity": {
+          "type": "SystemAssigned",
+          "principalId": "ca1d33f7-XXXX-42ec-b3e9-XXXX",
+          "tenantId": "72f988bf-XXXX-41af-91ab-2d7cd011db47"
+        },
+        "zones": [
+          "1",
+          "2"
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateSubscription.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateSubscription.json
new file mode 100644
index 000000000000..e7d23db91e7c
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateSubscription.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "sid": "testsub",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "displayName": "testsub"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/subscriptions/testsub",
+        "type": "Microsoft.ApiManagement/service/subscriptions",
+        "name": "testsub",
+        "properties": {
+          "ownerId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/5931a75ae4bbd512a88c680b",
+          "scope": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/products/5600b59475ff190048060002",
+          "displayName": "testsub",
+          "state": "submitted",
+          "createdDate": "2017-06-02T17:59:06.223Z"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTag.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTag.json
new file mode 100644
index 000000000000..0f27d54a019f
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTag.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "tagId": "temptag",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "displayName": "temp tag"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tags/temptag",
+        "type": "Microsoft.ApiManagement/service/tags",
+        "name": "temptag",
+        "properties": {
+          "displayName": "tag1"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTemplate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTemplate.json
new file mode 100644
index 000000000000..4416658e2425
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTemplate.json
@@ -0,0 +1,58 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "templateName": "newIssueNotificationMessage",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "subject": "Your request $IssueName was received",
+        "body": "<!DOCTYPE html >\r\n<html>\r\n  <head />\r\n  <body>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Dear $DevFirstName $DevLastName,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">\r\n          We are happy to let you know that your request to publish the $AppName application in the gallery has been approved. Your application has been published and can be viewed <a href=\"http://$DevPortalUrl/Applications/Details/$AppId\">here</a>.\r\n        </p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Best,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">The $OrganizationName API Team</p>\r\n  </body>\r\n</html>"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/templates/NewIssueNotificationMessage",
+        "type": "Microsoft.ApiManagement/service/templates",
+        "name": "NewIssueNotificationMessage",
+        "properties": {
+          "subject": "Your request $IssueName was received",
+          "body": "<!DOCTYPE html >\r\n<html>\r\n  <head />\r\n  <body>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Dear $DevFirstName $DevLastName,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Thank you for contacting us. Our API team will review your issue and get back to you soon.</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">\r\n          Click this <a href=\"http://$DevPortalUrl/issues/$IssueId\">link</a> to view or edit your request.\r\n        </p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">Best,</p>\r\n    <p style=\"font-size:12pt;font-family:'Segoe UI'\">The $OrganizationName API Team</p>\r\n  </body>\r\n</html>",
+          "title": "New issue received",
+          "description": "This email is sent to developers after they create a new topic on the Issues page of the developer portal.",
+          "isDefault": true,
+          "parameters": [
+            {
+              "name": "DevFirstName",
+              "title": "Developer first name"
+            },
+            {
+              "name": "DevLastName",
+              "title": "Developer last name"
+            },
+            {
+              "name": "IssueId",
+              "title": "Issue id"
+            },
+            {
+              "name": "IssueName",
+              "title": "Issue name"
+            },
+            {
+              "name": "OrganizationName",
+              "title": "Organization name"
+            },
+            {
+              "name": "DevPortalUrl",
+              "title": "Developer portal URL"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTenantAccess.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTenantAccess.json
new file mode 100644
index 000000000000..a8d3765220c3
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateTenantAccess.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "If-Match": "*",
+    "accessName": "access",
+    "parameters": {
+      "properties": {
+        "enabled": true
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/access",
+        "type": "Microsoft.ApiManagement/service/tenant",
+        "name": "access",
+        "properties": {
+          "enabled": true
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateUser.json
new file mode 100644
index 000000000000..9757480cee58
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateUser.json
@@ -0,0 +1,39 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "5931a75ae4bbd512a88c680b",
+    "If-Match": "*",
+    "parameters": {
+      "properties": {
+        "firstName": "foo",
+        "lastName": "bar",
+        "email": "foobar@outlook.com"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/users/5931a75ae4bbd512a88c680b",
+        "type": "Microsoft.ApiManagement/service/users",
+        "name": "5931a75ae4bbd512a88c680b",
+        "properties": {
+          "firstName": "foo",
+          "lastName": "bar",
+          "email": "foobar@outlook.com",
+          "state": "active",
+          "registrationDate": "2017-06-02T17:58:50.357Z",
+          "identities": [
+            {
+              "provider": "Microsoft",
+              "id": "*************"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserConfirmationPasswordSend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserConfirmationPasswordSend.json
new file mode 100644
index 000000000000..db4fb5c46a48
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserConfirmationPasswordSend.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "57127d485157a511ace86ae7"
+  },
+  "responses": {
+    "204": {}
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserGenerateSsoUrl.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserGenerateSsoUrl.json
new file mode 100644
index 000000000000..fd96e6cff72d
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserGenerateSsoUrl.json
@@ -0,0 +1,16 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "57127d485157a511ace86ae7"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": "https://apimService1.portal.azure-api.net/signin-sso?token=57127d485157a511ace86ae7%26201706051624%267VY18MlwAom***********2bYr2bDQHg21OzQsNakExQ%3d%3d"
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserToken.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserToken.json
new file mode 100644
index 000000000000..ad6429fc9d39
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUserToken.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "subid",
+    "userId": "userId1718",
+    "parameters": {
+      "properties": {
+        "keyType": "primary",
+        "expiry": "2019-04-21T00:44:24.2845269Z"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": "userId1718&201904210044&9A1GR1f5WIhFvFmzQG+xxxxxxxxxxx/kBeu87DWad3tkasUXuvPL+MgzlwUHyg=="
+      }
+    }
+  }
+}
diff --git a/specification/apimanagement/resource-manager/readme.md b/specification/apimanagement/resource-manager/readme.md
index a2ff30c77dcc..66d874436704 100644
--- a/specification/apimanagement/resource-manager/readme.md
+++ b/specification/apimanagement/resource-manager/readme.md
@@ -28,15 +28,68 @@ These are the global settings for the ApiManagement API.
 title: ApiManagementClient
 description: ApiManagement Client
 openapi-type: arm
-tag: package-preview-2021-01
+tag: package-preview-2021-04
 ```
 
+``` yaml
+modelerfour:
+  lenient-model-deduplication: true
+```
+
+### Tag: package-preview-2021-04
 
+These settings apply only when `--tag=package-preview-2021-04` is specified on the command line.
+
+```yaml $(tag) == 'package-preview-2021-04'
+input-file:
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimanagement.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimapis.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimapisByTags.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimapiversionsets.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimauthorizationservers.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimbackends.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimcaches.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimcertificates.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimcontenttypes.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeletedservices.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeployment.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimdiagnostics.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimemailtemplates.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimgateways.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimgroups.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimidentityprovider.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimissues.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimloggers.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimnamedvalues.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimnetworkstatus.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimnotifications.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimopenidconnectproviders.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimoutbounddependency.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimpolicies.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimpolicydescriptions.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimportalrevisions.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimportalsettings.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimprivatelink.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimproducts.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimproductsByTags.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimquotas.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimregions.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimreports.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimsettings.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimskus.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimsubscriptions.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimtagresources.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimtags.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimtenant.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimusers.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/apimconnectivitycheck.json
+  - Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json
+```
 ### Tag: package-preview-2021-01
 
 These settings apply only when `--tag=package-preview-2021-01` is specified on the command line.
 
-```yaml $(tag) == 'package-preview-2021-01'
+``` yaml $(tag) == 'package-preview-2021-01'
 input-file:
   - Microsoft.ApiManagement/preview/2021-01-01-preview/apimanagement.json
   - Microsoft.ApiManagement/preview/2021-01-01-preview/apimapis.json
@@ -78,6 +131,7 @@ input-file:
   - Microsoft.ApiManagement/preview/2021-01-01-preview/apimusers.json
   - Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json
 ```
+
 ### Tag: package-2020-12
 
 These settings apply only when `--tag=package-2020-12` is specified on the command line.
@@ -611,5 +665,11 @@ directive:
     reason: Warning raised to error while PR was being reviewed. SystemData will implement in next preview version.
   - suppress: R4037
     from: definitions.json
-    reason: We want customers to be able to supply any valid JSON token, object or otherwise
+    reason: We want customers to be able to supply any valid JSON token, object or otherwise    
+  - suppress: R4009
+    from: apimprivatelink.json
+    reason: Warning raised to error while PR was being reviewed. SystemData will implement in next preview version.  
+  - suppress: R4009
+    from: apimprivatelink.json
+    reason: Warning raised to error while PR was being reviewed. SystemData will implement in next preview version.  
 ```