diff --git a/specification/cognitiveservices/data-plane/ContentModerator/readme.nodejs.md b/specification/cognitiveservices/data-plane/ContentModerator/readme.nodejs.md
index 1d5b7bc20380..f03d6f192d8b 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/readme.nodejs.md
+++ b/specification/cognitiveservices/data-plane/ContentModerator/readme.nodejs.md
@@ -8,7 +8,6 @@ nodejs:
   package-name: azure-cognitiveservices-contentmoderator
   package-version: 3.0.0
   output-folder: $(node-sdks-folder)/lib/services/contentModerator
-  override-client-name: ContentModeratorAPIClient
   azure-arm: false
   generate-license-txt: true
   generate-package-json: true
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/ContentModerator.json b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/ContentModerator.json
index 95d80a114a9e..d91f85d1aac5 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/ContentModerator.json
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/ContentModerator.json
@@ -3,7 +3,7 @@
   "info": {
     "title": "Content Moderator Client",
     "version": "1.0",
-    "description": "You use the API to scan your content as it is generated. Content Moderator then processes your content and sends the results along with relevant information either back to your systems or to the built-in review tool. You can use this information to take decisions e.g. take it down, send to human judge, etc.\r\n\r\nWhen using the API, images need to have a minimum of 128 pixels and a maximum file size of 4MB. \r\nText can be at most 1024 characters long. \r\nIf the content passed to the text API or the image API exceeds the size limits, the API will return an error code that informs about the issue.\r\n\r\nThis API is currently available in:\r\n\r\n* West US - westus.api.cognitive.microsoft.com\r\n* East US 2 - eastus2.api.cognitive.microsoft.com\r\n* West Central US - westcentralus.api.cognitive.microsoft.com\r\n* West Europe - westeurope.api.cognitive.microsoft.com\r\n* Southeast Asia - southeastasia.api.cognitive.microsoft.com ."
+    "description": "You use the API to scan your content as it is generated. Content Moderator then processes your content and sends the results along with relevant information either back to your systems or to the built-in review tool. You can use this information to take decisions e.g. take it down, send to human judge, etc.\r\n\r\nWhen using the API, images need to have a minimum of 128 pixels and a maximum file size of 4MB. \r\nText can be at most 1024 characters long. \r\nIf the content passed to the text API or the image API exceeds the size limits, the API will return an error code that informs about the issue."
   },
   "securityDefinitions": {
     "apim_key": {
@@ -18,17 +18,14 @@
     }
   ],
   "x-ms-parameterized-host": {
-    "hostTemplate": "{baseUrl}",
+    "hostTemplate": "{Endpoint}",
+    "useSchemePrefix": false,
     "parameters": [
       {
-        "$ref": "#/parameters/baseUrl"
+        "$ref": "#/parameters/Endpoint"
       }
     ]
   },
