diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimapis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimapis.json
index 289bb7722f27..3301aa84b12d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimapis.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimapis.json
@@ -245,7 +245,7 @@
           "ApiManagementCreateApiRevisionFromExistingApi": {
             "$ref": "./examples/ApiManagementCreateApiRevisionFromExistingApi.json"
           },
-          "ApiManagementCreateApiNewVersionUsingExistingApi" : {
+          "ApiManagementCreateApiNewVersionUsingExistingApi": {
             "$ref": "./examples/ApiManagementCreateApiNewVersionUsingExistingApi.json"
           },
           "ApiManagementCreateApiClone": {
@@ -4348,6 +4348,9 @@
         "x-ms-examples": {
           "ApiManagementGetApiExportInOpenApi2dot0": {
             "$ref": "./examples/ApiManagementGetApiExportInOpenApi2dot0.json"
+          },
+          "ApiManagementGetApiExportInOpenApi3dot0": {
+            "$ref": "./examples/ApiManagementGetApiExportInOpenApi3dot0.json"
           }
         },
         "parameters": [
@@ -4393,7 +4396,7 @@
                 {
                   "value": "openapi-link",
                   "description": "Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.",
-                  "name": "OpenApi3"
+                  "name": "Openapi"
                 }
               ]
             },
@@ -4437,6 +4440,6 @@
       }
     }
   },
-  "definitions": { },
-  "parameters": { }
+  "definitions": {},
+  "parameters": {}
 }
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimdeployment.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimdeployment.json
index ae96d11e35fa..4d4828b60a28 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimdeployment.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimdeployment.json
@@ -269,10 +269,7 @@
             }
           },
           "202": {
-            "description": "Accepted the configuration change when updating the service.",
-            "schema": {
-              "$ref": "#/definitions/ApiManagementServiceResource"
-            }
+            "description": "Accepted the configuration change when updating the service."
           }
         },
         "x-ms-long-running-operation": true
@@ -1079,7 +1076,7 @@
         },
         "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 and enabled ability to authenticate the certificate in the policy.",
+          "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
         },
         "virtualNetworkType": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimnotifications.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimnotifications.json
index fcb667867183..7c6d17a6bf04 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimnotifications.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimnotifications.json
@@ -257,6 +257,9 @@
           "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": {
@@ -445,6 +448,9 @@
           "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": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/definitions.json
index 05b570853299..a30b246295a7 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/definitions.json
@@ -57,6 +57,16 @@
       "description": "Tenant access information contract 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",
@@ -342,12 +352,59 @@
     },
     "ApiExportResult": {
       "properties": {
-        "link": {
+        "id": {
           "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": "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 Blob Uri."
+      "description": "API Export result."
     },
     "ApiReleaseCollection": {
       "properties": {
@@ -636,9 +693,9 @@
           "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."
+        "name": {
+          "type": "string",
+          "description": "The display Name of the API Version Set."
         },
         "description": {
           "type": "string",
@@ -1635,6 +1692,16 @@
       "description": "Parameters supplied to the CreateOrUpdate certificate operation."
     },
     "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",
@@ -4099,6 +4166,16 @@
       "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",
@@ -4926,6 +5003,16 @@
       "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",
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json
index f5dc07101580..e5ec4ffa34ab 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json
@@ -4,7 +4,7 @@
     "resourceGroupName": "rg1",
     "api-version": "2019-01-01",
     "subscriptionId": "subid",
-    "parameters": {      
+    "parameters": {
       "location": "Central US",
       "sku": {
         "name": "Premium",
@@ -15,7 +15,7 @@
         "publisherName": "contoso",
         "additionalLocations": [
           {
-            "location": "West US",
+            "location": "North Europe",
             "sku": {
               "name": "Premium",
               "capacity": 1
@@ -70,8 +70,14 @@
           "publisherName": "contoso",
           "provisioningState": "Created",
           "targetProvisioningState": "Activating",
-          "createdAtUtc": "2017-05-30T18:06:23.0096164Z",
+          "createdAtUtc": "2019-04-11T08:25:38.5086594Z",
           "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            },
             {
               "type": "Proxy",
               "hostName": "proxyhostname1.contoso.com",
@@ -106,7 +112,7 @@
           "publicIPAddresses": [],
           "additionalLocations": [
             {
-              "location": "West US",
+              "location": "North Europe",
               "sku": {
                 "name": "Premium",
                 "capacity": 1
@@ -133,99 +139,32 @@
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
         "name": "apimService1",
         "type": "Microsoft.ApiManagement/service",
-        "tags": {},
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
         "location": "Central US",
-        "etag": "AAAAAAAXXwI=",
+        "etag": "AAAAAAFzTM0=",
         "properties": {
           "publisherEmail": "admin@live.com",
           "publisherName": "contoso",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
           "provisioningState": "Succeeded",
           "targetProvisioningState": "",
-          "createdAtUtc": "2017-05-30T19:00:47.1121713Z",
+          "createdAtUtc": "2019-04-11T08:25:38.5086594Z",
           "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-centralus-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": [
             {
               "type": "Proxy",
-              "hostName": "proxyhostname1.contoso.com",
+              "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
-              "certificate": {
-                "expiry": "2018-03-17T21:55:07+00:00",
-                "thumbprint": "918D7785B926AC5AEE66322778A147BCE7237CF3",
-                "subject": "CN=proxyhostname1.contoso.com"
-              }
+              "defaultSslBinding": true
             },
-            {
-              "type": "Proxy",
-              "hostName": "proxyhostname2.contoso.com",
-              "negotiateClientCertificate": true,
-              "certificate": {
-                "expiry": "2018-03-17T21:55:07+00:00",
-                "thumbprint": "918D7785B926AC5AEE66322778A147BCE7237CF3",
-                "subject": "CN=proxyhostname2.contoso.com"
-              }
-            },
-            {
-              "type": "Portal",
-              "hostName": "portalhostname1.contoso.com",
-              "negotiateClientCertificate": false,
-              "certificate": {
-                "expiry": "2018-03-17T21:55:07+00:00",
-                "thumbprint": "918D7785B926AC5AEE66322778A147BCE7237CF3",
-                "subject": "CN=portalhostname1.contoso.com"
-              }
-            }
-          ],
-          "publicIPAddresses": [
-            "52.xxx.xxx.207"
-          ],
-          "additionalLocations": [
-            {
-              "location": "West US",
-              "sku": {
-                "name": "Premium",
-                "capacity": 1
-              },
-              "publicIPAddresses": [
-                "104.210.41.234"
-              ],
-              "virtualNetworkConfiguration": {
-                "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/westUsVirtualNetwork/subnets/apimSubnet"
-              }
-            }
-          ],
-          "virtualNetworkConfiguration": {
-            "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/centralUsVirtualNetwork/subnets/apimSubnet"
-          },
-          "virtualNetworkType": "External"
-        },
-        "sku": {
-          "name": "Premium",
-          "capacity": 1
-        }
-      }
-    },
-    "202": {
-      "body": {
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
-        "name": "apimService1",
-        "type": "Microsoft.ApiManagement/service",
-        "tags": {},
-        "location": "Central US",
-        "etag": "AAAAAAAXXwI=",
-        "properties": {
-          "publisherEmail": "admin@live.com",
-          "publisherName": "contoso",
-          "provisioningState": "Succeeded",
-          "targetProvisioningState": "",
-          "createdAtUtc": "2017-05-30T19:00:47.1121713Z",
-          "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": [
             {
               "type": "Proxy",
               "hostName": "proxyhostname1.contoso.com",
@@ -258,23 +197,35 @@
             }
           ],
           "publicIPAddresses": [
-            "52.xxx.xxx.207"
+            "104.43.XXX.72"
           ],
+          "privateIPAddresses": null,
           "additionalLocations": [
             {
-              "location": "West US",
+              "location": "North Europe",
               "sku": {
                 "name": "Premium",
                 "capacity": 1
               },
               "publicIPAddresses": [
-                "104.210.41.234"
+                "52.XXX.197.222"
               ],
+              "gatewayRegionalUrl": "https://apimService1-northeurope-01.regional.azure-api.net",
               "virtualNetworkConfiguration": {
                 "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/westUsVirtualNetwork/subnets/apimSubnet"
               }
             }
           ],
+          "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"
+          },
           "virtualNetworkConfiguration": {
             "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/centralUsVirtualNetwork/subnets/apimSubnet"
           },
@@ -285,6 +236,11 @@
           "capacity": 1
         }
       }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/bXVsdGlob3N0bmFtZW11bHRpcmVnaW9uc2VydmljZV9BY3RfZjFiOTZhMjc=?api-version=2019-01-01"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateService.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateService.json
index 207c985e00d4..83e42c74993e 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateService.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateService.json
@@ -5,14 +5,19 @@
     "api-version": "2019-01-01",
     "subscriptionId": "subid",
     "parameters": {
-      "location": "West US",
+      "properties": {
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk"
+      },
       "sku": {
-        "name": "Premium",
+        "name": "Developer",
         "capacity": 1
       },
-      "properties": {
-        "publisherEmail": "admin@live.com",
-        "publisherName": "contoso"
+      "location": "Central US",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
       }
     }
   },
@@ -22,88 +27,95 @@
         "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2019-01-01"
       },
       "body": {
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/testdemo",
-        "name": "testdemo",
+        "id": "/subscriptions/subid/resourceGroups/sdktestrg9348/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
         "type": "Microsoft.ApiManagement/service",
-        "tags": {},
-        "location": "West US",
-        "etag": "AAAAAAAcyE0=",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "Central US",
+        "etag": "AAAAAAFzRiw=",
         "properties": {
-          "publisherEmail": "admin@live.com",
-          "publisherName": "contoso",
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
           "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
           "provisioningState": "Created",
           "targetProvisioningState": "Activating",
-          "createdAtUtc": "2018-01-18T05:24:31.3459297Z",
-          "hostnameConfigurations": [],
+          "createdAtUtc": "2019-04-11T07:02:18.8577084Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
           "virtualNetworkType": "None"
         },
         "sku": {
-          "name": "Premium",
+          "name": "Developer",
           "capacity": 1
         }
       }
     },
     "200": {
       "body": {
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "id": "/subscriptions/subid/resourceGroups/sdktestrg9348/providers/Microsoft.ApiManagement/service/apimService1",
         "name": "apimService1",
         "type": "Microsoft.ApiManagement/service",
-        "location": "West US",
-        "etag": "AAAAAAAcof0=",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "Central US",
+        "etag": "AAAAAAFzSFg=",
         "properties": {
-          "publisherEmail": "admin@live.com",
-          "publisherName": "contoso",
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
           "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
           "provisioningState": "Succeeded",
           "targetProvisioningState": "",
-          "createdAtUtc": "2018-01-18T05:24:31.3459297Z",
+          "createdAtUtc": "2019-04-11T07:02:18.8577084Z",
           "gatewayUrl": "https://apimService1.azure-api.net",
-          "gatewayRegionalUrl": "https://apimService1-westus-01.regional.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-centralus-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": [],
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
           "publicIPAddresses": [
-            "207.xx.155.24"
+            "13.89.236.232"
           ],
+          "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"
         },
         "sku": {
-          "name": "Premium",
+          "name": "Developer",
           "capacity": 1
         }
       }
     },
     "202": {
-      "body": {
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
-        "name": "apimService1",
-        "type": "Microsoft.ApiManagement/service",
-        "location": "West US",
-        "etag": "AAAAAAAcof0=",
-        "properties": {
-          "publisherEmail": "admin@live.com",
-          "publisherName": "contoso",
-          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
-          "provisioningState": "Succeeded",
-          "targetProvisioningState": "",
-          "createdAtUtc": "2018-01-18T05:24:31.3459297Z",
-          "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": [
-            "207.xx.155.24"
-          ],
-          "virtualNetworkType": "None"
-        },
-        "sku": {
-          "name": "Premium",
-          "capacity": 1
-        }
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/sdktestrg9348/providers/Microsoft.ApiManagement/service/apimService1/operationresults/c2RrdGVzdGFwaW0xNTkxX0FjdF9jZTkyMmNmOQ==?api-version=2019-01-01"
       }
     }
   }
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateServiceHavingMsi.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateServiceHavingMsi.json
index 5f6fba7c86b9..f5f9d4e627e8 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateServiceHavingMsi.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateServiceHavingMsi.json
@@ -5,16 +5,21 @@
     "api-version": "2019-01-01",
     "subscriptionId": "subid",
     "parameters": {
-      "location": "Japan East",
       "properties": {
-        "publisherEmail": "admin@contoso.com",
-        "publisherName": "Contoso"
+        "publisherEmail": "apim@autorestsdk.com",
+        "publisherName": "autorestsdk"
       },
       "sku": {
-        "name": "Developer"
+        "name": "Consumption"
       },
       "identity": {
         "type": "SystemAssigned"
+      },
+      "location": "West US",
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2",
+        "tag3": "value3"
       }
     }
   },
@@ -27,24 +32,38 @@
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
         "name": "apimService1",
         "type": "Microsoft.ApiManagement/service",
-        "location": "Japan East",
-        "etag": "AAAAAAC268k=",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAAAWiE=",
         "properties": {
-          "publisherEmail": "admin@contoso.com",
-          "publisherName": "Contoso",
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
           "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
           "provisioningState": "Created",
           "targetProvisioningState": "Activating",
-          "createdAtUtc": "2017-10-27T23:41:41.7231779Z"
+          "createdAtUtc": "2019-04-11T16:29:29.9711098Z",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
+          ],
+          "virtualNetworkType": "None"
         },
         "sku": {
-          "name": "Developer",
-          "capacity": 1
+          "name": "Consumption",
+          "capacity": 0
         },
         "identity": {
           "type": "SystemAssigned",
-          "principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
-          "tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
+          "principalId": "dfb9a757-df69-4966-a8d0-711a9cd8ffb4",
+          "tenantId": "XXXXXX-86f1-41af-91ab-2d7cd011db47"
         }
       }
     },
@@ -53,67 +72,46 @@
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
         "name": "apimService1",
         "type": "Microsoft.ApiManagement/service",
-        "tags": {},
-        "location": "Japan East",
-        "etag": "AAAAAAC268s=",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2",
+          "tag3": "value3"
+        },
+        "location": "West US",
+        "etag": "AAAAAAAAWiU=",
         "properties": {
-          "publisherEmail": "admin@live.com",
-          "publisherName": "Contoso",
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
           "provisioningState": "Succeeded",
           "targetProvisioningState": "",
-          "createdAtUtc": "2017-10-28T01:52:02.4307221Z",
+          "createdAtUtc": "2019-04-11T16:29:29.9711098Z",
           "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",
-          "publicIPAddresses": [
-            "xx.xx.250.222"
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
+            }
           ],
-          "virtualNetworkType": "None"
+          "virtualNetworkType": "None",
+          "enableClientCertificate": false
         },
         "sku": {
-          "name": "Developer",
-          "capacity": 1
+          "name": "Consumption",
+          "capacity": 0
         },
         "identity": {
           "type": "SystemAssigned",
-          "principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
-          "tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
+          "principalId": "dfb9a757-df69-4966-a8d0-711a9cd8ffb4",
+          "tenantId": "XXXXXX-86f1-41af-91ab-2d7cd011db47"
         }
       }
     },
     "202": {
-      "body": {
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
-        "name": "apimService1",
-        "type": "Microsoft.ApiManagement/service",
-        "tags": {},
-        "location": "Japan East",
-        "etag": "AAAAAAC268s=",
-        "properties": {
-          "publisherEmail": "admin@live.com",
-          "publisherName": "Contoso",
-          "provisioningState": "Succeeded",
-          "targetProvisioningState": "",
-          "createdAtUtc": "2017-10-28T01:52:02.4307221Z",
-          "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",
-          "publicIPAddresses": [
-            "xx.xx.250.222"
-          ],
-          "virtualNetworkType": "None"
-        },
-        "sku": {
-          "name": "Developer",
-          "capacity": 1
-        },
-        "identity": {
-          "type": "SystemAssigned",
-          "principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
-          "tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
-        }
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2019-01-01"
       }
     }
   }
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateServiceWithSystemCertificates.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateServiceWithSystemCertificates.json
index 9d2f85aa3eaa..d5cecaf2108b 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateServiceWithSystemCertificates.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementCreateServiceWithSystemCertificates.json
@@ -5,26 +5,26 @@
     "api-version": "2019-01-01",
     "subscriptionId": "subid",
     "parameters": {
-      "location": "Central US",
-      "tags": {
-        "tag1": "value1",
-        "tag2": "value2",
-        "tag3": "value3"
-      },
-      "sku": {
-        "name": "Basic",
-        "capacity": 1
-      },
       "properties": {
-        "publisherEmail": "apim@autorestsdk.com",
-        "publisherName": "autorestsdk",
         "certificates": [
           {
-            "encodedCertificate": "************Base 64 Encoded Pfx Certificate************************",
-            "certificatePassword": "**************Password of the Certificate************************************************",
+            "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"
       }
     }
   },
@@ -71,91 +71,71 @@
       }
     },
     "200": {
-      "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": "AAAAAADauqg=",
-      "properties": {
-        "publisherEmail": "apim@autorestsdk.com",
-        "publisherName": "autorestsdk",
-        "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
-        "provisioningState": "Succeeded",
-        "targetProvisioningState": "",
-        "createdAtUtc": "2018-02-19T16:42:47.362368Z",
-        "gatewayUrl": "https://apimService1.azure-api.net",
-        "gatewayRegionalUrl": "https://apimService1-centralus-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.69.153.91"
-        ],
-        "virtualNetworkType": "None",
-        "certificates": [
-          {
-            "storeName": "CertificateAuthority",
-            "certificate": {
-              "expiry": "2035-12-31T23:00:00-08:00",
-              "thumbprint": "8E989652XXXXXXXXXXXXXXXDB3A2",
-              "subject": "CN=*.msitesting.net"
+      "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": "AAAAAAFzQXQ=",
+        "properties": {
+          "publisherEmail": "apim@autorestsdk.com",
+          "publisherName": "autorestsdk",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2019-04-11T05:08:04.3228808Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "gatewayRegionalUrl": "https://apimService1-centralus-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": [
+            {
+              "type": "Proxy",
+              "hostName": "apimService1.azure-api.net",
+              "negotiateClientCertificate": false,
+              "defaultSslBinding": true
             }
-          }
-        ]
-      },
-      "sku": {
-        "name": "Basic",
-        "capacity": 1
+          ],
+          "publicIPAddresses": [
+            "40.113.228.6"
+          ],
+          "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": "2035-12-31T23:00:00-08:00",
+                "thumbprint": "8E989652CABCF585ACBFCB9C2C91F1D174FDB3A2",
+                "subject": "CN=*.msitesting.net"
+              }
+            }
+          ]
+        },
+        "sku": {
+          "name": "Basic",
+          "capacity": 1
+        }
       }
     },
     "202": {
-      "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": "AAAAAADauqg=",
-      "properties": {
-        "publisherEmail": "apim@autorestsdk.com",
-        "publisherName": "autorestsdk",
-        "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
-        "provisioningState": "Succeeded",
-        "targetProvisioningState": "",
-        "createdAtUtc": "2018-02-19T16:42:47.362368Z",
-        "gatewayUrl": "https://apimService1.azure-api.net",
-        "gatewayRegionalUrl": "https://apimService1-centralus-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.69.153.91"
-        ],
-        "virtualNetworkType": "None",
-        "certificates": [
-          {
-            "storeName": "CertificateAuthority",
-            "certificate": {
-              "expiry": "2035-12-31T23:00:00-08:00",
-              "thumbprint": "8E989652XXXXXXXXXXXXXXXDB3A2",
-              "subject": "CN=*.msitesting.net"
-            }
-          }
-        ]
-      },
-      "sku": {
-        "name": "Basic",
-        "capacity": 1
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/bXVsdGlob3N0bmFtZW11bHRpcmVnaW9uc2VydmljZV9BY3RfZjFiOTZhMjc=?api-version=2019-01-01"
       }
     }
   }
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi2dot0.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi2dot0.json
index 57f8060db9bc..aa2fd38e9b26 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi2dot0.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi2dot0.json
@@ -11,7 +11,11 @@
     "responses": {
         "200": {
             "body": {
-                "link": "https://apimgmtstaobxxxxxxx.blob.core.windows.net/api-export/Echo API.json?sv=2015-07-08&sr=b&sig=xxxxxxxxxx%3D&se=2017-09-08T21:54:08Z&sp=r"
+                "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/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi3dot0.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi3dot0.json
new file mode 100644
index 000000000000..df7e4bff9b87
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi3dot0.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-01-01",
+    "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"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementHeadNotificationRecipientEmail.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementHeadNotificationRecipientEmail.json
index e96bf39d4f9a..34f8e99d4afc 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementHeadNotificationRecipientEmail.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementHeadNotificationRecipientEmail.json
@@ -8,6 +8,7 @@
         "email": "contoso@live.com"
     },
     "responses": {
-        "204": {}
+        "204": {},
+        "404": {}
     }
 }
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementHeadNotificationRecipientUser.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementHeadNotificationRecipientUser.json
index b8085f0d80e1..1116401b7c05 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementHeadNotificationRecipientUser.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementHeadNotificationRecipientUser.json
@@ -8,6 +8,7 @@
         "userId": "576823d0a40f7e74ec07d642"
     },
     "responses": {
-        "204": {}
+        "204": {},
+        "404": {}
     }
 }
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationDeploy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationDeploy.json
index d9a23e8d5add..4e740e1606df 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationDeploy.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationDeploy.json
@@ -1,31 +1,33 @@
 {
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-01-01",
+    "subscriptionId": "subid",
+    "configurationName": "configuration",
     "parameters": {
-        "serviceName": "apimService1",
-        "resourceGroupName": "rg1",
-        "api-version": "2019-01-01",
-        "subscriptionId": "subid",
-        "configurationName": "configuration",
-        "parameters": {
-            "branch": "master"
-        }
+      "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=2019-01-01"
+      }
     },