-  "basePath": "/",
-  "schemes": [
-    "https"
-  ],
   "paths": {
     "/contentmoderator/moderate/v1.0/ProcessImage/FindFaces": {
       "post": {
@@ -2916,7 +2913,9 @@
         "Metadata": {
           "description": "Image List Metadata.",
           "type": "object",
-
+          "additionalProperties": {
+            "type": "string"
+          },
           "properties": {
             "Key One": {
               "description": "Optional Key value pair to describe your list.",
@@ -2949,6 +2948,9 @@
         "Metadata": {
           "description": "Term list metadata.",
           "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
           "properties": {
             "Key One": {
               "description": "Optional Key value pair to describe your list.",
@@ -3843,34 +3845,14 @@
       "description": "The image file.",
       "x-ms-parameter-location": "method"
     },
-    "baseUrl": {
-      "name": "baseUrl",
-      "description": "Supported Azure regions for Content Moderator endpoints",
+    "Endpoint": {
+      "name": "Endpoint",
+      "description": "Supported Cognitive Services endpoints (protocol and hostname, for example: https://westus.api.cognitive.microsoft.com).",
       "x-ms-parameter-location": "client",
       "required": true,
       "type": "string",
       "in": "path",
-      "x-ms-skip-url-encoding": true,
-      "x-ms-enum": {
-        "name": "azureRegionBaseUrl",
-        "modelAsString": true
-      },
-      "enum": [
-        "westus.api.cognitive.microsoft.com",
-        "westus2.api.cognitive.microsoft.com",
-        "eastus.api.cognitive.microsoft.com",
-        "eastus2.api.cognitive.microsoft.com",
-        "westcentralus.api.cognitive.microsoft.com",
-        "southcentralus.api.cognitive.microsoft.com",
-        "westeurope.api.cognitive.microsoft.com",
-        "northeurope.api.cognitive.microsoft.com",
-        "southeastasia.api.cognitive.microsoft.com",
-        "eastasia.api.cognitive.microsoft.com",
-        "australiaeast.api.cognitive.microsoft.com",
-        "brazilsouth.api.cognitive.microsoft.com",
-        "contentmoderatortest.azure-api.net"
-      ]
+      "x-ms-skip-url-encoding": true
     }
-
   }
 } 
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddFrameResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddFrameResource.JSON
index 6b41a91630aa..b328bc6fe9e6 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddFrameResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddFrameResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "teamName": "ModeratorTeam",
     "reviewId": "201711v18ea829372b14f9e9d382621e62429a9",
     "Content-Type": "application/json",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddFrameStreamResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddFrameStreamResource.JSON
index 68ff9b0e0ff5..7259e85c2b75 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddFrameStreamResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddFrameStreamResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "teamName": "ModeratorTeam",
     "reviewId": "201711v18ea829372b14f9e9d382621e62429a9",
     "timescale": 1,
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddImageResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddImageResource.JSON
index e1c1e31f5671..de24f7438ffd 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddImageResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddImageResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003",
    
     "label": "test",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddImageStreamResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddImageStreamResource.JSON
index b486b75e01d5..4ed1ddc9f0e4 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddImageStreamResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddImageStreamResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003",
     "tag": 105,
     "label": "test",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddTermResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddTermResource.JSON
index 7a9187494fb2..e4b45ecc9dcf 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddTermResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddTermResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003",
     "term": "hell",
     "language": "eng"
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddVideoTranscriptResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddVideoTranscriptResource.JSON
index 82a5089c93e8..83097b452da5 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddVideoTranscriptResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/AddVideoTranscriptResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "teamName": "Content moderator",
     "reviewId": "201711v18ea829372b14f9e9d382621e62429a9",
     "Content-Type": "text/plain",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateImageListResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateImageListResource.JSON
index 8ecb239ebcdb..1f1afa3fb519 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateImageListResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateImageListResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "Content-Type": "application/json",
     "body": {
       "Name": "ImageList B",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateJobResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateJobResource.JSON
index 2dad02989a19..fcd8655c207e 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateJobResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateJobResource.JSON
@@ -2,7 +2,7 @@
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
     "teamName": "sonaliProdTeam",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "ContentType": "Image",
     "ContentId": "ContentID A",
     "WorkflowName": "TestWorkflow",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateReviewResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateReviewResource.JSON
index bb6ae95a63f5..c76f5c38570a 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateReviewResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateReviewResource.JSON
@@ -4,7 +4,7 @@
     "teamName": "ModeratorTeam",
     "subTeam": "SubteamA",
     "UrlContentType": "application/json",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "createReviewBody": [
       {
         "Metadata": [
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateTermListResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateTermListResource.JSON
index d2dda2e76df2..750fe2514169 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateTermListResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateTermListResource.JSON
@@ -2,7 +2,7 @@
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
     "Content-Type": "application/json",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "body": {
       "Name": "TermList B",
       "Description": "List of racy terms.",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateVideoReviewResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateVideoReviewResource.JSON
index cfc6e166ff1e..f0abcccbd493 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateVideoReviewResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/CreateVideoReviewResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "teamName": "ModeratorTeam",
     "subTeam": "SubteamA",
     "Content-Type": "application/json",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteAllImagesResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteAllImagesResource.JSON
index 4a05da8ab33e..0523f6370936 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteAllImagesResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteAllImagesResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003"
   },
   "responses": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteAllTermsResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteAllTermsResource.JSON
index 474d7a51c86f..bc911e928e2f 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteAllTermsResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteAllTermsResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "listId": "89003",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
     "language": "eng"
   },
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteImageListResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteImageListResource.JSON
index 3dfd983fdb61..bb979b44e87b 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteImageListResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteImageListResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003"
   },
   "responses": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteImageResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteImageResource.JSON
index 5baa7f4eb63f..c1c820ee360a 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteImageResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteImageResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003",
     "ImageId": "34562"
   },
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteTermListResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteTermListResource.JSON
index 4a05da8ab33e..0523f6370936 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteTermListResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteTermListResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003"
   },
   "responses": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteTermResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteTermResource.JSON
index 8027655f8bac..174795534d3e 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteTermResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DeleteTermResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003",
     "term": "hell",
     "language": "eng"
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DetectLanguageResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DetectLanguageResource.JSON
index 5bb3f1b6bd8d..7f0e8481effb 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DetectLanguageResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/DetectLanguageResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "Content-Type": "text/plain",
     "Text Content": "Is this a crap email abcdef@abcd.com, phone: 6657789887, IP: 255.255.255.255, 1 Microsoft Way, Redmond, WA 98052"
   },
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/EvaluateImageResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/EvaluateImageResource.JSON
index bca197a93e6e..15dfe73c2a62 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/EvaluateImageResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/EvaluateImageResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
   
     "Content-Type": "application/json",
     "ImageUrl": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/EvaluateImageStreamResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/EvaluateImageStreamResource.JSON
index ce32fcad5ba1..e4ce14b93ff1 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/EvaluateImageStreamResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/EvaluateImageStreamResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "CacheImage": true,
     "Content-Type": "image/jpeg",
     "ImageStream": "11111111111111111111111111111111001111111111001111111111000111110011111000111111000001111000011110000011100000001110000111000000011000000000000000000000000100000000000000000000000000000000000000000000000000001000000000000000000000000110000110001000010001100001110011111111001111111100111110011111110011111110011111111111111111111111111111"
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/FindFacesResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/FindFacesResource.JSON
index 491963284806..8b0c6550b552 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/FindFacesResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/FindFacesResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "a79e5f9eeafa4f059ac507a93e1a9ff1",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     
     "Content-Type": "application/json",
     "ImageUrl": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/FindFacesStreamResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/FindFacesStreamResource.JSON
index 3f0214f0134e..613124150366 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/FindFacesStreamResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/FindFacesStreamResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "a79e5f9eeafa4f059ac507a93e1a9ff1",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "CacheImage": true,
     "imageFileContentType": "image/jpeg",
     "ImageStream": "11111111111111111111111111111111001111111111001111111111000111110011111000111111000001111000011110000011100000001110000111000000011000000000000000000000000100000000000000000000000000000000000000000000000000001000000000000000000000000110000110001000010001100001110011111111001111111100111110011111110011111110011111111111111111111111111111"
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetAllImageIdsResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetAllImageIdsResource.JSON
index 73d010816747..8dd880798852 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetAllImageIdsResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetAllImageIdsResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003"
   },
   "responses": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetAllTermsResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetAllTermsResource.JSON
index 1002ebecd976..98f61e60ade1 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetAllTermsResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetAllTermsResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003",
     "language": "eng"
   },
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetFramesResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetFramesResource.JSON
index f7d6a949aa3b..6cd8573eabfe 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetFramesResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetFramesResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "teamName": "Content moderator",
     "reviewId": "201711v18ea829372b14f9e9d382621e62429a9"
   },
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetImageListIdDetailsResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetImageListIdDetailsResource.JSON
index 3ba0cd657f77..7a2e92beb00e 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetImageListIdDetailsResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetImageListIdDetailsResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "123",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "123"
   },
   "responses": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetImageListsResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetImageListsResource.JSON
index 3059f66858f2..bc2aaf6baf7c 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetImageListsResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetImageListsResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com"
+    "Endpoint": "{Endpoint}"
   },
   "responses": {
     "200": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetJobDetailsResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetJobDetailsResource.JSON
index ce351ab8aa12..e8b43023d04e 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetJobDetailsResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetJobDetailsResource.JSON
@@ -2,7 +2,7 @@
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
     "teamName": "ModeratorTeam",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "JobId": "201709i96f295aa5748101436064c42ddf"
   },
   "responses": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetReviewResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetReviewResource.JSON
index 7c73f3e09a87..26da39215fae 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetReviewResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetReviewResource.JSON
@@ -3,7 +3,7 @@
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
     "teamName": "ModeratorTeam",
     "reviewId": "201709i96f295aa5748101436064c42ddf",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com"
+    "Endpoint": "{Endpoint}"
   },
   "responses": {
     "200": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetTermListIdDetailsResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetTermListIdDetailsResource.JSON
index 93ff64dea0ff..9fc9f1407557 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetTermListIdDetailsResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetTermListIdDetailsResource.JSON
@@ -2,7 +2,7 @@
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
     "listId": "89003",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com"
+    "Endpoint": "{Endpoint}"
   },
   "responses": {
     "200": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetTermListsResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetTermListsResource.JSON
index 4fc0fe4c9b46..6766abe60de5 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetTermListsResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/GetTermListsResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com"
+    "Endpoint": "{Endpoint}"
   },
   "responses": {
     "200": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/MatchImageResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/MatchImageResource.JSON
index 8b77fe83b7ba..5d774d66f4fd 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/MatchImageResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/MatchImageResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "cacheimage": true,
     "Content-Type": "application/json",
     "listId": "12345",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/MatchImageStreamResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/MatchImageStreamResource.JSON
index 3e1f82a2cec6..e2a2e32d7470 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/MatchImageStreamResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/MatchImageStreamResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "cacheimage": true,
     "imageFileContentType": "image/jpeg",
     "listId": "12345",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/OCRResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/OCRResource.JSON
index 3468a3190cf1..3dfc6e547f1b 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/OCRResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/OCRResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "CacheImage": false,
     "Content-Type": "application/json",
     "language": "eng",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/OCRStreamResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/OCRStreamResource.JSON
index 3040583825f4..cae5c4fb8ce9 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/OCRStreamResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/OCRStreamResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "CacheImage": false,
     "imageFileContentType": "image/jpeg",
     "language": "eng",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/PublishVideoReviewResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/PublishVideoReviewResource.JSON
index 0da0278474e7..4410d94e6ed6 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/PublishVideoReviewResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/PublishVideoReviewResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "teamName": "Content moderator",
     "reviewId": "201711v18ea829372b14f9e9d382621e62429a9"
   },
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/RefreshImageIndexResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/RefreshImageIndexResource.JSON
index 48716f9cbae6..105838a3267d 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/RefreshImageIndexResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/RefreshImageIndexResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003"
   },
   "responses": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/RefreshTermIndexResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/RefreshTermIndexResource.JSON
index 6579a4925ea7..292cc6f4b1e1 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/RefreshTermIndexResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/RefreshTermIndexResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003",
     "language": "eng"
   },
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/ScreenTextResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/ScreenTextResource.JSON
index e0ec6b49526f..8bed521fdc4b 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/ScreenTextResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/ScreenTextResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "Content-Type": "text/plain",
     "language": "eng",
     "autocorrect": false,
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/TranscriptModerationResult.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/TranscriptModerationResult.JSON
index c00acee771bd..89e80622715b 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/TranscriptModerationResult.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/TranscriptModerationResult.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "teamName": "ModeratorTeam",
     "reviewId": "201711v627c579149ec4220bc674214d93f5fe5",
     "Content-Type": "application/json",
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/UpdateImageListResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/UpdateImageListResource.JSON
index bdf6c2e1c900..d0a93446a6bd 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/UpdateImageListResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/UpdateImageListResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "listId": "89003",
     "Content-Type": "application/json",
     "body": {
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/UpdateTermListResource.JSON b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/UpdateTermListResource.JSON
index e07eca714355..2f44863c5aa4 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/UpdateTermListResource.JSON
+++ b/specification/cognitiveservices/data-plane/ContentModerator/stable/v1.0/examples/UpdateTermListResource.JSON
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "Ocp-Apim-Subscription-Key": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
-    "baseUrl": "southeastasia.api.cognitive.microsoft.com",
+    "Endpoint": "{Endpoint}",
     "Content-Type": "application/json",
     "listId": "89003",
     "body": {