-    "responses": {
-        "202": {
-            "headers": {
-                "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/5a1af4ae2a6d2e0b688d7517?api-version=2019-01-01"
-            }
-        },
-        "200": {
-            "body": {
-                "id": "5a1af4ae2a6d2e0b688d7517",
-                "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'"
-                }
-            }
+    "200": {
+      "body": {
+        "id": "5a1af4ae2a6d2e0b688d7517",
+        "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'"
         }
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationSave.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationSave.json
index 9d3f2d9908cf..62123008550d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationSave.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationSave.json
@@ -1,29 +1,32 @@
 {
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-01-01",
+    "subscriptionId": "subid",
+    "configurationName": "configuration",
     "parameters": {
-        "serviceName": "apimService1",
-        "resourceGroupName": "rg1",
-        "api-version": "2019-01-01",
-        "subscriptionId": "subid",
-        "configurationName": "configuration",
-        "parameters": {
-            "branch": "master"
-        }
+      "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=2019-01-01"
+      }
     },
-    "responses": {
-        "202": {
-            "headers": {
-                "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/5a1af57d2a6d2e0b688d751b?api-version=2019-01-01"
-            }
-        },
-        "200": {
-            "body": {
-                "id": "5a1af57d2a6d2e0b688d751b",
-                "status": "Succeeded",
-                "started": "2017-11-26T17:10:21.957Z",
-                "updated": "2017-11-26T17:10:36.06Z",
-                "resultInfo": "The configuration was successfully saved to master as commit cdb6878db80159cc0e9a53f5ad38581883882974.",
-                "actionLog": []
-            }
-        }
+    "200": {
+      "body": {
+        "id": "5cae98acb597440f487b0d78",
+        "status": "Succeeded",
+        "started": "2019-04-11T01:30:20.883Z",
+        "updated": "2019-04-11T01:30:41.623Z",
+        "resultInfo": "The configuration was successfully saved to master as commit 709678560f72e689e469cf98ba9ba6d1b7736893.",
+        "error": null,
+        "actionLog": []
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationValidate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationValidate.json
index 3bacbe328181..968d21638945 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationValidate.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementTenantConfigurationValidate.json
@@ -1,170 +1,172 @@
 {
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-01-01",
+    "subscriptionId": "subid",
+    "configurationName": "configuration",
     "parameters": {
-        "serviceName": "apimService1",
-        "resourceGroupName": "rg1",
-        "api-version": "2019-01-01",
-        "subscriptionId": "subid",
-        "configurationName": "configuration",
-        "parameters": {
-            "branch": "master"
-        }
+      "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=2019-01-01"
+      }
     },
-    "responses": {
-        "202": {
-            "headers": {
-                "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/5a1af64e2a6d2e0b688d751e?api-version=2019-01-01"
-            }
-        },
-        "200": {
-            "body": {
-                "id": "5a1af64e2a6d2e0b688d751e",
-                "status": "Succeeded",
-                "started": "2017-11-26T17:13:50.787Z",
-                "updated": "2017-11-26T17:13:59.723Z",
-                "resultInfo": "Validation is successfull",
-                "actionLog": [
-                    {
-                        "objectType": "ApiSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57914cb351f68a16889be190;rev=1"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "5768181ea40f7eb6c49f6ac7"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "576819c9a40f7e86289fb3e3"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "576819f1a40f7e86289fb6de"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681a67a40f7e72b4132522"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681a73a40f7e72b413281d"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681a7ea40f7e72b4132b18"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681b88a40f7ea0f017f099"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681b9fa40f7ea0f017f682"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681bb5a40f7ea0f017fc6b"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681bcaa40f7ea0f0180254"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681bdfa40f7ea0f018083d"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681bf5a40f7ea0f0180e26"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681c0ea40f7ea0f018140f"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681c26a40f7ea0f01819f8"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681c83a40f7e85f44db237"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681cb2a40f7e85f44dbcd0"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681ce3a40f7e85f44dc769"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681d1fa40f7e85f44dd202"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681d60a40f7e85f44ddc9b"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681db4a40f7e85f44de735"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681e11a40f7e85f44df1ce"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681e73a40f7e85f44dfc67"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "57681f06a40f7e74ec07785c"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "5768211fa40f7e74ec07a74a"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "576823cfa40f7e74ec07d63a"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "5600b57e7e8880006a060001"
-                    },
-                    {
-                        "objectType": "ProductSpecificationContract",
-                        "action": "Updated",
-                        "objectKey": "5600b57e7e8880006a060002"
-                    }
-                ]
-            }
-        }
+    "200": {
+      "body": {
+        "id": "5a1af64e2a6d2e0b688d751e",
+        "status": "Succeeded",
+        "started": "2019-04-11T01:30:51.767Z",
+        "updated": "2019-04-11T01:30:57.653Z",
+        "resultInfo": "Validation is successfull",
+        "actionLog": [
+          {
+            "objectType": "ApiSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57914cb351f68a16889be190;rev=1"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "5768181ea40f7eb6c49f6ac7"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "576819c9a40f7e86289fb3e3"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "576819f1a40f7e86289fb6de"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681a67a40f7e72b4132522"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681a73a40f7e72b413281d"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681a7ea40f7e72b4132b18"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681b88a40f7ea0f017f099"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681b9fa40f7ea0f017f682"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681bb5a40f7ea0f017fc6b"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681bcaa40f7ea0f0180254"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681bdfa40f7ea0f018083d"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681bf5a40f7ea0f0180e26"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681c0ea40f7ea0f018140f"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681c26a40f7ea0f01819f8"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681c83a40f7e85f44db237"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681cb2a40f7e85f44dbcd0"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681ce3a40f7e85f44dc769"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681d1fa40f7e85f44dd202"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681d60a40f7e85f44ddc9b"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681db4a40f7e85f44de735"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681e11a40f7e85f44df1ce"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681e73a40f7e85f44dfc67"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "57681f06a40f7e74ec07785c"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "5768211fa40f7e74ec07a74a"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "576823cfa40f7e74ec07d63a"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "5600b57e7e8880006a060001"
+          },
+          {
+            "objectType": "ProductSpecificationContract",
+            "action": "Updated",
+            "objectKey": "5600b57e7e8880006a060002"
+          }
+        ]
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementUserToken.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementUserToken.json
index b3c4e2e75739..d972e3c184bc 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementUserToken.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/examples/ApiManagementUserToken.json
@@ -4,16 +4,18 @@
     "resourceGroupName": "rg1",
     "api-version": "2019-01-01",
     "subscriptionId": "subid",
-    "userId": "57f2af53bb17172280f44057",
+    "userId": "userId1718",
     "parameters": {
-      "keyType": "primary",
-      "expiry": "2017-05-13T10:39:35Z"
+      "properties": {
+        "keyType": "primary",
+        "expiry": "2019-04-21T00:44:24.2845269Z"
+      }
     }
   },
   "responses": {
     "200": {
       "body": {
-        "value": "57f2af53bb17172280f44057&201705131039&***************************/tJVExvjA=="
+        "value": "userId1718&201904210044&9A1GR1f5WIhFvFmzQG+xxxxxxxxxxx/kBeu87DWad3tkasUXuvPL+MgzlwUHyg=="
       }
     }
   }