diff --git a/run b/run
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/specification/advisor/resource-manager/readme.go.md b/specification/advisor/resource-manager/readme.go.md
new file mode 100644
index 000000000000..66a3806db5ad
--- /dev/null
+++ b/specification/advisor/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: advisor
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-04
+  - tag: package-2017-03
+  - tag: package-2016-07-preview
+```
+
+### Tag: package-2017-04 and go
+
+These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-04-19/$(namespace)
+```
+
+### Tag: package-2017-03 and go
+
+These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-03-31/$(namespace)
+```
+
+### Tag: package-2016-07-preview and go
+
+These settings apply only when `--tag=package-2016-07-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-07-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2016-07-12-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/advisor/resource-manager/readme.md b/specification/advisor/resource-manager/readme.md
index 63eeaa356fa3..8657eed41d99 100644
--- a/specification/advisor/resource-manager/readme.md
+++ b/specification/advisor/resource-manager/readme.md
@@ -72,6 +72,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -104,6 +105,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-advisor
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
 
 ## C#
 
@@ -120,55 +124,6 @@ csharp:
   clear-output-folder: true
 ```
 
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: advisor
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-04
-  - tag: package-2017-03
-  - tag: package-2016-07-preview
-```
-
-### Tag: package-2017-04 and go
-
-These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04' && $(go)
-output-folder: $(go-sdk-folder)/services/advisor/mgmt/2017-04-19/advisor
-```
-
-### Tag: package-2017-03 and go
-
-These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-03' && $(go)
-output-folder: $(go-sdk-folder)/services/advisor/mgmt/2017-03-31/advisor
-```
-
-### Tag: package-2016-07-preview and go
-
-These settings apply only when `--tag=package-2016-07-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-07-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/advisor/mgmt/2016-07-12-preview/advisor
-```
-
-
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/advisor/resource-manager/readme.typescript.md b/specification/advisor/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..4347edfa5ebb
--- /dev/null
+++ b/specification/advisor/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-advisor"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-advisor"
+  generate-metadata: true
+```
diff --git a/specification/alertsmanagement/resource-manager/readme.go.md b/specification/alertsmanagement/resource-manager/readme.go.md
new file mode 100644
index 000000000000..4341e8cb6d5a
--- /dev/null
+++ b/specification/alertsmanagement/resource-manager/readme.go.md
@@ -0,0 +1,25 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: alertsmanagement
+  clear-output-folder: true
+```
+
+### Go multi-api
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-05-preview
+```
+
+### Tag: package-2018-05-preview and go
+
+These settings apply only when `--tag=package-2018-05-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-05-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-05-05-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/alertsmanagement/resource-manager/readme.md b/specification/alertsmanagement/resource-manager/readme.md
index 35e9e8fbd821..dcc1aebce0dd 100644
--- a/specification/alertsmanagement/resource-manager/readme.md
+++ b/specification/alertsmanagement/resource-manager/readme.md
@@ -1,12 +1,12 @@
 # AlertsManagement
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for AlerManagement.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for AlertManagement, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -19,7 +19,7 @@ To see additional help and options, run:
 ## Configuration
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the AlertManagement API.
 
 ``` yaml
@@ -62,7 +62,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-go
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -103,32 +103,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-alertsmanagement
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: alertsmanagement
-  clear-output-folder: true
-```
-
-### Go multi-api
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-05-preview
-```
-
-### Tag: package-2018-05-preview and go
-
-These settings apply only when `--tag=package-2018-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-05-05-preview/$(namespace)
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/analysisservices/resource-manager/readme.go.md b/specification/analysisservices/resource-manager/readme.go.md
new file mode 100644
index 000000000000..aedfd776f799
--- /dev/null
+++ b/specification/analysisservices/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: analysisservices
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-08
+  - tag: package-2017-07
+  - tag: package-2016-05
+```
+
+### Tag: package-2017-08 and go
+
+These settings apply only when `--tag=package-2017-08 --go` is specifined on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-08' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-08-01/$(namespace)
+```
+
+### Tag: package-2017-07 and go
+
+These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-07' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-07-14/$(namespace)
+```
+
+### Tag: package-2016-05 and go
+
+These settings apply only when `--tag=package-2016-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-05' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-05-16/$(namespace)
+```
diff --git a/specification/analysisservices/resource-manager/readme.md b/specification/analysisservices/resource-manager/readme.md
index 5e96e69f552b..236ceadc1aa3 100644
--- a/specification/analysisservices/resource-manager/readme.md
+++ b/specification/analysisservices/resource-manager/readme.md
@@ -78,6 +78,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -99,139 +100,84 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
+See configuration in [readme.go.md](./readme.go.md)
 
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: analysisservices
-  clear-output-folder: true
+## Java
+
+These settings apply only when `--java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
+
+``` yaml $(java)
+azure-arm: true
+fluent: true
+namespace: com.microsoft.azure.management.analysisservices
+license-header: MICROSOFT_MIT_NO_CODEGEN
+payload-flattening-threshold: 1
+output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-analysisservices
 ```
 
-### Go multi-api
+### Java multi-api
 
-``` yaml $(go) && $(multiapi)
+``` yaml $(java) && $(multiapi)
 batch:
+  - tag: package-2016-05
+  - tag: package-2017-07
   - tag: package-2017-08
   - tag: package-2017-08-beta
-  - tag: package-2017-07
-  - tag: package-2016-05
 ```
 
-### Tag: package-2017-08 and go
+### Tag: package-2016-05 and java
 
-These settings apply only when `--tag=package-2017-08 --go` is specifined on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2016-05 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2017-08' && $(go)
-output-folder: $(go-sdk-folder)/services/analysisservices/mgmt/2017-08-01/analysisservices
+``` yaml $(tag) == 'package-2016-05' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.analysisservices.v2016_05_16
+  output-folder: $(azure-libraries-for-java-folder)/analysisservices/resource-manager/v2016_05_16
+regenerate-manager: true
+generate-interface: true
 ```
 
-### Tag: package-2017-08-beta and go
+### Tag: package-2017-07 and java
 
-These settings apply only when `--tag=package-2017-08-beta --go` is specifined on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2017-07 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2017-08-beta' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/analysisservices/preview/mgmt/2017-08-01-beta/analysisservices
+``` yaml $(tag) == 'package-2017-07' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.analysisservices.v2017_07_14
+  output-folder: $(azure-libraries-for-java-folder)/analysisservices/resource-manager/v2017_07_14
+regenerate-manager: true
+generate-interface: true
 ```
 
-### Tag: package-2017-07 and go
+### Tag: package-2017-08 and java
 
-These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2017-08 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2017-07' && $(go)
-output-folder: $(go-sdk-folder)/services/analysisservices/mgmt/2017-07-14/analysisservices
+``` yaml $(tag) == 'package-2017-08' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.analysisservices.v2017_08_01
+  output-folder: $(azure-libraries-for-java-folder)/analysisservices/resource-manager/v2017_08_01
+regenerate-manager: true
+generate-interface: true
 ```
 
-### Tag: package-2016-05 and go
+### Tag: package-2017-08-beta and java
 
-These settings apply only when `--tag=package-2016-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2017-08-beta --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2016-05' && $(go)
-output-folder: $(go-sdk-folder)/services/analysisservices/mgmt/2016-05-16/analysisservices
+``` yaml $(tag) == 'package-2017-08-beta' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.analysisservices.v2017_08_01_beta
+  output-folder: $(azure-libraries-for-java-folder)/analysisservices/resource-manager/v2017_08_01_beta
+regenerate-manager: true
+generate-interface: true
 ```
 
 
-## Java
-
-These settings apply only when `--java` is specified on the command line.
-Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
-
-``` yaml $(java)
-azure-arm: true
-fluent: true
-namespace: com.microsoft.azure.management.analysisservices
-license-header: MICROSOFT_MIT_NO_CODEGEN
-payload-flattening-threshold: 1
-output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-analysisservices
-```
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-2016-05
-  - tag: package-2017-07
-  - tag: package-2017-08
-  - tag: package-2017-08-beta
-```
-
-### Tag: package-2016-05 and java
-
-These settings apply only when `--tag=package-2016-05 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2016-05' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.analysisservices.v2016_05_16
-  output-folder: $(azure-libraries-for-java-folder)/analysisservices/resource-manager/v2016_05_16
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-2017-07 and java
-
-These settings apply only when `--tag=package-2017-07 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2017-07' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.analysisservices.v2017_07_14
-  output-folder: $(azure-libraries-for-java-folder)/analysisservices/resource-manager/v2017_07_14
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-2017-08 and java
-
-These settings apply only when `--tag=package-2017-08 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2017-08' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.analysisservices.v2017_08_01
-  output-folder: $(azure-libraries-for-java-folder)/analysisservices/resource-manager/v2017_08_01
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-2017-08-beta and java
-
-These settings apply only when `--tag=package-2017-08-beta --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2017-08-beta' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.analysisservices.v2017_08_01_beta
-  output-folder: $(azure-libraries-for-java-folder)/analysisservices/resource-manager/v2017_08_01_beta
-regenerate-manager: true
-generate-interface: true
-```
-
-
diff --git a/specification/analysisservices/resource-manager/readme.typescript.md b/specification/analysisservices/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..c87e05f32327
--- /dev/null
+++ b/specification/analysisservices/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-analysisservices"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-analysisservices"
+  generate-metadata: true
+```
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimapis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimapis.json
index c5074d3c172a..bdedca08bd5a 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimapis.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimapis.json
@@ -233,6 +233,9 @@
           },
           "ApiManagementCreateApiRevision": {
             "$ref": "./examples/ApiManagementCreateApiRevision.json"
+          },
+          "ApiManagementCreateApiWithOpenIdConnect": {
+            "$ref": "./examples/ApiManagementCreateApiWithOpenIdConnect.json"
           }
         },
         "consumes": [
@@ -3740,7 +3743,7 @@
               {
                 "value": "soap",
                 "description": "Imports the Soap API having a SOAP front end.",
-                "name": "SoapPassThrough"                
+                "name": "SoapPassThrough"
               }
             ]
           }
@@ -3905,7 +3908,7 @@
         },
         "apiRevisionDescription": {
           "type": "string",
-          "description": "Description of the Api Revision.",          
+          "description": "Description of the Api Revision.",
           "maxLength": 256
         },
         "apiVersionDescription": {
@@ -4104,6 +4107,14 @@
         "oAuth2": {
           "$ref": "#/definitions/OAuth2AuthenticationSettingsContract",
           "description": "OAuth2 Authentication settings"
+        },
+        "openid": {
+          "$ref": "#/definitions/OpenIdAuthenticationSettingsContract",
+          "description": "OpenID Connect Authentication Settings"
+        },
+        "subscriptionKeyRequired": {
+          "type": "boolean",
+          "description": "Specifies whether subscription key is required during call to this API, true - API is included into closed products only, false - API is included into open products alone, null - there is a mix of products."
         }
       },
       "description": "API Authentication Settings."
@@ -4121,6 +4132,44 @@
       },
       "description": "API OAuth2 Authentication settings details."
     },
+    "OpenIdAuthenticationSettingsContract": {
+      "properties": {
+        "openidProviderId": {
+          "type": "string",
+          "description": "OAuth authorization server identifier."
+        },
+        "bearerTokenSendingMethods": {
+          "description": "How to send token to the server.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BearerTokenSendingMethodsContract"
+          }
+        }
+      },
+      "description": "API OAuth2 Authentication settings details."
+    },
+    "BearerTokenSendingMethodsContract": {
+      "type": "string",
+      "description": "Form of an authorization grant, which the client uses to request the access token.",
+      "enum": [
+        "authorizationHeader",
+        "query"
+      ],
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "bearerTokenSendingMethods",
+        "values": [
+          {
+            "value": "authorizationHeader",
+            "description": "Access token will be transmitted in the Authorization header using Bearer schema"
+          },
+          {
+            "value": "query",
+            "description": "Access token will be transmitted as query parameters."
+          }
+        ]
+      }
+    },
     "OperationCollection": {
       "properties": {
         "value": {
@@ -4511,7 +4560,7 @@
           "description": "Text describing the issue."
         },
         "createdDate": {
-          "type":"string",
+          "type": "string",
           "format": "date-time",
           "description": "Date and time when the issue was created."
         },
@@ -4608,7 +4657,7 @@
           "description": "Comment text."
         },
         "createdDate": {
-          "type":"string",
+          "type": "string",
           "format": "date-time",
           "description": "Date and time when the comment was created."
         },
@@ -4663,7 +4712,7 @@
           "description": "Filename by which the binary data will be saved."
         },
         "contentFormat": {
-          "type":"string",
+          "type": "string",
           "description": "Either 'link' if content is provided via an HTTP link or the MIME type of the Base64-encoded binary data provided in the 'content' property."
         },
         "content": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/examples/ApiManagementCreateApiWithOpenIdConnect.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/examples/ApiManagementCreateApiWithOpenIdConnect.json
new file mode 100644
index 000000000000..2e18b4aa455a
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/examples/ApiManagementCreateApiWithOpenIdConnect.json
@@ -0,0 +1,94 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2018-01-01",
+    "subscriptionId": "subid",
+    "apiId": "tempgroup",
+    "parameters": {
+      "properties": {
+        "displayName": "Swagger Petstore",
+        "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+        "serviceUrl": "http://petstore.swagger.io/v2",
+        "path": "petstore",
+        "protocols": [
+          "https"
+        ],
+        "authenticationSettings": {
+          "openid": {
+            "openidProviderId": "testopenid",
+            "bearerTokenSendingMethods": [
+              "authorizationHeader"
+            ]
+          }
+        },
+        "subscriptionKeyParameterNames": {
+          "header": "Ocp-Apim-Subscription-Key",
+          "query": "subscription-key"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/58da4c4ccdae970a08121230",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "58da4c4ccdae970a08121230",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+          "serviceUrl": "http://petstore.swagger.io/v2",
+          "path": "petstore",
+          "protocols": [
+            "https"
+          ],
+          "authenticationSettings": {
+            "openid": {
+              "openidProviderId": "testopenid",
+              "bearerTokenSendingMethods": [
+                "authorizationHeader"
+              ]
+            }
+          },
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/58da4c4ccdae970a08121230",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "58da4c4ccdae970a08121230",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+          "serviceUrl": "http://petstore.swagger.io/v2",
+          "path": "petstore",
+          "protocols": [
+            "https"
+          ],
+          "authenticationSettings": {
+            "openid": {
+              "openidProviderId": "testopenid",
+              "bearerTokenSendingMethods": [
+                "authorizationHeader"
+              ]
+            }
+          },
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/apimapis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/apimapis.json
index a82ad9455ebe..89326eeb3b1f 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/apimapis.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/apimapis.json
@@ -233,6 +233,9 @@
           },
           "ApiManagementCreateApiRevision": {
             "$ref": "./examples/ApiManagementCreateApiRevision.json"
+          },
+          "ApiManagementCreateApiWithOpenIdConnect": {
+            "$ref": "./examples/ApiManagementCreateApiWithOpenIdConnect.json"
           }
         },
         "consumes": [
@@ -3528,7 +3531,7 @@
               {
                 "value": "soap",
                 "description": "Imports the Soap API having a SOAP front end.",
-                "name": "SoapPassThrough"                
+                "name": "SoapPassThrough"
               }
             ]
           }
@@ -3896,6 +3899,14 @@
         "oAuth2": {
           "$ref": "#/definitions/OAuth2AuthenticationSettingsContract",
           "description": "OAuth2 Authentication settings"
+        },
+        "openid": {
+          "$ref": "#/definitions/OpenIdAuthenticationSettingsContract",
+          "description": "OpenID Connect Authentication Settings"
+        },
+        "subscriptionKeyRequired": {
+          "type": "boolean",
+          "description": "Specifies whether subscription key is required during call to this API, true - API is included into closed products only, false - API is included into open products alone, null - there is a mix of products."
         }
       },
       "description": "API Authentication Settings."
@@ -3913,6 +3924,44 @@
       },
       "description": "API OAuth2 Authentication settings details."
     },
+    "OpenIdAuthenticationSettingsContract": {
+      "properties": {
+        "openidProviderId": {
+          "type": "string",
+          "description": "OAuth authorization server identifier."
+        },
+        "bearerTokenSendingMethods": {
+          "description": "How to send token to the server.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BearerTokenSendingMethodsContract"
+          }
+        }
+      },
+      "description": "API OAuth2 Authentication settings details."
+    },
+    "BearerTokenSendingMethodsContract": {
+      "type": "string",
+      "description": "Form of an authorization grant, which the client uses to request the access token.",
+      "enum": [
+        "authorizationHeader",
+        "query"
+      ],
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "bearerTokenSendingMethods",
+        "values": [
+          {
+            "value": "authorizationHeader",
+            "description": "Access token will be transmitted in the Authorization header using Bearer schema"
+          },
+          {
+            "value": "query",
+            "description": "Access token will be transmitted as query parameters."
+          }
+        ]
+      }
+    },
     "OperationCollection": {
       "properties": {
         "value": {
@@ -4303,7 +4352,7 @@
           "description": "Text describing the issue."
         },
         "createdDate": {
-          "type":"string",
+          "type": "string",
           "format": "date-time",
           "description": "Date and time when the issue was created."
         },
@@ -4400,7 +4449,7 @@
           "description": "Comment text."
         },
         "createdDate": {
-          "type":"string",
+          "type": "string",
           "format": "date-time",
           "description": "Date and time when the comment was created."
         },
@@ -4455,7 +4504,7 @@
           "description": "Filename by which the binary data will be saved."
         },
         "contentFormat": {
-          "type":"string",
+          "type": "string",
           "description": "Either 'link' if content is provided via an HTTP link or the MIME type of the Base64-encoded binary data provided in the 'content' property."
         },
         "content": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateApiWithOpenIdConnect.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateApiWithOpenIdConnect.json
new file mode 100644
index 000000000000..5ac2af2116a4
--- /dev/null
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/examples/ApiManagementCreateApiWithOpenIdConnect.json
@@ -0,0 +1,94 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2018-06-01-preview",
+    "subscriptionId": "subid",
+    "apiId": "tempgroup",
+    "parameters": {
+      "properties": {
+        "displayName": "Swagger Petstore",
+        "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+        "serviceUrl": "http://petstore.swagger.io/v2",
+        "path": "petstore",
+        "protocols": [
+          "https"
+        ],
+        "authenticationSettings": {
+          "openid": {
+            "openidProviderId": "testopenid",
+            "bearerTokenSendingMethods": [
+              "authorizationHeader"
+            ]
+          }
+        },
+        "subscriptionKeyParameterNames": {
+          "header": "Ocp-Apim-Subscription-Key",
+          "query": "subscription-key"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/58da4c4ccdae970a08121230",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "58da4c4ccdae970a08121230",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+          "serviceUrl": "http://petstore.swagger.io/v2",
+          "path": "petstore",
+          "protocols": [
+            "https"
+          ],
+          "authenticationSettings": {
+            "openid": {
+              "openidProviderId": "testopenid",
+              "bearerTokenSendingMethods": [
+                "authorizationHeader"
+              ]
+            }
+          },
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/58da4c4ccdae970a08121230",
+        "type": "Microsoft.ApiManagement/service/apis",
+        "name": "58da4c4ccdae970a08121230",
+        "properties": {
+          "displayName": "Swagger Petstore",
+          "apiRevision": "1",
+          "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+          "serviceUrl": "http://petstore.swagger.io/v2",
+          "path": "petstore",
+          "protocols": [
+            "https"
+          ],
+          "authenticationSettings": {
+            "openid": {
+              "openidProviderId": "testopenid",
+              "bearerTokenSendingMethods": [
+                "authorizationHeader"
+              ]
+            }
+          },
+          "subscriptionKeyParameterNames": {
+            "header": "Ocp-Apim-Subscription-Key",
+            "query": "subscription-key"
+          },
+          "isCurrent": true
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/readme.go.md b/specification/apimanagement/resource-manager/readme.go.md
new file mode 100644
index 000000000000..d569b68cb750
--- /dev/null
+++ b/specification/apimanagement/resource-manager/readme.go.md
@@ -0,0 +1,66 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: apimanagement
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-06-preview
+  - tag: package-2018-01
+  - tag: package-2017-03
+  - tag: package-2016-10
+  - tag: package-2016-07
+```
+
+### Tag: package-2018-06-preview and go
+
+These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-06-01-preview/$(namespace)
+```
+
+### Tag: package-2018-01 and go
+
+These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-01-01/$(namespace)
+```
+
+### Tag: package-2017-03 and go
+
+These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-03-01/$(namespace)
+```
+
+### Tag: package-2016-10 and go
+
+These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-10' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-10-10/$(namespace)
+```
+
+### Tag: package-2016-07 and go
+
+These settings apply only when `--tag=package-2016-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-07' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-07-07/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/apimanagement/resource-manager/readme.md b/specification/apimanagement/resource-manager/readme.md
index 57b1649bb26d..9ac8d31299df 100644
--- a/specification/apimanagement/resource-manager/readme.md
+++ b/specification/apimanagement/resource-manager/readme.md
@@ -202,6 +202,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
     autorest_options:
       use: "@microsoft.azure/autorest.python@~3.0"
@@ -231,71 +232,7 @@ See configuration in [readme.python.md](./readme.python.md)
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: apimanagement
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-06-preview
-  - tag: package-2018-01
-  - tag: package-2017-03
-  - tag: package-2016-10
-  - tag: package-2016-07
-```
-
-### Tag: package-2018-06-preview and go
-
-These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/apimanagement/mgmt/2018-06-01-preview/apimanagement
-```
-
-### Tag: package-2018-01 and go
-
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/apimanagement/mgmt/2018-01-01/apimanagement
-```
-
-### Tag: package-2017-03 and go
-
-These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-03' && $(go)
-output-folder: $(go-sdk-folder)/services/apimanagement/mgmt/2017-03-01/apimanagement
-```
-
-### Tag: package-2016-10 and go
-
-These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-10' && $(go)
-output-folder: $(go-sdk-folder)/services/apimanagement/mgmt/2016-10-10/apimanagement
-```
-
-### Tag: package-2016-07 and go
-
-These settings apply only when `--tag=package-2016-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-07' && $(go)
-output-folder: $(go-sdk-folder)/services/apimanagement/mgmt/2016-07-07/apimanagement
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/apimanagement/resource-manager/readme.typescript.md b/specification/apimanagement/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..eb7303dc7bac
--- /dev/null
+++ b/specification/apimanagement/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-apimanagement"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-apimanagement"
+  generate-metadata: true
+```
diff --git a/specification/applicationinsights/data-plane/readme.go.md b/specification/applicationinsights/data-plane/readme.go.md
new file mode 100644
index 000000000000..618a78d847fa
--- /dev/null
+++ b/specification/applicationinsights/data-plane/readme.go.md
@@ -0,0 +1,39 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: insights
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: v1
+```
+
+### Tag: v1 and go
+
+These settings apply only when `--tag=v1 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'v1' && $(go)
+output-folder: $(go-sdk-folder)/services/appinsights/v1/$(namespace)
+```
+
+``` yaml $(typescript)
+typescript:
+  package-name: azure-applicationinsights-query
+  package-version: 1.0.0-Preview-1
+  output-folder: $(node-sdks-folder)/lib/services/applicationinsightsQuery/lib
+  generate-metadata: true
+  azure-arm: true
+  add-credentials: true
+directive:
+  - from: swagger-document
+    where: $.definitions.table.properties.rows.items.items
+    transform: $.type = "object"
+```
\ No newline at end of file
diff --git a/specification/applicationinsights/data-plane/readme.md b/specification/applicationinsights/data-plane/readme.md
index 16eae313e7c3..aa0e29fe91f6 100644
--- a/specification/applicationinsights/data-plane/readme.md
+++ b/specification/applicationinsights/data-plane/readme.md
@@ -1,5 +1,5 @@
 # ApplicationInsights
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for ApplicationInsightsDataPlane.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for ApplicationInsightsDataPlane.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for ApplicationInsightsDataPlane, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -19,7 +19,7 @@ To see additional help and options, run:
 
 ## Configuration
 
-### Basic Information 
+### Basic Information
 
 These are the global settings for the ApplicationInsights API.
 
@@ -67,9 +67,12 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -107,46 +110,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-applicationinsights
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: insights
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: v1
-```
-
-### Tag: v1 and go
-
-These settings apply only when `--tag=v1 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'v1' && $(go)
-output-folder: $(go-sdk-folder)/services/appinsights/v1/insights
-```
-
-``` yaml $(typescript)
-typescript:
-  package-name: azure-applicationinsights-query
-  package-version: 1.0.0-Preview-1
-  output-folder: $(node-sdks-folder)/lib/services/applicationinsightsQuery/lib
-  generate-metadata: true
-  azure-arm: true
-  add-credentials: true
-directive:
-  - from: swagger-document
-    where: $.definitions.table.properties.rows.items.items
-    transform: $.type = "object"
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/applicationinsights/data-plane/readme.typescript.md b/specification/applicationinsights/data-plane/readme.typescript.md
new file mode 100644
index 000000000000..fdc157eca9d2
--- /dev/null
+++ b/specification/applicationinsights/data-plane/readme.typescript.md
@@ -0,0 +1,14 @@
+
+## TypeScriptJS
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to the root directory of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+directive:
+  - reason: Remove Events_GetOdataMetadata from Node SDK due to XML issues.
+    remove-operation: Events_GetOdataMetadata
+typescript:
+  package-name: "@azure/arm-applicationinsights-query"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-applicationinsights-query"
+  generate-metadata: true
+```
\ No newline at end of file
diff --git a/specification/applicationinsights/resource-manager/readme.go.md b/specification/applicationinsights/resource-manager/readme.go.md
new file mode 100644
index 000000000000..d3b2a8df018a
--- /dev/null
+++ b/specification/applicationinsights/resource-manager/readme.go.md
@@ -0,0 +1,47 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: insights
+  clear-output-folder: true
+```
+
+### Go mult-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-05
+```
+
+### Tag: package-2015-05 and go
+
+These settings apply only when `--tag=package-2015-05 --go` is specified on he command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-05' && $(go)
+output-folder: $(go-sdk-folder)/services/appinsights/mgmt/2015-05-01/$(namespace)
+```
+
+### Tag: schema-2015-05-preview
+
+These settings apply only when `--tag=schema-2015-05-01` is specified on the
+command line.
+
+This section contains the input swagger files that are used when generating
+resource manager schemas for version 2015-05-01. Note that many of our
+pre-existing APIs are note currently compatible with ARM schemas, upon any
+updates applied to our services we will bring them up to compliance.
+
+``` yaml $(tag) == 'schema-2015-05-01'
+input-file:
+ - ./Microsoft.Insights/stable/2015-05-01/aiOperations_API.json
+ - ./Microsoft.Insights/stable/2015-05-01/components_API.json
+ - ./Microsoft.Insights/stable/2015-05-01/webTests_API.json
+ - ./Microsoft.Insights/stable/2015-05-01/workbooks_API.json
+
+override-info:
+  title: ApplicationInsightsManagementClient
+```
diff --git a/specification/applicationinsights/resource-manager/readme.md b/specification/applicationinsights/resource-manager/readme.md
index 45c4fd90e929..8118aaee342a 100644
--- a/specification/applicationinsights/resource-manager/readme.md
+++ b/specification/applicationinsights/resource-manager/readme.md
@@ -38,7 +38,7 @@ directive:
     where:
       - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Insights/components/{resourceName}/purge"].post
     reason: Original creation of the service did not comply with current ARM schema standards. The team is aware of it and any future updates should rectify the issue.
-    
+
   - suppress: TrackedResourceListByImmediateParent
     where:
       - $.definitions
@@ -290,6 +290,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -322,6 +323,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-applicationinsights
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
 
 ## C#
 
@@ -337,53 +341,6 @@ csharp:
   output-folder: $(csharp-sdks-folder)/ApplicationInsights/Management.ApplicationInsights/Generated
   clear-output-folder: true
 ```
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: insights
-  clear-output-folder: true
-```
-
-### Go mult-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-05
-```
-
-### Tag: package-2015-05 and go
-
-These settings apply only when `--tag=package-2015-05 --go` is specified on he command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-05' && $(go)
-output-folder: $(go-sdk-folder)/services/appinsights/mgmt/2015-05-01/insights
-```
-
-### Tag: schema-2015-05-preview
-
-These settings apply only when `--tag=schema-2015-05-01` is specified on the
-command line.
-
-This section contains the input swagger files that are used when generating
-resource manager schemas for version 2015-05-01. Note that many of our
-pre-existing APIs are note currently compatible with ARM schemas, upon any
-updates applied to our services we will bring them up to compliance.
-
-``` yaml $(tag) == 'schema-2015-05-01'
-input-file:
- - ./Microsoft.Insights/stable/2015-05-01/aiOperations_API.json
- - ./Microsoft.Insights/stable/2015-05-01/components_API.json
- - ./Microsoft.Insights/stable/2015-05-01/webTests_API.json
- - ./Microsoft.Insights/stable/2015-05-01/workbooks_API.json
-
-override-info:
-  title: ApplicationInsightsManagementClient
-```
 
 ## Java
 
diff --git a/specification/applicationinsights/resource-manager/readme.typescript.md b/specification/applicationinsights/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..1d42b39e5a5f
--- /dev/null
+++ b/specification/applicationinsights/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-appinsights"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-appinsights"
+  generate-metadata: true
+```
diff --git a/specification/authorization/resource-manager/readme.go.md b/specification/authorization/resource-manager/readme.go.md
new file mode 100644
index 000000000000..d0461c583f4e
--- /dev/null
+++ b/specification/authorization/resource-manager/readme.go.md
@@ -0,0 +1,56 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: authorization
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-07
+  - tag: package-2017-10-01-preview
+  - tag: package-2018-01-01-preview
+  - tag: package-2018-09-01-preview
+```
+
+### Tag: package-2015-07 and go
+
+These settings apply only when `--tag=package-2015-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-07' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-07-01/$(namespace)
+```
+
+### Tag: package-2017-10-01-preview and go
+
+These settings apply only when `--tag=package-2017-10-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-10-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-10-01-preview/$(namespace)
+```
+
+### Tag: package-2018-01-01-preview and go
+
+These settings apply only when `--tag=package-2018-01-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-01-01-preview/$(namespace)
+```
+
+### Tag: package-2018-09-01-preview and go
+
+These settings apply only when `--tag=package-2018-09-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-09-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-09-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/authorization/resource-manager/readme.md b/specification/authorization/resource-manager/readme.md
index 277ce8ac828e..e2eaa8ba206d 100644
--- a/specification/authorization/resource-manager/readme.md
+++ b/specification/authorization/resource-manager/readme.md
@@ -162,60 +162,7 @@ swagger-to-sdk:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: authorization
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-07
-  - tag: package-2017-10-01-preview
-  - tag: package-2018-01-01-preview
-  - tag: package-2018-09-01-preview
-```
-
-### Tag: package-2015-07 and go
-
-These settings apply only when `--tag=package-2015-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-07' && $(go)
-output-folder: $(go-sdk-folder)/services/authorization/mgmt/2015-07-01/authorization
-```
-
-### Tag: package-2017-10-01-preview and go
-
-These settings apply only when `--tag=package-2017-10-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-10-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/authorization/mgmt/2017-10-01-preview/authorization
-```
-
-### Tag: package-2018-01-01-preview and go
-
-These settings apply only when `--tag=package-2018-01-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/authorization/mgmt/2018-01-01-preview/authorization
-```
-
-### Tag: package-2018-09-01-preview and go
-
-These settings apply only when `--tag=package-2018-09-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-09-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/authorization/mgmt/2018-09-01-preview/authorization
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/authorization/resource-manager/readme.typescript.md b/specification/authorization/resource-manager/readme.typescript.md
index 713cd4549746..f32a2033cfd9 100644
--- a/specification/authorization/resource-manager/readme.typescript.md
+++ b/specification/authorization/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-authorization"
-  output-folder: $(typescript-sdks-folder)/packages/arm-authorization
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-authorization"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json
index e9221ee9bcc2..1b37f1f0f922 100755
--- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json
@@ -26,6 +26,32 @@
                     "nonAzureComputerNames": [
                         "box1.contoso.com",
                         "box2.contoso.com"
+                    ],
+                    "targets":[
+                        {
+                            "azureQueries":
+                            {
+                               "scope":[
+                                "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources",
+                                "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067"
+                               ],
+                               "tagSettings":{
+                                   "tags":[
+                                       {
+                                           "tag1": ["tag1Value1", "tag1Value2", "tag1Value3"]
+                                       },
+                                       {
+                                           "tag2": ["tag2Value1", "tag2Value2", "tag2Value3"]
+                                       }
+                                   ],
+                                   "filterOperator" : "All"
+                               },
+                               "locations":[
+                                   "Japan East",
+                                   "UK South"
+                               ]
+                            }
+                        }
                     ]
                 },
                 "scheduleInfo": {
diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json
index 3c28c7d65766..590bdc9328fa 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json
@@ -448,6 +448,10 @@
             "type": "string",
             "description": "Name of Non-Azure OMS Computer."
           }
+        },
+        "targets": {
+          "description": "Group targets for the software update configuration.",
+          "$ref": "#/definitions/TargetProperties"
         }
       },
       "required": [
@@ -750,6 +754,76 @@
           "description": "ext run time of the update."
         }
       }
+    },
+    "TargetProperties": {
+      "type": "object",
+      "description": "Group specific to the update configuration.",
+      "properties": {
+        "azureQueries": {
+          "description": "List of Azure queries in the software update configuration.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/AzureQueryProperties"
+          }
+        }
+      }
+    },
+    "AzureQueryProperties": {
+      "type": "object",
+      "description": "Azure query for the update configuration.",
+      "properties": {
+        "scope": {
+          "type": "array",
+          "description": "List of Subscription or Resource Group ARM Ids.",
+          "items": {
+            "type": "string",
+            "description": "Subscription or Resource Group ARM Id."
+          }
+        },
+        "location": {
+          "type": "array",
+          "description": "List of locations to scope the query to.",
+          "items": {
+            "type": "string",
+            "description": "Location to scope the query to."
+          }
+        },
+        "tagSettings": {
+          "type": "object",
+          "description": "Tag settings for the VM.",
+          "$ref": "#/definitions/TagSettingsProperties"
+        }
+      }
+    },
+    "TagSettingsProperties": {
+      "type": "object",
+      "description": "Tag filter information for the VM.",
+      "properties": {
+        "tags": {
+          "type": "object",
+          "description": "Dictionary of tags with its list of values.",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "description": "List of tag values for a tag."
+            }
+          }
+        },
+        "filterOperator": {
+          "type": "string",
+          "description": "Filter VMs by Any or All specified tags.",
+          "enum": [
+            "All",
+            "Any"
+          ],
+          "x-ms-enum": {
+            "name": "TagOperators",
+            "modelAsString": false
+          }
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/specification/automation/resource-manager/readme.go.md b/specification/automation/resource-manager/readme.go.md
new file mode 100644
index 000000000000..6cd6f9f927b8
--- /dev/null
+++ b/specification/automation/resource-manager/readme.go.md
@@ -0,0 +1,56 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: automation
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-10
+  - tag: package-2017-05-preview
+  - tag: package-2018-01-preview
+  - tag: package-2018-06-preview
+```
+
+### Tag: package-2015-10 and go
+
+These settings apply only when `--tag=package-2015-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-10' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-10-31/$(namespace)
+```
+
+### Tag: package-2017-05-preview and go
+
+These settings apply only when `--tag=package-2017-05-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-05-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-05-15-preview/$(namespace)
+```
+
+### Tag: package-2018-01-preview and go
+
+These settings apply only when `--tag=package-2018-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-01-15-preview/$(namespace)
+```
+
+### Tag: package-2018-06-preview and go
+
+These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-06-30-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/automation/resource-manager/readme.md b/specification/automation/resource-manager/readme.md
index c4c3d846a108..e3fe750df431 100644
--- a/specification/automation/resource-manager/readme.md
+++ b/specification/automation/resource-manager/readme.md
@@ -195,6 +195,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -246,60 +247,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: automation
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-10
-  - tag: package-2017-05-preview
-  - tag: package-2018-01-preview
-  - tag: package-2018-06-preview
-```
-
-### Tag: package-2015-10 and go
-
-These settings apply only when `--tag=package-2015-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-10' && $(go)
-output-folder: $(go-sdk-folder)/services/automation/mgmt/2015-10-31/automation
-```
-
-### Tag: package-2017-05-preview and go
-
-These settings apply only when `--tag=package-2017-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/automation/mgmt/2017-05-15-preview/automation
-```
-
-### Tag: package-2018-01-preview and go
-
-These settings apply only when `--tag=package-2018-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/automation/mgmt/2018-01-preview/automation
-```
-
-### Tag: package-2018-06-preview and go
-
-These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/automation/mgmt/2018-06-preview/automation
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/automation/resource-manager/readme.typescript.md b/specification/automation/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..045e54639f04
--- /dev/null
+++ b/specification/automation/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-automation"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-automation"
+  generate-metadata: true
+```
diff --git a/specification/azurestack/resource-manager/readme.go.md b/specification/azurestack/resource-manager/readme.go.md
new file mode 100644
index 000000000000..6f8306627a08
--- /dev/null
+++ b/specification/azurestack/resource-manager/readme.go.md
@@ -0,0 +1,40 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: azurestack
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-06-01
+```
+
+### Tag: package-2017-06-01 and go
+
+These settings apply only when `--tag=package-2017-06-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-06-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-06-01/$(namespace)
+```
+
+## Python
+
+These settings apply only when `--python` is specified on the command line.
+
+``` yaml $(python)
+python:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  payload-flattening-threshold: 2
+  package-name: azure-mgmt-azurestack
+  no-namespace-folders: true
+  clear-output-folder: true
+```
\ No newline at end of file
diff --git a/specification/azurestack/resource-manager/readme.md b/specification/azurestack/resource-manager/readme.md
index a22bcb1bf82d..f06d9ffce1c4 100644
--- a/specification/azurestack/resource-manager/readme.md
+++ b/specification/azurestack/resource-manager/readme.md
@@ -73,6 +73,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -94,44 +95,7 @@ csharp:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: azurestack
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-06-01
-```
-
-### Tag: package-2017-06-01 and go
-
-These settings apply only when `--tag=package-2017-06-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-06-01' && $(go)
-output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-06-01/$(namespace)
-```
-
-## Python
-
-These settings apply only when `--python` is specified on the command line.
-
-``` yaml $(python)
-python:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  payload-flattening-threshold: 2
-  package-name: azure-mgmt-azurestack
-  no-namespace-folders: true
-  clear-output-folder: true
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/azurestack/resource-manager/readme.typescript.md b/specification/azurestack/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..17fb1f326796
--- /dev/null
+++ b/specification/azurestack/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-azurestack"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-azurestack"
+  generate-metadata: true
+```
diff --git a/specification/batch/data-plane/readme.go.md b/specification/batch/data-plane/readme.go.md
new file mode 100644
index 000000000000..8a4fd8de3a49
--- /dev/null
+++ b/specification/batch/data-plane/readme.go.md
@@ -0,0 +1,100 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: batch
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-05.5.0
+  - tag: package-2018-03.6.1
+  - tag: package-2018-08.7.0
+```
+
+### Tag: package-2018-08.7.0 and go
+
+These settings apply only when `--tag=package-2018-08.7.0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-08.7.0' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2018-08-01.7.0/$(namespace)
+```
+
+### Tag: package-2018-03.6.1 and go
+
+These settings apply only when `--tag=package-2018-03.6.1 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-03.6.1' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2018-03-01.6.1/$(namespace)
+```
+
+### Tag: package-2017-09.6.0 and go
+
+These settings apply only when `--tag=package-2017-09.6.0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-09.6.0' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2017-09-01.6.0/$(namespace)
+```
+
+### Tag: package-2017-06.5.1 and go
+
+These settings apply only when `--tag=package-2017-06.5.1 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-06.5.1' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2017-06-01.5.1/$(namespace)
+```
+
+### Tag: package-2017-05.5.0 and go
+
+These settings apply only when `--tag=package-2017-05.5.0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-05.5.0' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2017-05-01.5.0/$(namespace)
+```
+
+### Tag: package-2017-01.4.0 and go
+
+These settings apply only when `--tag=package-2017-01.4.0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-01.4.0' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2017-01-01.4.0/$(namespace)
+```
+
+### Tag: package-2016-07.3.1 and go
+
+These settings apply only when `--tag=package-2016-07.3.1 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2016-07.3.1' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2016-07-01.3.1/$(namespace)
+```
+
+### Tag: package-2016-02.3.0 and go
+
+These settings apply only when `--tag=package-2016-02.3.0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2016-02.3.0' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2016-02-01.3.0/$(namespace)
+```
+
+### Tag: package-2015-12.2.2 and go
+
+These settings apply only when `--tag=package-2017-05.5.0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-05.5.0' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2015-12-01.2.2/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/batch/data-plane/readme.md b/specification/batch/data-plane/readme.md
index 1f92c5cfa469..d4b574b3817e 100644
--- a/specification/batch/data-plane/readme.md
+++ b/specification/batch/data-plane/readme.md
@@ -230,6 +230,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -276,6 +277,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-batch
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
@@ -292,108 +297,6 @@ nodejs:
   clear-output-folder: true
 ```
 
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: batch
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-05.5.0
-  - tag: package-2018-03.6.1
-  - tag: package-2018-08.7.0
-```
-
-### Tag: package-2018-08.7.0 and go
-
-These settings apply only when `--tag=package-2018-08.7.0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-08.7.0' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2018-08-01.7.0/batch
-```
-
-### Tag: package-2018-03.6.1 and go
-
-These settings apply only when `--tag=package-2018-03.6.1 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-03.6.1' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2018-03-01.6.1/batch
-```
-
-### Tag: package-2017-09.6.0 and go
-
-These settings apply only when `--tag=package-2017-09.6.0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-09.6.0' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2017-09-01.6.0/batch
-```
-
-### Tag: package-2017-06.5.1 and go
-
-These settings apply only when `--tag=package-2017-06.5.1 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-06.5.1' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2017-06-01.5.1/batch
-```
-
-### Tag: package-2017-05.5.0 and go
-
-These settings apply only when `--tag=package-2017-05.5.0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-05.5.0' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2017-05-01.5.0/batch
-```
-
-### Tag: package-2017-01.4.0 and go
-
-These settings apply only when `--tag=package-2017-01.4.0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-01.4.0' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2017-01-01.4.0/batch
-```
-
-### Tag: package-2016-07.3.1 and go
-
-These settings apply only when `--tag=package-2016-07.3.1 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2016-07.3.1' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2016-07-01.3.1/batch
-```
-
-### Tag: package-2016-02.3.0 and go
-
-These settings apply only when `--tag=package-2016-02.3.0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2016-02.3.0' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2016-02-01.3.0/batch
-```
-
-### Tag: package-2015-12.2.2 and go
-
-These settings apply only when `--tag=package-2017-05.5.0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-05.5.0' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/2015-12-01.2.2/batch
-```
-
-
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/batch/data-plane/readme.typescript.md b/specification/batch/data-plane/readme.typescript.md
new file mode 100644
index 000000000000..1607505b5612
--- /dev/null
+++ b/specification/batch/data-plane/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/batch"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/batch"
+  payload-flattening-threshold: 1
+  generate-metadata: true
+```
\ No newline at end of file
diff --git a/specification/batch/resource-manager/readme.go.md b/specification/batch/resource-manager/readme.go.md
new file mode 100644
index 000000000000..2e388a22fd8e
--- /dev/null
+++ b/specification/batch/resource-manager/readme.go.md
@@ -0,0 +1,57 @@
+
+
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: batch
+  clear-output-folder: true
+```
+
+### Go multi-api
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-09
+  - tag: package-2017-05
+  - tag: package-2017-01
+  - tag: package-2015-12
+```
+
+### Tag: package-2017-09 and go
+
+These settings apply only when `--tag=package-2017-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-09' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-09-01/$(namespace)
+```
+
+### Tag: package-2017-05 and go
+
+These settings apply only when `--tag=package-2017-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-05' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-05-01/$(namespace)
+```
+
+### Tag: package-2017-01 and go
+
+These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-01-01/$(namespace)
+```
+
+### Tag: package-2015-12 and go
+
+These settings apply only when `--tag=package-2015-12 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-12' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-12-01/$(namespace)
+```
diff --git a/specification/batch/resource-manager/readme.md b/specification/batch/resource-manager/readme.md
index 2f4df18a329b..4a68131db865 100644
--- a/specification/batch/resource-manager/readme.md
+++ b/specification/batch/resource-manager/readme.md
@@ -140,6 +140,10 @@ csharp:
   clear-output-folder: true
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
@@ -167,64 +171,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-batch
 ```
 
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: batch
-  clear-output-folder: true
-```
-
-### Go multi-api
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-09
-  - tag: package-2017-05
-  - tag: package-2017-01
-  - tag: package-2015-12
-```
-
-### Tag: package-2017-09 and go
-
-These settings apply only when `--tag=package-2017-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-09' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/mgmt/2017-09-01/batch
-```
-
-### Tag: package-2017-05 and go
-
-These settings apply only when `--tag=package-2017-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-05' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/mgmt/2017-05-01/batch
-```
-
-### Tag: package-2017-01 and go
-
-These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-01' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/mgmt/2017-01-01/batch
-```
-
-### Tag: package-2015-12 and go
-
-These settings apply only when `--tag=package-2015-12 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-12' && $(go)
-output-folder: $(go-sdk-folder)/services/batch/mgmt/2015-12-01/batch
-```
-
-
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/batch/resource-manager/readme.typescript.md b/specification/batch/resource-manager/readme.typescript.md
index 8f5db5653f64..f3c8e77215b2 100644
--- a/specification/batch/resource-manager/readme.typescript.md
+++ b/specification/batch/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-batch"
-  output-folder: $(typescript-sdks-folder)/packages/arm-batch
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-batch"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
diff --git a/specification/batchai/resource-manager/readme.go.md b/specification/batchai/resource-manager/readme.go.md
new file mode 100644
index 000000000000..f39789d1ee1b
--- /dev/null
+++ b/specification/batchai/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: batchai
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-09-preview
+  - tag: package-2018-03
+  - tag: package-2018-05
+```
+
+### Tag: package-2017-09-preview and go
+
+These settings apply only when `--tag=package-2017-09-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-09-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-09-01-preview/$(namespace)
+```
+
+### Tag: package-2018-03 and go
+
+These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-03-01/$(namespace)
+```
+
+### Tag: package-2018-05 and go
+
+These settings apply only when `--tag=package-2018-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-05' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-05-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/batchai/resource-manager/readme.md b/specification/batchai/resource-manager/readme.md
index 16ddf36b1a0d..d53bac6a8b43 100644
--- a/specification/batchai/resource-manager/readme.md
+++ b/specification/batchai/resource-manager/readme.md
@@ -69,6 +69,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -117,50 +118,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: batchai
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-09-preview
-  - tag: package-2018-03
-  - tag: package-2018-05
-```
-
-### Tag: package-2017-09-preview and go
-
-These settings apply only when `--tag=package-2017-09-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-09-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/batchai/mgmt/2017-09-preview/batchai
-```
-
-### Tag: package-2018-03 and go
-
-These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-03' && $(go)
-output-folder: $(go-sdk-folder)/services/batchai/mgmt/2018-03-01/batchai
-```
-
-### Tag: package-2018-05 and go
-
-These settings apply only when `--tag=package-2018-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-05' && $(go)
-output-folder: $(go-sdk-folder)/services/batchai/mgmt/2018-05-01/batchai
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/batchai/resource-manager/readme.typescript.md b/specification/batchai/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..13ca86de2aa9
--- /dev/null
+++ b/specification/batchai/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-batchai"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-batchai"
+  payload-flattening-threshold: 1
+  generate-metadata: true
+```
diff --git a/specification/billing/resource-manager/readme.go.md b/specification/billing/resource-manager/readme.go.md
new file mode 100644
index 000000000000..de07176c21c7
--- /dev/null
+++ b/specification/billing/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: billing
+  clear-output-folder: true
+```
+
+### Go multi-api
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-03-preview
+  - tag: package-2017-04-preview
+  - tag: package-2017-02-preview
+```
+
+### Tag: package-2018-03-preview and go
+
+These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-03-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-03-01-preview/$(namespace)
+```
+
+### Tag: package-2017-04-preview and go
+
+These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-04-24-preview/$(namespace)
+```
+
+### Tag: package-2017-02-preview and go
+
+These settings apply only when `--tag=package-2017-02-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-02-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-02-27-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/billing/resource-manager/readme.md b/specification/billing/resource-manager/readme.md
index 06bd750d35f7..c19596101d82 100644
--- a/specification/billing/resource-manager/readme.md
+++ b/specification/billing/resource-manager/readme.md
@@ -71,6 +71,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -92,6 +93,10 @@ csharp:
   clear-output-folder: true
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
@@ -120,54 +125,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-billing
 ```
 
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: billing
-  clear-output-folder: true
-```
-
-### Go multi-api
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-03-preview
-  - tag: package-2017-04-preview
-  - tag: package-2017-02-preview
-```
-
-### Tag: package-2018-03-preview and go
-
-These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-03-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/billing/mgmt/2018-03-01-preview/billing
-```
-
-### Tag: package-2017-04-preview and go
-
-These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/billing/mgmt/2017-04-24-preview/billing
-```
-
-### Tag: package-2017-02-preview and go
-
-These settings apply only when `--tag=package-2017-02-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-02-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/billing/mgmt/2017-02-27-preview/billing
-```
-
-
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/billing/resource-manager/readme.typescript.md b/specification/billing/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..30bd7cb6ff66
--- /dev/null
+++ b/specification/billing/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-billing"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-billing"
+  payload-flattening-threshold: 1
+  generate-metadata: true
+```
diff --git a/specification/blueprint/resource-manager/readme.md b/specification/blueprint/resource-manager/readme.md
index 950bd2c2fda0..e13d9aaf0dfd 100644
--- a/specification/blueprint/resource-manager/readme.md
+++ b/specification/blueprint/resource-manager/readme.md
@@ -96,6 +96,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-blueprint
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md
index 00ca7eeb6255..d9621f5b4be9 100644
--- a/specification/botservice/resource-manager/readme.md
+++ b/specification/botservice/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # BotService
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for BotService.
@@ -41,7 +41,7 @@ regenerate-manager: true
 generate-interface: true
 ```
 
-## Getting Started 
+## Getting Started
 To build the SDK for BotService, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -55,7 +55,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the BotService API.
 
 ``` yaml
@@ -120,7 +120,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-go
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -134,6 +134,10 @@ csharp:
   clear-output-folder: true
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Python
 
 See readme.python.md file.
diff --git a/specification/cdn/resource-manager/readme.go.md b/specification/cdn/resource-manager/readme.go.md
index 10afebd50bb0..42e00ec3d462 100644
--- a/specification/cdn/resource-manager/readme.go.md
+++ b/specification/cdn/resource-manager/readme.go.md
@@ -26,7 +26,7 @@ These settings apply only when `--tag=package-2017-10 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-10' && $(go)
-output-folder: $(go-sdk-folder)/services/cdn/mgmt/2017-10-12/cdn
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-10-12/$(namespace)
 ```
 
 ### Tag: package-2017-04 and go
@@ -35,7 +35,7 @@ These settings apply only when `--tag=package-2017-04 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-04' && $(go)
-output-folder: $(go-sdk-folder)/services/cdn/mgmt/2017-04-02/cdn
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-04-02/$(namespace)
 ```
 
 ### Tag: package-2016-10 and go
@@ -44,7 +44,7 @@ These settings apply only when `--tag=package-2016-10 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-10'  && $(go)
-output-folder: $(go-sdk-folder)/services/cdn/mgmt/2016-10-02/cdn
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-10-02/$(namespace)
 ```
 
 ### Tag: package-2016-04 and go
@@ -53,7 +53,7 @@ These settings apply only when `--tag=package-2016-04 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-04' && $(go)
-output-folder: $(go-sdk-folder)/services/cdn/mgmt/2016-04-02/cdn
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-04-02/$(namespace)
 ```
 
 ### Tag: package-2015-06 and go
@@ -62,5 +62,5 @@ These settings apply only when `--tag=package-2015-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2015-06' && $(go)
-output-folder: $(go-sdk-folder)/services/cdn/mgmt/2015-06-01/cdn
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-06-01/$(namespace)
 ```
diff --git a/specification/cdn/resource-manager/readme.md b/specification/cdn/resource-manager/readme.md
index 12ec17266500..137ee3956bcb 100644
--- a/specification/cdn/resource-manager/readme.md
+++ b/specification/cdn/resource-manager/readme.md
@@ -90,6 +90,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-net
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
diff --git a/specification/cdn/resource-manager/readme.typescript.md b/specification/cdn/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..5a3b29431ba2
--- /dev/null
+++ b/specification/cdn/resource-manager/readme.typescript.md
@@ -0,0 +1,14 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to the root directory of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  payload-flattening-threshold: 2
+  package-name: "@azure/arm-cdn"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-cdn"
+  generate-metadata: true
+```
diff --git a/specification/cognitiveservices/data-plane/AutoSuggest/readme.go.md b/specification/cognitiveservices/data-plane/AutoSuggest/readme.go.md
new file mode 100644
index 000000000000..51191370d554
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/AutoSuggest/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: autosuggest
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/AutoSuggest/readme.md b/specification/cognitiveservices/data-plane/AutoSuggest/readme.md
index 1febb3331bac..fa68a292805e 100644
--- a/specification/cognitiveservices/data-plane/AutoSuggest/readme.md
+++ b/specification/cognitiveservices/data-plane/AutoSuggest/readme.md
@@ -82,31 +82,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: autosuggest
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/autosuggest
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/readme.go.md b/specification/cognitiveservices/data-plane/ComputerVision/readme.go.md
new file mode 100644
index 000000000000..1e1b74602e22
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/ComputerVision/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: computervision
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_2_0
+```
+
+### Tag: release_2_0 and go
+
+These settings apply only when `--tag=release_2_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_2_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/readme.md b/specification/cognitiveservices/data-plane/ComputerVision/readme.md
index 6a7dc3febccf..f9a000adc2fb 100644
--- a/specification/cognitiveservices/data-plane/ComputerVision/readme.md
+++ b/specification/cognitiveservices/data-plane/ComputerVision/readme.md
@@ -18,7 +18,9 @@ openapi-type: data-plane
 These settings apply only when `--tag=release_2_0` is specified on the command line.
 
 ``` yaml $(tag) == 'release_2_0'
-input-file: stable/v2.0/ComputerVision.json
+input-file: 
+  - stable/v2.0/ComputerVision.json
+  - stable/v2.0/Ocr.json
 ```
 
 ## Swagger to SDK
@@ -92,31 +94,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: computervision
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_2_0
-```
-
-### Tag: release_2_0 and go
-
-These settings apply only when `--tag=release_2_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_2_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.0/computervision
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/ComputerVision.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/ComputerVision.json
index 2931089da705..2d01aade02f9 100644
--- a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/ComputerVision.json
+++ b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/ComputerVision.json
@@ -54,8 +54,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful List Domains request": {
-            "$ref": "./examples/SuccessfulListDomainModels.json"
+          "Successful ListModels request": {
+            "$ref": "./examples/SuccessfulListModels.json"
           }
         }
       }
@@ -116,8 +116,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Analyze with Url request": {
-            "$ref": "./examples/SuccessfulAnalyzeWithUrl.json"
+          "Successful AnalyzeImage request": {
+            "$ref": "./examples/SuccessfulAnalyzeImageWithUrl.json"
           }
         }
       }
@@ -178,7 +178,7 @@
           }
         },
         "x-ms-examples": {
-          "Successful Generate Thumbnail request": {
+          "Successful GenerateThumbnail request": {
             "$ref": "./examples/SuccessfulGenerateThumbnailWithUrl.json"
           }
         }
@@ -220,8 +220,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Ocr request": {
-            "$ref": "./examples/SuccessfulOcrWithUrl.json"
+          "Successful RecognizePrintedText request": {
+            "$ref": "./examples/SuccessfulRecognizePrintedTextWithUrl.json"
           }
         }
       }
@@ -267,8 +267,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Describe request": {
-            "$ref": "./examples/SuccessfulDescribeWithUrl.json"
+          "Successful DescribeImage request": {
+            "$ref": "./examples/SuccessfulDescribeImageWithUrl.json"
           }
         }
       }
@@ -306,8 +306,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Tag request": {
-            "$ref": "./examples/SuccessfulTagWithUrl.json"
+          "Successful TagImage request": {
+            "$ref": "./examples/SuccessfulTagImageWithUrl.json"
           }
         }
       }
@@ -352,87 +352,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Domain Model analysis request": {
-            "$ref": "./examples/SuccessfulDomainModelWithUrl.json"
-          }
-        }
-      }
-    },
-    "/recognizeText": {
-      "post": {
-        "description": "Recognize Text operation. When you use the Recognize Text interface, the response contains a field called 'Operation-Location'. The 'Operation-Location' field contains the URL that you must use for your Get Recognize Text Operation Result operation.",
-        "operationId": "RecognizeText",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ImageUrl"
-          },
-          {
-            "$ref": "#/parameters/TextRecognitionMode"
-          }
-        ],
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "responses": {
-          "202": {
-            "description": "The service has accepted the request and will start processing later. It will return Accepted immediately and include an Operation-Location header. Client side should further query the operation status using the URL specified in this header. The operation ID will expire in 48 hours.",
-            "headers": {
-              "Operation-Location": {
-                "description": "URL to query for status of the operation. The operation ID will expire in 48 hours. ",
-                "type": "string"
-              }
-            }
-          },
-          "default": {
-            "description": "Error response.",
-            "schema": {
-              "$ref": "#/definitions/ComputerVisionError"
-            }
-          }
-        },
-        "x-ms-examples": {
-          "Successful Domain Model analysis request": {
-            "$ref": "./examples/SuccessfulRecognizeTextWithUrl.json"
-          }
-        }
-      }
-    },
-    "/textOperations/{operationId}": {
-      "get": {
-        "description": "This interface is used for getting text operation result. The URL to this interface should be retrieved from 'Operation-Location' field returned from Recognize Text interface.",
-        "operationId": "GetTextOperationResult",
-        "parameters": [
-          {
-            "name": "operationId",
-            "in": "path",
-            "description": "Id of the text operation returned in the response of the 'Recognize Text'",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "responses": {
-          "200": {
-            "description": "Returns the operation status.",
-            "schema": {
-              "$ref": "#/definitions/TextOperationResult"
-            }
-          },
-          "default": {
-            "description": "Error response.",
-            "schema": {
-              "$ref": "#/definitions/ComputerVisionError"
-            }
-          }
-        },
-        "x-ms-examples": {
-          "Successful Domain Model analysis request": {
-            "$ref": "./examples/SuccessfulGetTextOperationResult.json"
+          "Successful AnalyzeImageByDomain request": {
+            "$ref": "./examples/SuccessfulAnalyzeImageByDomainWithUrl.json"
           }
         }
       }
@@ -496,8 +417,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Analyze with Url request": {
-            "$ref": "./examples/SuccessfulAnalyzeWithStream.json"
+          "Successful AnalyzeImage request": {
+            "$ref": "./examples/SuccessfulAnalyzeImageWithStream.json"
           }
         }
       }
@@ -559,7 +480,7 @@
           }
         },
         "x-ms-examples": {
-          "Successful Generate Thumbnail request": {
+          "Successful GenerateThumbnail request": {
             "$ref": "./examples/SuccessfulGenerateThumbnailWithStream.json"
           }
         }
@@ -602,8 +523,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Ocr request": {
-            "$ref": "./examples/SuccessfulOcrWithStream.json"
+          "Successful RecognizePrintedText request": {
+            "$ref": "./examples/SuccessfulRecognizePrintedTextWithStream.json"
           }
         }
       }
@@ -650,8 +571,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Describe request": {
-            "$ref": "./examples/SuccessfulDescribeWithStream.json"
+          "Successful DescribeImage request": {
+            "$ref": "./examples/SuccessfulDescribeImageWithStream.json"
           }
         }
       }
@@ -690,8 +611,8 @@
           }
         },
         "x-ms-examples": {
-          "Successful Tag request": {
-            "$ref": "./examples/SuccessfulTagWithStream.json"
+          "Successful TagImage request": {
+            "$ref": "./examples/SuccessfulTagImageWithStream.json"
           }
         }
       }
@@ -737,125 +658,14 @@
           }
         },
         "x-ms-examples": {
-          "Successful Domain Model analysis request": {
-            "$ref": "./examples/SuccessfulDomainModelWithStream.json"
-          }
-        }
-      }
-    },
-    "/recognizeText?overload=stream": {
-      "post": {
-        "description": "Recognize Text operation. When you use the Recognize Text interface, the response contains a field called 'Operation-Location'. The 'Operation-Location' field contains the URL that you must use for your Get Recognize Text Operation Result operation.",
-        "operationId": "RecognizeTextInStream",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ImageStream"
-          },
-          {
-            "$ref": "#/parameters/TextRecognitionMode"
-          }
-        ],
-        "consumes": [
-          "application/octet-stream"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "responses": {
-          "202": {
-            "description": "The service has accepted the request and will start processing later.",
-            "headers": {
-              "Operation-Location": {
-                "description": "URL to query for status of the operation. The operation ID will expire in 48 hours. ",
-                "type": "string"
-              }
-            }
-          },
-          "default": {
-            "description": "Error response.",
-            "schema": {
-              "$ref": "#/definitions/ComputerVisionError"
-            }
-          }
-        },
-        "x-ms-examples": {
-          "Successful Domain Model analysis request": {
-            "$ref": "./examples/SuccessfulRecognizeTextWithStream.json"
+          "Successful AnalyzeImageByDomain request": {
+            "$ref": "./examples/SuccessfulAnalyzeImageByDomainWithStream.json"
           }
         }
       }
     }
   },
   "definitions": {
-    "TextOperationResult": {
-      "type": "object",
-      "properties": {
-        "status": {
-          "type": "string",
-          "description": "Status of the text operation.",
-          "enum": [
-            "Not Started",
-            "Running",
-            "Failed",
-            "Succeeded"
-          ],
-          "x-ms-enum": {
-            "name": "TextOperationStatusCodes",
-            "modelAsString": false
-          },
-          "x-nullable": false
-        },
-        "recognitionResult": {
-          "$ref": "#/definitions/RecognitionResult"
-        }
-      }
-    },
-    "RecognitionResult": {
-      "type": "object",
-      "properties": {
-        "lines": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Line"
-          }
-        }
-      }
-    },
-    "Line": {
-      "type": "object",
-      "properties": {
-        "boundingBox": {
-          "$ref": "#/definitions/BoundingBox"
-        },
-        "text": {
-          "type": "string"
-        },
-        "words": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Word"
-          }
-        }
-      }
-    },
-    "Word": {
-      "type": "object",
-      "properties": {
-        "boundingBox": {
-          "$ref": "#/definitions/BoundingBox"
-        },
-        "text": {
-          "type": "string"
-        }
-      }
-    },
-    "BoundingBox": {
-      "type": "array",
-      "items": {
-        "type": "integer",
-        "x-nullable": false
-      }
-    },
     "ImageAnalysis": {
       "type": "object",
       "description": "Result of AnalyzeImage operation.",
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/Ocr.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/Ocr.json
new file mode 100644
index 000000000000..cec25885d414
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/Ocr.json
@@ -0,0 +1,331 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2.0",
+    "title": "Computer Vision Client",
+    "description": "The Computer Vision API provides state-of-the-art algorithms to process images and return information. For example, it can be used to determine if an image contains mature content, or it can be used to find all the faces in an image.  It also has other features like estimating dominant and accent colors, categorizing the content of images, and describing an image with complete English sentences.  Additionally, it can also intelligently generate images thumbnails for displaying large images effectively."
+  },
+  "securityDefinitions": {
+    "apim_key": {
+      "type": "apiKey",
+      "name": "Ocp-Apim-Subscription-Key",
+      "in": "header"
+    }
+  },
+  "security": [
+    {
+      "apim_key": []
+    }
+  ],
+  "x-ms-parameterized-host": {
+    "hostTemplate": "{Endpoint}",
+    "useSchemePrefix": false,
+    "parameters": [
+      {
+        "$ref": "#/parameters/Endpoint"
+      }
+    ]
+  },
+  "host": "westcentralus.api.cognitive.microsoft.com",
+  "basePath": "/vision/v2.0",
+  "schemes": [
+    "https"
+  ],
+  "paths": {
+    "/recognizeText": {
+      "post": {
+        "description": "Recognize Text operation. When you use the Recognize Text interface, the response contains a field called 'Operation-Location'. The 'Operation-Location' field contains the URL that you must use for your Get Recognize Text Operation Result operation.",
+        "operationId": "RecognizeText",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ImageUrl"
+          },
+          {
+            "$ref": "#/parameters/TextRecognitionMode"
+          }
+        ],
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "202": {
+            "description": "The service has accepted the request and will start processing later. It will return Accepted immediately and include an Operation-Location header. Client side should further query the operation status using the URL specified in this header. The operation ID will expire in 48 hours.",
+            "headers": {
+              "Operation-Location": {
+                "description": "URL to query for status of the operation. The operation ID will expire in 48 hours. ",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response.",
+            "schema": {
+              "$ref": "#/definitions/ComputerVisionError"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Successful Domain Model analysis request": {
+            "$ref": "./examples/SuccessfulRecognizeTextWithUrl.json"
+          }
+        }
+      }
+    },
+    "/textOperations/{operationId}": {
+      "get": {
+        "description": "This interface is used for getting text operation result. The URL to this interface should be retrieved from 'Operation-Location' field returned from Recognize Text interface.",
+        "operationId": "GetTextOperationResult",
+        "parameters": [
+          {
+            "name": "operationId",
+            "in": "path",
+            "description": "Id of the text operation returned in the response of the 'Recognize Text'",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the operation status.",
+            "schema": {
+              "$ref": "#/definitions/TextOperationResult"
+            }
+          },
+          "default": {
+            "description": "Error response.",
+            "schema": {
+              "$ref": "#/definitions/ComputerVisionError"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Successful Domain Model analysis request": {
+            "$ref": "./examples/SuccessfulGetTextOperationResult.json"
+          }
+        }
+      }
+    }
+  },
+  "x-ms-paths": {
+    "/recognizeText?overload=stream": {
+      "post": {
+        "description": "Recognize Text operation. When you use the Recognize Text interface, the response contains a field called 'Operation-Location'. The 'Operation-Location' field contains the URL that you must use for your Get Recognize Text Operation Result operation.",
+        "operationId": "RecognizeTextInStream",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ImageStream"
+          },
+          {
+            "$ref": "#/parameters/TextRecognitionMode"
+          }
+        ],
+        "consumes": [
+          "application/octet-stream"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "202": {
+            "description": "The service has accepted the request and will start processing later.",
+            "headers": {
+              "Operation-Location": {
+                "description": "URL to query for status of the operation. The operation ID will expire in 48 hours. ",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response.",
+            "schema": {
+              "$ref": "#/definitions/ComputerVisionError"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Successful Domain Model analysis request": {
+            "$ref": "./examples/SuccessfulRecognizeTextWithStream.json"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "TextOperationResult": {
+      "type": "object",
+      "properties": {
+        "status": {
+          "type": "string",
+          "description": "Status of the text operation.",
+          "enum": [
+            "Not Started",
+            "Running",
+            "Failed",
+            "Succeeded"
+          ],
+          "x-ms-enum": {
+            "name": "TextOperationStatusCodes",
+            "modelAsString": false
+          },
+          "x-nullable": false
+        },
+        "recognitionResult": {
+          "$ref": "#/definitions/RecognitionResult"
+        }
+      }
+    },
+    "RecognitionResult": {
+      "type": "object",
+      "properties": {
+        "lines": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Line"
+          }
+        }
+      }
+    },
+    "Line": {
+      "type": "object",
+      "properties": {
+        "boundingBox": {
+          "$ref": "#/definitions/BoundingBox"
+        },
+        "text": {
+          "type": "string"
+        },
+        "words": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Word"
+          }
+        }
+      }
+    },
+    "Word": {
+      "type": "object",
+      "properties": {
+        "boundingBox": {
+          "$ref": "#/definitions/BoundingBox"
+        },
+        "text": {
+          "type": "string"
+        }
+      }
+    },
+    "BoundingBox": {
+      "type": "array",
+      "items": {
+        "type": "integer",
+        "x-nullable": false
+      }
+    },
+    "ComputerVisionError": {
+      "type": "object",
+      "required": [
+        "code",
+        "message"
+      ],
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "The error code.",
+          "enum": [
+            "InvalidImageUrl",
+            "InvalidImageFormat",
+            "InvalidImageSize",
+            "NotSupportedVisualFeature",
+            "NotSupportedImage",
+            "InvalidDetails",
+            "NotSupportedLanguage",
+            "BadArgument",
+            "FailedToProcess",
+            "Timeout",
+            "InternalServerError",
+            "Unspecified",
+            "StorageException"
+          ],
+          "x-ms-enum": {
+            "name": "ComputerVisionErrorCodes",
+            "modelAsString": false
+          }
+        },
+        "message": {
+          "type": "string",
+          "description": "A message explaining the error reported by the service."
+        },
+        "requestId": {
+          "type": "string",
+          "description": "A unique request identifier."
+        }
+      }
+    },
+    "ImageUrl": {
+      "type": "object",
+      "required": [
+        "url"
+      ],
+      "properties": {
+        "url": {
+          "description": "Publicly reachable URL of an image",
+          "type": "string"
+        }
+      }
+    }
+  },
+  "parameters": {
+    "TextRecognitionMode": {
+      "name": "mode",
+      "in": "query",
+      "description": "Type of text to recognize.",
+      "required": true,
+      "x-ms-parameter-location": "method",
+      "type": "string",
+      "x-ms-enum": {
+        "name": "TextRecognitionMode",
+        "modelAsString": false
+      },
+      "enum": [
+        "Handwritten",
+        "Printed"
+      ]
+    },
+    "ImageUrl": {
+      "name": "ImageUrl",
+      "in": "body",
+      "required": true,
+      "x-ms-parameter-location": "method",
+      "x-ms-client-flatten": true,
+      "description": "A JSON document with a URL pointing to the image that is to be analyzed.",
+      "schema": {
+        "$ref": "#/definitions/ImageUrl"
+      }
+    },
+    "ImageStream": {
+      "name": "Image",
+      "in": "body",
+      "required": true,
+      "x-ms-parameter-location": "method",
+      "description": "An image stream.",
+      "schema": {
+        "type": "object",
+        "format": "file"
+      }
+    },
+    "Endpoint": {
+      "name": "Endpoint",
+      "description": "Supported Cognitive Services endpoints",
+      "x-ms-parameter-location": "client",
+      "required": true,
+      "type": "string",
+      "in": "path",
+      "x-ms-skip-url-encoding": true
+    }
+  }
+}
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDomainModelWithStream.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeImageByDomainWithStream.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDomainModelWithStream.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeImageByDomainWithStream.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDomainModelWithUrl.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeImageByDomainWithUrl.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDomainModelWithUrl.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeImageByDomainWithUrl.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeWithStream.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeImageWithStream.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeWithStream.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeImageWithStream.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeWithUrl.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeImageWithUrl.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeWithUrl.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulAnalyzeImageWithUrl.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDescribeWithStream.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDescribeImageWithStream.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDescribeWithStream.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDescribeImageWithStream.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDescribeWithUrl.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDescribeImageWithUrl.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDescribeWithUrl.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulDescribeImageWithUrl.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulListDomainModels.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulListModels.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulListDomainModels.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulListModels.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulOcrWithStream.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulRecognizePrintedTextWithStream.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulOcrWithStream.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulRecognizePrintedTextWithStream.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulOcrWithUrl.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulRecognizePrintedTextWithUrl.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulOcrWithUrl.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulRecognizePrintedTextWithUrl.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulTagWithStream.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulTagImageWithStream.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulTagWithStream.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulTagImageWithStream.json
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulTagWithUrl.json b/specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulTagImageWithUrl.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulTagWithUrl.json
rename to specification/cognitiveservices/data-plane/ComputerVision/stable/v2.0/examples/SuccessfulTagImageWithUrl.json
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/readme.go.md b/specification/cognitiveservices/data-plane/ContentModerator/readme.go.md
new file mode 100644
index 000000000000..554ae9bbae68
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/ContentModerator/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: contentmoderator
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/readme.md b/specification/cognitiveservices/data-plane/ContentModerator/readme.md
index 2d531f01202b..3a88fc613123 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/readme.md
+++ b/specification/cognitiveservices/data-plane/ContentModerator/readme.md
@@ -89,31 +89,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: contentmoderator
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/contentmoderator
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/CustomImageSearch/readme.go.md b/specification/cognitiveservices/data-plane/CustomImageSearch/readme.go.md
new file mode 100644
index 000000000000..85b113782f7b
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/CustomImageSearch/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: customimagesearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/CustomImageSearch/readme.md b/specification/cognitiveservices/data-plane/CustomImageSearch/readme.md
index 0babb830e27c..4f7e162b6a46 100644
--- a/specification/cognitiveservices/data-plane/CustomImageSearch/readme.md
+++ b/specification/cognitiveservices/data-plane/CustomImageSearch/readme.md
@@ -72,33 +72,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-cognitiveservices-search-customimagesearch
 ```
 
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: customimagesearch
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/customimagesearch
-```
-
 ## Suppressions
 Suppressing errors due to API design:
 ``` yaml
@@ -107,6 +80,9 @@ directive:
     reason: _type is a polymorphic discriminator that can't be changed.
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.go.md b/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.go.md
new file mode 100644
index 000000000000..f37ddd4038bc
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: prediction
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.1/customvision/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.md b/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.md
index ba75914f85de..f3e3c623891c 100644
--- a/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.md
+++ b/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.md
@@ -48,8 +48,8 @@ swagger-to-sdk:
 
 ## CSharp Settings
 These settings apply only when `--csharp` is specified on the command line.
-``` yaml $(csharp) 
-csharp: 
+``` yaml $(csharp)
+csharp:
   sync-methods: all
   license-header: MICROSOFT_MIT_NO_VERSION
   azure-arm: false
@@ -86,31 +86,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: prediction
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.1/customvision/$(namespace)
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/CustomVision/Training/readme.go.md b/specification/cognitiveservices/data-plane/CustomVision/Training/readme.go.md
new file mode 100644
index 000000000000..3ca63efd9bfb
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/CustomVision/Training/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: training
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+  - tag: release_2_1
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.2/customvision/$(namespace)
+```
+
+### Tag: release_2_1 and go
+
+These settings apply only when `--tag=release_2_1 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_2_1' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.1/customvision/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/CustomVision/Training/readme.md b/specification/cognitiveservices/data-plane/CustomVision/Training/readme.md
index 6bd7275f0655..50ef559e634b 100644
--- a/specification/cognitiveservices/data-plane/CustomVision/Training/readme.md
+++ b/specification/cognitiveservices/data-plane/CustomVision/Training/readme.md
@@ -54,8 +54,8 @@ swagger-to-sdk:
 
 ## CSharp Settings
 These settings apply only when `--csharp` is specified on the command line.
-``` yaml $(csharp) 
-csharp: 
+``` yaml $(csharp)
+csharp:
   sync-methods: all
   license-header: MICROSOFT_MIT_NO_VERSION
   azure-arm: false
@@ -93,40 +93,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: training
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-  - tag: release_2_1
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.2/customvision/$(namespace)
-```
-
-### Tag: release_2_1 and go
-
-These settings apply only when `--tag=release_2_1 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_2_1' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.1/customvision/$(namespace)
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/CustomWebSearch/readme.go.md b/specification/cognitiveservices/data-plane/CustomWebSearch/readme.go.md
new file mode 100644
index 000000000000..98124fcd1a4f
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/CustomWebSearch/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: customsearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/CustomWebSearch/readme.md b/specification/cognitiveservices/data-plane/CustomWebSearch/readme.md
index 4de3f40edad3..2c25c9db9c86 100644
--- a/specification/cognitiveservices/data-plane/CustomWebSearch/readme.md
+++ b/specification/cognitiveservices/data-plane/CustomWebSearch/readme.md
@@ -75,33 +75,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-cognitiveservices-search-customsearch
 ```
 
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: customsearch
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/customsearch
-```
-
 ## Suppressions
 Suppressing errors due to API design:
 ``` yaml
@@ -110,6 +83,9 @@ directive:
     reason: _type is a polymorphic discriminator that can't be changed.
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/EntitySearch/readme.go.md b/specification/cognitiveservices/data-plane/EntitySearch/readme.go.md
new file mode 100644
index 000000000000..af1d8fc4eddc
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/EntitySearch/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: entitysearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/EntitySearch/readme.md b/specification/cognitiveservices/data-plane/EntitySearch/readme.md
index f55dc630ea08..10e231e19d1a 100644
--- a/specification/cognitiveservices/data-plane/EntitySearch/readme.md
+++ b/specification/cognitiveservices/data-plane/EntitySearch/readme.md
@@ -75,31 +75,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: entitysearch
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/entitysearch
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/Face/readme.go.md b/specification/cognitiveservices/data-plane/Face/readme.go.md
new file mode 100644
index 000000000000..a5217486e00b
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/Face/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: face
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/Face/readme.md b/specification/cognitiveservices/data-plane/Face/readme.md
index 5c8ccf20dc8a..043487a1c87b 100644
--- a/specification/cognitiveservices/data-plane/Face/readme.md
+++ b/specification/cognitiveservices/data-plane/Face/readme.md
@@ -79,31 +79,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: face
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/face
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/ImageSearch/readme.go.md b/specification/cognitiveservices/data-plane/ImageSearch/readme.go.md
new file mode 100644
index 000000000000..f05151358d5a
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/ImageSearch/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: imagesearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/ImageSearch/readme.md b/specification/cognitiveservices/data-plane/ImageSearch/readme.md
index 9bb44157ef38..aaa0ccc09bcd 100644
--- a/specification/cognitiveservices/data-plane/ImageSearch/readme.md
+++ b/specification/cognitiveservices/data-plane/ImageSearch/readme.md
@@ -74,33 +74,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-cognitiveservices-search-imagesearch
 ```
 
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: imagesearch
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/imagesearch
-```
-
 ## Suppressions
 Suppressing errors due to API design:
 ``` yaml
@@ -109,6 +82,9 @@ directive:
     reason: _type is a polymorphic discriminator that can't be changed.
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.go.md b/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.go.md
new file mode 100644
index 000000000000..1bd6bea985e6
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: authoring
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: authoring_2_0
+```
+
+### Tag: authoring_2_0 and go
+
+These settings apply only when `--tag=authoring_2_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'authoring_2_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.0/luis/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.md b/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.md
index ce0e2b543774..bb35d7240112 100644
--- a/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.md
+++ b/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.md
@@ -77,31 +77,7 @@ csharp:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: authoring
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: authoring_2_0
-```
-
-### Tag: authoring_2_0 and go
-
-These settings apply only when `--tag=authoring_2_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'authoring_2_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.0/luis/$(namespace)
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.go.md b/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.go.md
new file mode 100644
index 000000000000..810dbbba0f0b
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: runtime
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: runtime_2_0
+```
+
+### Tag: runtime_2_0 and go
+
+These settings apply only when `--tag=runtime_2_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'runtime_2_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.0/luis/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.md b/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.md
index a9389a7cc28e..278d367e5d95 100644
--- a/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.md
+++ b/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.md
@@ -64,31 +64,7 @@ directive:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: runtime
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: runtime_2_0
-```
-
-### Tag: runtime_2_0 and go
-
-These settings apply only when `--tag=runtime_2_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'runtime_2_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.0/luis/runtime
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/NewsSearch/readme.go.md b/specification/cognitiveservices/data-plane/NewsSearch/readme.go.md
new file mode 100644
index 000000000000..16b18ebe45f2
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/NewsSearch/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: newssearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/NewsSearch/readme.md b/specification/cognitiveservices/data-plane/NewsSearch/readme.md
index f67edcdc06c9..9df4ff55d5ad 100644
--- a/specification/cognitiveservices/data-plane/NewsSearch/readme.md
+++ b/specification/cognitiveservices/data-plane/NewsSearch/readme.md
@@ -85,31 +85,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: newssearch
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/newssearch
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/SpellCheck/readme.go.md b/specification/cognitiveservices/data-plane/SpellCheck/readme.go.md
new file mode 100644
index 000000000000..5aa5885a59fe
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/SpellCheck/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: spellcheck
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/SpellCheck/readme.md b/specification/cognitiveservices/data-plane/SpellCheck/readme.md
index 59dd20fa22af..33db78c23264 100644
--- a/specification/cognitiveservices/data-plane/SpellCheck/readme.md
+++ b/specification/cognitiveservices/data-plane/SpellCheck/readme.md
@@ -76,31 +76,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: spellcheck
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/spellcheck
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/TextAnalytics/readme.go.md b/specification/cognitiveservices/data-plane/TextAnalytics/readme.go.md
new file mode 100644
index 000000000000..d7f271eeeebe
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/TextAnalytics/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: textanalytics
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_2_0
+  - tag: release_2_1
+```
+
+### Tag: release_2_0 and go
+
+These settings apply only when `--tag=release_2_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_2_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.0/$(namespace)
+```
+
+### Tag: release_2_1 and go
+
+These settings apply only when `--tag=release_2_1 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_2_1' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.1/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/TextAnalytics/readme.md b/specification/cognitiveservices/data-plane/TextAnalytics/readme.md
index 137950e39873..603fec1d97af 100644
--- a/specification/cognitiveservices/data-plane/TextAnalytics/readme.md
+++ b/specification/cognitiveservices/data-plane/TextAnalytics/readme.md
@@ -201,40 +201,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: textanalytics
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_2_0
-  - tag: release_2_1
-```
-
-### Tag: release_2_0 and go
-
-These settings apply only when `--tag=release_2_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_2_1' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.0/textanalytics
-```
-
-### Tag: release_2_1 and go
-
-These settings apply only when `--tag=release_2_1 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_2_1' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v2.1/textanalytics
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/VideoSearch/readme.go.md b/specification/cognitiveservices/data-plane/VideoSearch/readme.go.md
new file mode 100644
index 000000000000..c61ebf23aa63
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/VideoSearch/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: videosearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/VideoSearch/readme.md b/specification/cognitiveservices/data-plane/VideoSearch/readme.md
index d791055165a0..d4bdd6d4de8a 100644
--- a/specification/cognitiveservices/data-plane/VideoSearch/readme.md
+++ b/specification/cognitiveservices/data-plane/VideoSearch/readme.md
@@ -76,31 +76,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: videosearch
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/videosearch
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/VisualSearch/readme.go.md b/specification/cognitiveservices/data-plane/VisualSearch/readme.go.md
new file mode 100644
index 000000000000..f5241d4cf945
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/VisualSearch/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: visualsearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/VisualSearch/readme.md b/specification/cognitiveservices/data-plane/VisualSearch/readme.md
index 85d43b586109..5b0b4d0cb399 100644
--- a/specification/cognitiveservices/data-plane/VisualSearch/readme.md
+++ b/specification/cognitiveservices/data-plane/VisualSearch/readme.md
@@ -41,8 +41,8 @@ swagger-to-sdk:
 
 ## CSharp Settings
 These settings apply only when `--csharp` is specified on the command line.
-``` yaml $(csharp) 
-csharp: 
+``` yaml $(csharp)
+csharp:
   namespace: Microsoft.Azure.CognitiveServices.Search.VisualSearch
   output-folder: $(csharp-sdks-folder)/CognitiveServices/dataPlane/Search/Search/Generated/VisualSearch
   sync-methods: none
@@ -77,30 +77,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: visualsearch
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/cognitiveservices/v1.0/$(namespace)
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/data-plane/WebSearch/readme.go.md b/specification/cognitiveservices/data-plane/WebSearch/readme.go.md
new file mode 100644
index 000000000000..f610feae8594
--- /dev/null
+++ b/specification/cognitiveservices/data-plane/WebSearch/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: websearch
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: release_1_0
+```
+
+### Tag: release_1_0 and go
+
+These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'release_1_0' && $(go)
+output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/WebSearch/readme.md b/specification/cognitiveservices/data-plane/WebSearch/readme.md
index ef4b7eb48573..707ed35c0f41 100644
--- a/specification/cognitiveservices/data-plane/WebSearch/readme.md
+++ b/specification/cognitiveservices/data-plane/WebSearch/readme.md
@@ -77,31 +77,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: websearch
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: release_1_0
-```
-
-### Tag: release_1_0 and go
-
-These settings apply only when `--tag=release_1_0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'release_1_0' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/v1.0/websearch
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/resource-manager/readme.go.md b/specification/cognitiveservices/resource-manager/readme.go.md
new file mode 100644
index 000000000000..53b03ae33d05
--- /dev/null
+++ b/specification/cognitiveservices/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: cognitiveservices
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-04
+  - tag: package-2016-02-preview
+```
+
+### Tag: package-2017-04 and go
+
+These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-04-18/$(namespace)
+```
+
+### Tag: package-2016-02-preview and go
+
+These settings apply only when `--tag=package-2016-02-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-02-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2016-02-01-preview/$(namespace)
+```
diff --git a/specification/cognitiveservices/resource-manager/readme.md b/specification/cognitiveservices/resource-manager/readme.md
index e0b15a12effb..b7231ef1800c 100644
--- a/specification/cognitiveservices/resource-manager/readme.md
+++ b/specification/cognitiveservices/resource-manager/readme.md
@@ -64,6 +64,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -85,44 +86,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: cognitiveservices
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-04
-  - tag: package-2016-02-preview
-```
-
-### Tag: package-2017-04 and go
-
-These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04' && $(go)
-output-folder: $(go-sdk-folder)/services/cognitiveservices/mgmt/2017-04-18/cognitiveservices
-```
-
-### Tag: package-2016-02-preview and go
-
-These settings apply only when `--tag=package-2016-02-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-02-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/cognitiveservices/preview/mgmt/2016-02-01-preview/cognitiveservices
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cognitiveservices/resource-manager/readme.typescript.md b/specification/cognitiveservices/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..758b157510ce
--- /dev/null
+++ b/specification/cognitiveservices/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-cognitiveservices"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-cognitiveservices"
+  generate-metadata: true
+```
diff --git a/specification/commerce/resource-manager/readme.go.md b/specification/commerce/resource-manager/readme.go.md
new file mode 100644
index 000000000000..b3764e08ef61
--- /dev/null
+++ b/specification/commerce/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: commerce
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-06-preview
+```
+
+### Tag: package-2015-06-preview and go
+
+These settings apply only when `--tag=package-2015-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-06-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/commerce/resource-manager/readme.md b/specification/commerce/resource-manager/readme.md
index b007fe0c7294..bec772b597ed 100644
--- a/specification/commerce/resource-manager/readme.md
+++ b/specification/commerce/resource-manager/readme.md
@@ -53,6 +53,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -87,34 +88,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-commerce
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: commerce
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-06-preview
-```
-
-### Tag: package-2015-06-preview and go
-
-These settings apply only when `--tag=package-2015-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/commerce/mgmt/2015-06-01-preview/commerce
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/commerce/resource-manager/readme.typescript.md b/specification/commerce/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..4cc1ffeef333
--- /dev/null
+++ b/specification/commerce/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-commerce"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-commerce"
+  payload-flattening-threshold: 2
+  generate-metadata: true
+```
diff --git a/specification/compute/resource-manager/readme.go.md b/specification/compute/resource-manager/readme.go.md
index 73d41d3c9232..d23c584373ec 100644
--- a/specification/compute/resource-manager/readme.go.md
+++ b/specification/compute/resource-manager/readme.go.md
@@ -2,7 +2,7 @@
 
 These settings apply only when `--go` is specified on the command line.
 
-``` yaml $(go)
+```yaml $(go)
 go:
   license-header: MICROSOFT_APACHE_NO_VERSION
   clear-output-folder: true
@@ -10,7 +10,7 @@ go:
 
 ### Go multi-api
 
-``` yaml $(go) && $(multiapi)
+```yaml $(go) && $(multiapi)
 batch:
   - tag: package-2018-10-01
   - tag: package-2018-06
@@ -32,9 +32,9 @@ batch:
 These settings apply only when `--tag=package-2018-10-01 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-2018-10-01' && $(go)
+```yaml $(tag)=='package-2018-10-01' && $(go)
 namespace: compute
-output-folder: $(go-sdk-folder)/services/compute/mgmt/2018-10-01/compute
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-10-01/$(namespace)
 ```
 
 ### Tag: package-2018-06 and go
@@ -42,9 +42,9 @@ output-folder: $(go-sdk-folder)/services/compute/mgmt/2018-10-01/compute
 These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-2018-06' && $(go)
+```yaml $(tag)=='package-2018-06' && $(go)
 namespace: compute
-output-folder: $(go-sdk-folder)/services/compute/mgmt/2018-06-01/compute
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-06-01/$(namespace)
 ```
 
 ### Tag: package-compute-2018-04 and go
@@ -52,9 +52,9 @@ output-folder: $(go-sdk-folder)/services/compute/mgmt/2018-06-01/compute
 These settings apply only when `--tag=package-compute-2018-04 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-compute-2018-04' && $(go)
+```yaml $(tag)=='package-compute-2018-04' && $(go)
 namespace: compute
-output-folder: $(go-sdk-folder)/services/compute/mgmt/2018-04-01/compute
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-04-01/$(namespace)
 ```
 
 ### Tag: package-compute-only-2017-12 and go
@@ -62,9 +62,9 @@ output-folder: $(go-sdk-folder)/services/compute/mgmt/2018-04-01/compute
 These settings apply only when `--tag=package-compute-only-2017-12 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-compute-only-2017-12' && $(go)
+```yaml $(tag)=='package-compute-only-2017-12' && $(go)
 namespace: compute
-output-folder: $(go-sdk-folder)/services/compute/mgmt/2017-12-01/compute
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-12-01/$(namespace)
 ```
 
 ### Tag: package-compute-2017-03 and go
@@ -72,9 +72,9 @@ output-folder: $(go-sdk-folder)/services/compute/mgmt/2017-12-01/compute
 These settings apply only when `--tag=package-compute-2017-03 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-compute-2017-03' && $(go)
+```yaml $(tag)=='package-compute-2017-03' && $(go)
 namespace: compute
-output-folder: $(go-sdk-folder)/services/compute/mgmt/2017-03-30/compute
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-03-30/$(namespace)
 ```
 
 ### Tag: package-compute-2016-04-preview and go
@@ -82,9 +82,9 @@ output-folder: $(go-sdk-folder)/services/compute/mgmt/2017-03-30/compute
 These settings apply only when `--tag=package-compute-2016-04-preview --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-compute-2016-04-preview' && $(go)
+```yaml $(tag)=='package-compute-2016-04-preview' && $(go)
 namespace: compute
-output-folder: $(go-sdk-folder)/services/preview/compute/mgmt/2016-04-30-preview/compute
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2016-04-30-preview/$(namespace)
 ```
 
 ### Tag: package-compute-2016-03 and go
@@ -92,9 +92,9 @@ output-folder: $(go-sdk-folder)/services/preview/compute/mgmt/2016-04-30-preview
 These settings apply only when `--tag=package-compute-2016-03 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-compute-2016-03' && $(go)
+```yaml $(tag)=='package-compute-2016-03' && $(go)
 namespace: compute
-output-folder: $(go-sdk-folder)/services/compute/mgmt/2016-03-30/compute
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-03-30/$(namespace)
 ```
 
 ### Tag: package-compute-2015-06 and go
@@ -102,9 +102,9 @@ output-folder: $(go-sdk-folder)/services/compute/mgmt/2016-03-30/compute
 These settings apply only when `--tag=package-compute-2015-06 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-compute-2015-06' && $(go)
+```yaml $(tag)=='package-compute-2015-06' && $(go)
 namespace: compute
-output-folder: $(go-sdk-folder)/services/compute/mgmt/2015-06-15/compute
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-06-15/$(namespace)
 ```
 
 ### Tag: package-skus-2017-09 and go
@@ -112,9 +112,9 @@ output-folder: $(go-sdk-folder)/services/compute/mgmt/2015-06-15/compute
 These settings apply only when `--tag=package-skus-2017-09 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-skus-2017-09' && $(go)
+```yaml $(tag)=='package-skus-2017-09' && $(go)
 namespace: skus
-output-folder: $(go-sdk-folder)/services/compute/mgmt/2017-09-01/skus
+output-folder: $(go-sdk-folder)/services/compute/mgmt/2017-09-01/$(namespace)
 ```
 
 ### Tag: package-container-service-2017-01 and go
@@ -122,9 +122,9 @@ output-folder: $(go-sdk-folder)/services/compute/mgmt/2017-09-01/skus
 These settings apply only when `--tag=package-container-service-2017-01 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-container-service-2017-01' && $(go)
+```yaml $(tag)=='package-container-service-2017-01' && $(go)
 namespace: containerservice
-output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2017-01-31/containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-01-31/$(namespace)
 ```
 
 ### Tag: package-container-service-2016-09 and go
@@ -132,9 +132,9 @@ output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2017-01-31/contai
 These settings apply only when `--tag=package-container-service-2016-09 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-container-service-2016-09' && $(go)
+```yaml $(tag)=='package-container-service-2016-09' && $(go)
 namespace: containerservice
-output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2016-09-30/containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-09-30/$(namespace)
 ```
 
 ### Tag: package-container-service-2016-03 and go
@@ -142,9 +142,9 @@ output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2016-09-30/contai
 These settings apply only when `--tag=package-container-service-2016-03 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-container-service-2016-03' && $(go)
+```yaml $(tag)=='package-container-service-2016-03' && $(go)
 namespace: containerservice
-output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2016-03-30/containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-03-30/$(namespace)
 ```
 
 ### Tag: package-container-service-2015-11-preview and go
@@ -152,7 +152,7 @@ output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2016-03-30/contai
 These settings apply only when `--tag=package-container-service-2015-11-preview --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag)=='package-container-service-2015-11-preview' && $(go)
+```yaml $(tag)=='package-container-service-2015-11-preview' && $(go)
 namespace: containerservice
-output-folder: $(go-sdk-folder)/services/preview/containerservice/mgmt/2015-11-01-preview/containerservice
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-11-01-preview/$(namespace)
 ```
diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md
index 12591b3719f4..84d30596a34c 100644
--- a/specification/compute/resource-manager/readme.md
+++ b/specification/compute/resource-manager/readme.md
@@ -487,6 +487,9 @@ swagger-to-sdk:
       - bundle install && rake arm:regen_all_profiles['azure_mgmt_compute']
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/compute/resource-manager/readme.typescript.md b/specification/compute/resource-manager/readme.typescript.md
index bdace03dd258..c244018bf218 100644
--- a/specification/compute/resource-manager/readme.typescript.md
+++ b/specification/compute/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-compute"
-  output-folder: $(typescript-sdks-folder)/packages/arm-compute
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-compute"
   generate-metadata: true
 ```
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/consumption.json
new file mode 100644
index 000000000000..41211e47e0c8
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/consumption.json
@@ -0,0 +1,4412 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2018-10-01",
+    "title": "ConsumptionManagementClient",
+    "description": "Consumption management client provides access to consumption resources for Azure Enterprise Subscriptions."
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow.",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_List",
+        "description": "Lists the usage details for a scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsList": {
+            "$ref": "./examples/UsageDetailsList.json"
+          },
+          "UsageDetailsListFilterByTag": {
+            "$ref": "./examples/UsageDetailsListFilterByTag.json"
+          },
+          "UsageDetailsListGroupByTagDate": {
+            "$ref": "./examples/UsageDetailsListGroupByTagDate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListByBillingPeriod",
+        "description": "Lists the usage details for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsListForBillingPeriod": {
+            "$ref": "./examples/UsageDetailsListForBillingPeriod.json"
+          },
+          "UsageDetailsExpand": {
+            "$ref": "./examples/UsageDetailsExpand.json"
+          },
+          "UsageDetailsListForBillingPeriodGroupByTag": {
+            "$ref": "./examples/UsageDetailsListForBillingPeriodGroupByTag.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListByBillingAccount",
+        "description": "Lists the usage details by billingAccountId for a scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsList": {
+            "$ref": "./examples/UsageDetailsListByBillingAccount.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListForBillingPeriodByBillingAccount",
+        "description": "Lists the usage details based on billingAccountId for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsListForBillingPeriod": {
+            "$ref": "./examples/UsageDetailsListForBillingPeriodByBillingAccount.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListByDepartment",
+        "description": "Lists the usage details by departmentId for a scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsList": {
+            "$ref": "./examples/UsageDetailsListByDepartment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/departmentIdParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListForBillingPeriodByDepartment",
+        "description": "Lists the usage details based on departmentId for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsListForBillingPeriod": {
+            "$ref": "./examples/UsageDetailsListForBillingPeriodByDepartment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/departmentIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListByEnrollmentAccount",
+        "description": "Lists the usage details by enrollmentAccountId for a scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsList": {
+            "$ref": "./examples/UsageDetailsListByEnrollmentAccount.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/enrollmentAccountIdParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListForBillingPeriodByEnrollmentAccount",
+        "description": "Lists the usage details based on enrollmentAccountId for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsListForBillingPeriod": {
+            "$ref": "./examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/enrollmentAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/marketplaces": {
+      "get": {
+        "tags": [
+          "Marketplaces"
+        ],
+        "x-ms-odata": "#/definitions/Marketplace",
+        "operationId": "Marketplaces_List",
+        "description": "Lists the marketplaces for a scope by subscriptionId and current billing period. Marketplaces are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "MarketplacesList": {
+            "$ref": "./examples/MarketplacesList.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N marketplaces.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/MarketplacesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": {
+      "get": {
+        "tags": [
+          "Marketplaces"
+        ],
+        "x-ms-odata": "#/definitions/Marketplace",
+        "operationId": "Marketplaces_ListByBillingPeriod",
+        "description": "Lists the marketplaces for a scope by billing period and subscripotionId. Marketplaces are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "MarketplacesListForBillingPeriod": {
+            "$ref": "./examples/MarketplacesListForBillingPeriod.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N marketplaces.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/MarketplacesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/marketplaces": {
+      "get": {
+        "tags": [
+          "Marketplaces"
+        ],
+        "x-ms-odata": "#/definitions/Marketplace",
+        "operationId": "Marketplaces_ListByBillingAccount",
+        "description": "Lists the marketplaces for a scope by billingAccountId and current billing period. Marketplaces are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "MarketplacesList": {
+            "$ref": "./examples/MarketplacesByBillingAccountList.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N marketplaces.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/MarketplacesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": {
+      "get": {
+        "tags": [
+          "Marketplaces"
+        ],
+        "x-ms-odata": "#/definitions/Marketplace",
+        "operationId": "Marketplaces_ListForBillingPeriodByBillingAccount",
+        "description": "Lists the marketplaces for a scope by billing period and billingAccountId. Marketplaces are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "MarketplacesListForBillingPeriod": {
+            "$ref": "./examples/MarketplacesByBillingAccountListForBillingPeriod.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N marketplaces.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/MarketplacesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Consumption/marketplaces": {
+      "get": {
+        "tags": [
+          "Marketplaces"
+        ],
+        "x-ms-odata": "#/definitions/Marketplace",
+        "operationId": "Marketplaces_ListByDepartment",
+        "description": "Lists the marketplaces for a scope by departmentId and current billing period. Marketplaces are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "MarketplacesList": {
+            "$ref": "./examples/MarketplacesByDepartmentList.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N marketplaces.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/departmentIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/MarketplacesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": {
+      "get": {
+        "tags": [
+          "Marketplaces"
+        ],
+        "x-ms-odata": "#/definitions/Marketplace",
+        "operationId": "Marketplaces_ListForBillingPeriodByDepartment",
+        "description": "Lists the marketplaces for a scope by billing period and departmentId. Marketplaces are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "MarketplacesListForBillingPeriod": {
+            "$ref": "./examples/MarketplacesByDepartment_ListByBillingPeriod.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N marketplaces.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/departmentIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/MarketplacesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/marketplaces": {
+      "get": {
+        "tags": [
+          "Marketplaces"
+        ],
+        "x-ms-odata": "#/definitions/Marketplace",
+        "operationId": "Marketplaces_ListByEnrollmentAccount",
+        "description": "Lists the marketplaces for a scope by enrollmentAccountId and current billing period. Marketplaces are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "MarketplacesList": {
+            "$ref": "./examples/MarketplacesByEnrollmentAccountList.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N marketplaces.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/enrollmentAccountIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/MarketplacesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": {
+      "get": {
+        "tags": [
+          "Marketplaces"
+        ],
+        "x-ms-odata": "#/definitions/Marketplace",
+        "operationId": "Marketplaces_ListForBillingPeriodByEnrollmentAccount",
+        "description": "Lists the marketplaces for a scope by billing period and enrollmentAccountId. Marketplaces are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "MarketplacesListForBillingPeriod": {
+            "$ref": "./examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N marketplaces.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/enrollmentAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/MarketplacesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/balances": {
+      "get": {
+        "tags": [
+          "Balances"
+        ],
+        "operationId": "Balances_GetByBillingAccount",
+        "description": "Gets the balances for a scope by billingAccountId. Balances are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "Balances": {
+            "$ref": "./examples/BalancesByBillingAccount.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/Balance"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/balances": {
+      "get": {
+        "tags": [
+          "Balances"
+        ],
+        "operationId": "Balances_GetForBillingPeriodByBillingAccount",
+        "description": "Gets the balances for a scope by billing period and billingAccountId. Balances are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "Balances": {
+            "$ref": "./examples/BalancesByBillingAccountForBillingPeriod.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/Balance"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationSummaries": {
+      "get": {
+        "tags": [
+          "ReservedInstances"
+        ],
+        "operationId": "ReservationsSummaries_ListByReservationOrder",
+        "description": "Lists the reservations summaries for daily or monthly grain.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ReservationSummariesDaily": {
+            "$ref": "./examples/ReservationSummariesDaily.json"
+          },
+          "ReservationSummariesMonthly": {
+            "$ref": "./examples/ReservationSummariesMonthly.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/reservationOrderIdParameter"
+          },
+          {
+            "$ref": "#/parameters/grainParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "Required only for daily grain. The properties/UsageDate for start date and end date. The filter supports 'le' and  'ge'",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ReservationSummariesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/reservations/{reservationId}/providers/Microsoft.Consumption/reservationSummaries": {
+      "get": {
+        "tags": [
+          "ReservedInstances"
+        ],
+        "operationId": "ReservationsSummaries_ListByReservationOrderAndReservation",
+        "description": "Lists the reservations summaries for daily or monthly grain.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ReservationSummariesDailyWithReservationId": {
+            "$ref": "./examples/ReservationSummariesDailyWithReservationId.json"
+          },
+          "ReservationSummariesMonthlyWithReservationId": {
+            "$ref": "./examples/ReservationSummariesMonthlyWithReservationId.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/reservationOrderIdParameter"
+          },
+          {
+            "$ref": "#/parameters/reservationIdParameter"
+          },
+          {
+            "$ref": "#/parameters/grainParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "Required only for daily grain. The properties/UsageDate for start date and end date. The filter supports 'le' and  'ge'",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ReservationSummariesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationDetails": {
+      "get": {
+        "tags": [
+          "ReservedInstances"
+        ],
+        "operationId": "ReservationsDetails_ListByReservationOrder",
+        "description": "Lists the reservations details for provided date range.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ReservationDetails": {
+            "$ref": "./examples/ReservationDetails.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/reservationOrderIdParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "Filter reservation details by date range. The properties/UsageDate for start date and end date. The filter supports 'le' and  'ge' ",
+            "in": "query",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ReservationDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/reservations/{reservationId}/providers/Microsoft.Consumption/reservationDetails": {
+      "get": {
+        "tags": [
+          "ReservedInstances"
+        ],
+        "operationId": "ReservationsDetails_ListByReservationOrderAndReservation",
+        "description": "Lists the reservations details for provided date range.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ReservationDetailsWithReservationId": {
+            "$ref": "./examples/ReservationDetailsWithReservationId.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/reservationOrderIdParameter"
+          },
+          {
+            "$ref": "#/parameters/reservationIdParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "Filter reservation details by date range. The properties/UsageDate for start date and end date. The filter supports 'le' and  'ge' ",
+            "in": "query",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ReservationDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/reservationRecommendations": {
+      "get": {
+        "tags": [
+          "ReservationRecommendations"
+        ],
+        "operationId": "ReservationRecommendations_List",
+        "description": "List of recomendations for purchasing reserved instances.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ReservationRecommendations": {
+            "$ref": "./examples/ReservationRecommendationsList.json"
+          },
+          "ReservationRecommendationsFilterByScopeLookBackPeriod": {
+            "$ref": "./examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter reservationRecommendations by properties/scope and properties/lookBackPeriod.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ReservationRecommendationsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/budgets": {
+      "get": {
+        "tags": [
+          "Budgets"
+        ],
+        "operationId": "Budgets_List",
+        "description": "Lists all budgets for a subscription.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "BudgetsList": {
+            "$ref": "./examples/BudgetsList.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/BudgetsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Consumption/budgets": {
+      "get": {
+        "tags": [
+          "Budgets"
+        ],
+        "operationId": "Budgets_ListByResourceGroupName",
+        "description": "Lists all budgets for a resource group under a subscription.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "BudgetsList": {
+            "$ref": "./examples/BudgetsList.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/resourceGroupNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/BudgetsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/budgets/{budgetName}": {
+      "get": {
+        "tags": [
+          "Budgets"
+        ],
+        "operationId": "Budgets_Get",
+        "description": "Gets the budget for a subscription by budget name.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "Budget": {
+            "$ref": "./examples/Budget.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/budgetNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/Budget"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Budgets"
+        ],
+        "operationId": "Budgets_CreateOrUpdate",
+        "description": "The operation to create or update a budget. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "CreateOrUpdateBudget": {
+            "$ref": "./examples/CreateOrUpdateBudget.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/budgetNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Budget"
+            },
+            "description": "Parameters supplied to the Create Budget operation."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/Budget"
+            }
+          },
+          "201": {
+            "description": "Created.",
+            "schema": {
+              "$ref": "#/definitions/Budget"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Budgets"
+        ],
+        "operationId": "Budgets_Delete",
+        "description": "The operation to delete a budget.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "DeleteBudget": {
+            "$ref": "./examples/DeleteBudget.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/budgetNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Consumption/budgets/{budgetName}": {
+      "get": {
+        "tags": [
+          "Budgets"
+        ],
+        "operationId": "Budgets_GetByResourceGroupName",
+        "description": "Gets the budget for a resource group under a subscription by budget name.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "Budget": {
+            "$ref": "./examples/Budget.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/resourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/budgetNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/Budget"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Budgets"
+        ],
+        "operationId": "Budgets_CreateOrUpdateByResourceGroupName",
+        "description": "The operation to create or update a budget. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "CreateOrUpdateBudget": {
+            "$ref": "./examples/CreateOrUpdateBudget.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/resourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/budgetNameParameter"
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Budget"
+            },
+            "description": "Parameters supplied to the Create Budget operation."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/Budget"
+            }
+          },
+          "201": {
+            "description": "Created.",
+            "schema": {
+              "$ref": "#/definitions/Budget"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Budgets"
+        ],
+        "operationId": "Budgets_DeleteByResourceGroupName",
+        "description": "The operation to delete a budget.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "DeleteBudget": {
+            "$ref": "./examples/DeleteBudget.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/resourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/budgetNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/pricesheets/default": {
+      "get": {
+        "tags": [
+          "PriceSheet"
+        ],
+        "operationId": "PriceSheet_Get",
+        "description": "Gets the price sheet for a scope by subscriptionId. Price sheet is available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "PriceSheet": {
+            "$ref": "./examples/PriceSheet.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/meterDetails within a price sheet. By default, these fields are not included when returning price sheet.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the top N results.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/PriceSheetResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/pricesheets/default": {
+      "get": {
+        "tags": [
+          "PriceSheet"
+        ],
+        "operationId": "PriceSheet_GetByBillingPeriod",
+        "description": "Get the price sheet for a scope by subscriptionId and billing period. Price sheet is available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "PriceSheetForBillingPeriod": {
+            "$ref": "./examples/PriceSheetForBillingPeriod.json"
+          },
+          "PriceSheetExpand": {
+            "$ref": "./examples/PriceSheetExpand.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/meterDetails within a price sheet. By default, these fields are not included when returning price sheet.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the top N results.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/PriceSheetResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/tags": {
+      "get": {
+        "tags": [
+          "Tags"
+        ],
+        "operationId": "Tags_Get",
+        "description": "Get all available tag keys for a billing account.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "Tags_Get": {
+            "$ref": "./examples/Tags.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/TagsResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/forecasts": {
+      "get": {
+        "tags": [
+          "Forecasts"
+        ],
+        "x-ms-odata": "#/definitions/Forecast",
+        "operationId": "Forecasts_List",
+        "description": "Lists the forecast charges by subscriptionId.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ForecastsList": {
+            "$ref": "./examples/ForecastsList.json"
+          },
+          "ForecastsListFilterByGrain": {
+            "$ref": "./examples/ForecastsListFilterByGrain.json"
+          },
+          "ForecastsListFilterByDates": {
+            "$ref": "./examples/ForecastsListFilterByDates.json"
+          }
+        },
+        "parameters": [
+          {
+            "name": "$filter",
+            "description": "May be used to filter forecasts by properties/usageDate (Utc time), properties/chargeType or properties/grain. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ForecastsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/providers/Microsoft.Consumption/operations": {
+      "get": {
+        "tags": [
+          "Operations"
+        ],
+        "operationId": "Operations_List",
+        "description": "Lists all of the available consumption REST API operations.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/OperationListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListByManagementGroup",
+        "description": "Lists the usage detail records for all subscriptions belonging to a management group scope by current billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsList": {
+            "$ref": "./examples/UsageDetailsListByManagementGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/managementGroupIdParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart)",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": {
+      "get": {
+        "tags": [
+          "UsageDetails"
+        ],
+        "operationId": "UsageDetails_ListForBillingPeriodByManagementGroup",
+        "description": "Lists the usage detail records for all subscriptions belonging to a management group scope by specified billing period. Usage details are available via this API only for May 1, 2014 or later.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "UsageDetailsListForBillingPeriod": {
+            "$ref": "./examples/UsageDetailsListForBillingPeriodByManagementGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/managementGroupIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          },
+          {
+            "name": "$expand",
+            "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$apply",
+            "description": "OData apply expression to aggregate usageDetails by tags or (tags and properties/usageStart) for specified billing period",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method",
+            "x-ms-parameter-grouping": {
+              "name": "QueryOptions"
+            },
+            "x-ms-client-name": "Apply"
+          },
+          {
+            "name": "$skiptoken",
+            "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "description": "May be used to limit the number of results to the most recent N usageDetails.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1000
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/UsageDetailsListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Consumption/aggregatedcost": {
+      "get": {
+        "tags": [
+          "AggregatedCost"
+        ],
+        "operationId": "AggregatedCost_GetByManagementGroup",
+        "description": "Provides the aggregate cost of a management group and all child management groups by current billing period.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "AggregatedCostByManagementGroup": {
+            "$ref": "./examples/AggregatedCostByManagementGroup.json"
+          },
+          "AggregatedCostByManagementGroupFilterByDate": {
+            "$ref": "./examples/AggregatedCostByManagementGroupFilterByDate.json"
+          }
+
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/managementGroupIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter aggregated cost by properties/usageStart (Utc time), properties/usageEnd (Utc time). The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ManagementGroupAggregatedCostResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/Microsoft.Consumption/aggregatedcost": {
+      "get": {
+        "tags": [
+          "AggregatedCost"
+        ],
+        "operationId": "AggregatedCost_GetForBillingPeriodByManagementGroup",
+        "description": "Provides the aggregate cost of a management group and all child management groups by specified billing period",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "AggregatedCostListForBillingPeriodByManagementGroup": {
+            "$ref": "./examples/AggregatedCostForBillingPeriodByManagementGroup.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/managementGroupIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ManagementGroupAggregatedCostResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Consumption/charges": {
+      "get": {
+        "tags": [
+          "Charges"
+        ],
+        "operationId": "Charges_ListByEnrollmentAccount",
+        "description": "Lists the charges by enrollmentAccountId.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ChargesListForEnrollmentAccount": {
+            "$ref": "./examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/enrollmentAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter charges by properties/usageEnd (Utc time), properties/usageStart (Utc time). The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ChargesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/charges": {
+      "get": {
+        "tags": [
+          "Charges"
+        ],
+        "operationId": "Charges_ListForBillingPeriodByEnrollmentAccount",
+        "description": "Lists the charges based on enrollmentAccountId by billing period.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ChangesForBillingPeriodByEnrollmentAccount": {
+            "$ref": "./examples/ChargesForBillingPeriodByEnrollmentAccount.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/enrollmentAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter charges by properties/usageEnd (Utc time), properties/usageStart (Utc time). The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ChargeSummary"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}/providers/Microsoft.Consumption/charges": {
+      "get": {
+        "tags": [
+          "Charges"
+        ],
+        "operationId": "Charges_ListByDepartment",
+        "description": "Lists the charges by departmentId.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ChargesListByDepartment": {
+            "$ref": "./examples/ChargesListForDepartmentFilterByStartEndDate.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/departmentIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter charges by properties/usageEnd (Utc time), properties/usageStart (Utc time). The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ChargesListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/charges": {
+      "get": {
+        "tags": [
+          "Charges"
+        ],
+        "operationId": "Charges_ListForBillingPeriodByDepartment",
+        "description": "Lists the charges based on departmentId by billing period.",
+        "externalDocs": {
+          "url": "https://docs.microsoft.com/en-us/rest/api/consumption/"
+        },
+        "x-ms-examples": {
+          "ChangesForBillingPeriodByDepartmentt": {
+            "$ref": "./examples/ChargesForBillingPeriodByDepartment.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/billingAccountIdParameter"
+          },
+          {
+            "$ref": "#/parameters/departmentIdParameter"
+          },
+          {
+            "$ref": "#/parameters/billingPeriodNameParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          },
+          {
+            "name": "$filter",
+            "description": "May be used to filter charges by properties/usageEnd (Utc time), properties/usageStart (Utc time). The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The request has succeeded.",
+            "schema": {
+              "$ref": "#/definitions/ChargeSummary"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "MeterDetails": {
+      "description": "The properties of the meter detail.",
+      "properties": {
+        "meterName": {
+          "description": "The name of the meter, within the given meter category",
+          "type": "string",
+          "readOnly": true
+        },
+        "meterCategory": {
+          "description": "The category of the meter, for example, 'Cloud services', 'Networking', etc..",
+          "type": "string",
+          "readOnly": true
+        },
+        "meterSubCategory": {
+          "description": "The subcategory of the meter, for example, 'A6 Cloud services', 'ExpressRoute (IXP)', etc..",
+          "type": "string",
+          "readOnly": true
+        },
+        "unit": {
+          "description": "The unit in which the meter consumption is charged, for example, 'Hours', 'GB', etc.",
+          "type": "string",
+          "readOnly": true
+        },
+        "meterLocation": {
+          "description": "The location in which the Azure service is available.",
+          "type": "string",
+          "readOnly": true
+        },
+        "totalIncludedQuantity": {
+          "description": "The total included quantity associated with the offer.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "pretaxStandardRate": {
+          "description": "The pretax listing price.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "serviceName": {
+          "description": "The name of the service.",
+          "type": "string",
+          "readOnly": true
+        },
+        "serviceTier": {
+          "description": "The service tier.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "UsageDetail": {
+      "description": "An usage detail resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/UsageDetailProperties",
+          "title": "Usage detail properties"
+        }
+      }
+    },
+    "UsageDetailsListResult": {
+      "description": "Result of listing usage details. It contains a list of available usage details in reverse chronological order by billing period.",
+      "properties": {
+        "value": {
+          "description": "The list of usage details.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/UsageDetail"
+          }
+        },
+        "nextLink": {
+          "description": "The link (url) to the next page of results.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "UsageDetailProperties": {
+      "description": "The properties of the usage detail.",
+      "properties": {
+        "billingPeriodId": {
+          "description": "The id of the billing period resource that the usage belongs to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "invoiceId": {
+          "description": "The id of the invoice resource that the usage belongs to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "usageStart": {
+          "description": "The start of the date time range covered by the usage detail.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "usageEnd": {
+          "description": "The end of the date time range covered by the usage detail.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "instanceName": {
+          "description": "The name of the resource instance that the usage is about.",
+          "type": "string",
+          "readOnly": true
+        },
+        "instanceId": {
+          "description": "The uri of the resource instance that the usage is about.",
+          "type": "string",
+          "readOnly": true
+        },
+        "instanceLocation": {
+          "description": "The location of the resource instance that the usage is about.",
+          "type": "string",
+          "readOnly": true
+        },
+        "currency": {
+          "description": "The ISO currency in which the meter is charged, for example, USD.",
+          "type": "string",
+          "readOnly": true
+        },
+        "usageQuantity": {
+          "description": "The quantity of usage.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "billableQuantity": {
+          "description": "The billable usage quantity.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "pretaxCost": {
+          "description": "The amount of cost before tax.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "isEstimated": {
+          "description": "The estimated usage is subject to change.",
+          "type": "boolean",
+          "readOnly": true
+        },
+        "meterId": {
+          "description": "The meter id (GUID).",
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true
+        },
+        "meterDetails": {
+          "description": "The details about the meter. By default this is not populated, unless it's specified in $expand.",
+          "$ref": "#/definitions/MeterDetails",
+          "readOnly": true
+        },
+        "subscriptionGuid": {
+          "description": "Subscription guid.",
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true
+        },
+        "subscriptionName": {
+          "description": "Subscription name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "accountName": {
+          "description": "Account name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "departmentName": {
+          "description": "Department name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "product": {
+          "description": "Product name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "consumedService": {
+          "description": "Consumed service name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "costCenter": {
+          "description": "The cost center of this department if it is a department and a costcenter exists",
+          "type": "string",
+          "readOnly": true
+        },
+        "partNumber": {
+          "description": "Part Number",
+          "type": "string",
+          "readOnly": true
+        },
+        "resourceGuid": {
+          "description": "Resource Guid",
+          "type": "string",
+          "readOnly": true
+        },
+        "offerId": {
+          "description": "Offer Id",
+          "type": "string",
+          "readOnly": true
+        },
+        "chargesBilledSeparately": {
+          "description": "Charges billed separately",
+          "type": "boolean",
+          "readOnly": true
+        },
+        "location": {
+          "description": "Resource Location",
+          "type": "string",
+          "readOnly": true
+        },
+        "additionalProperties": {
+          "description": "Additional details of this usage item. By default this is not populated, unless it's specified in $expand.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "Marketplace": {
+      "description": "An marketplace resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/MarketplaceProperties",
+          "title": "Marketplace properties"
+        }
+      }
+    },
+    "MarketplacesListResult": {
+      "description": "Result of listing marketplaces. It contains a list of available marketplaces in reverse chronological order by billing period.",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "The list of marketplaces.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/Marketplace"
+          }
+        },
+        "nextLink": {
+          "description": "The link (url) to the next page of results.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "MarketplaceProperties": {
+      "description": "The properties of the marketplace usage detail.",
+      "type": "object",
+      "properties": {
+        "billingPeriodId": {
+          "description": "The id of the billing period resource that the usage belongs to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "usageStart": {
+          "description": "The start of the date time range covered by the usage detail.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "usageEnd": {
+          "description": "The end of the date time range covered by the usage detail.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "resourceRate": {
+          "description": "The marketplace resource rate.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "offerName": {
+          "description": "The type of offer.",
+          "type": "string",
+          "readOnly": true
+        },
+        "resourceGroup": {
+          "description": "The name of resource group.",
+          "type": "string",
+          "readOnly": true
+        },
+        "orderNumber": {
+          "description": "The order number.",
+          "type": "string",
+          "readOnly": true
+        },
+        "instanceName": {
+          "description": "The name of the resource instance that the usage is about.",
+          "type": "string",
+          "readOnly": true
+        },
+        "instanceId": {
+          "description": "The uri of the resource instance that the usage is about.",
+          "type": "string",
+          "readOnly": true
+        },
+        "currency": {
+          "description": "The ISO currency in which the meter is charged, for example, USD.",
+          "type": "string",
+          "readOnly": true
+        },
+        "consumedQuantity": {
+          "description": "The quantity of usage.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "unitOfMeasure": {
+          "description": "The unit of measure.",
+          "type": "string",
+          "readOnly": true
+        },
+        "pretaxCost": {
+          "description": "The amount of cost before tax.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "isEstimated": {
+          "description": "The estimated usage is subject to change.",
+          "type": "boolean",
+          "readOnly": true
+        },
+        "meterId": {
+          "description": "The meter id (GUID).",
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true
+        },
+        "subscriptionGuid": {
+          "description": "Subscription guid.",
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true
+        },
+        "subscriptionName": {
+          "description": "Subscription name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "accountName": {
+          "description": "Account name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "departmentName": {
+          "description": "Department name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "consumedService": {
+          "description": "Consumed service name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "costCenter": {
+          "description": "The cost center of this department if it is a department and a costcenter exists",
+          "type": "string",
+          "readOnly": true
+        },
+        "additionalProperties": {
+          "description": "Additional details of this usage item. By default this is not populated, unless it's specified in $expand.",
+          "type": "string",
+          "readOnly": true
+        },
+        "publisherName": {
+          "description": "The name of publisher.",
+          "type": "string",
+          "readOnly": true
+        },
+        "planName": {
+          "description": "The name of plan.",
+          "type": "string",
+          "readOnly": true
+        },
+        "isRecurringCharge": {
+          "description": "Flag indicating whether this is a recurring charge or not.",
+          "type": "boolean",
+          "readOnly": true
+        }
+      }
+    },
+    "Balance": {
+      "description": "A balance resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/BalanceProperties",
+          "title": "Balance properties"
+        }
+      }
+    },
+    "BalanceProperties": {
+      "description": "The properties of the balance.",
+      "type": "object",
+      "properties": {
+        "currency": {
+          "description": "The ISO currency in which the meter is charged, for example, USD.",
+          "type": "string",
+          "readOnly": true
+        },
+        "beginningBalance": {
+          "description": "The beginning balance for the billing period.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "endingBalance": {
+          "description": "The ending balance for the billing period (for open periods this will be updated daily).",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "newPurchases": {
+          "description": "Total new purchase amount.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "adjustments": {
+          "description": "Total adjustment amount.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "utilized": {
+          "description": "Total Commitment usage.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "serviceOverage": {
+          "description": "Overage for Azure services.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "chargesBilledSeparately": {
+          "description": "Charges Billed separately.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "totalOverage": {
+          "description": "serviceOverage + chargesBilledSeparately.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "totalUsage": {
+          "description": "Azure service commitment + total Overage.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "azureMarketplaceServiceCharges": {
+          "description": "Total charges for Azure Marketplace.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "billingFrequency": {
+          "description": "The billing frequency.",
+          "type": "string",
+          "enum": [
+            "Month",
+            "Quarter",
+            "Year"
+          ],
+          "x-ms-enum": {
+            "name": "BillingFrequency",
+            "modelAsString": true
+          }
+        },
+        "priceHidden": {
+          "description": "Price is hidden or not.",
+          "type": "boolean",
+          "readOnly": true
+        },
+        "newPurchasesDetails": {
+          "description": "List of new purchases.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "description": "the name of new purchase.",
+                "type": "string",
+                "readOnly": true
+              },
+              "value": {
+                "description": "the value of new purchase.",
+                "type": "number",
+                "format": "decimal",
+                "readOnly": true
+              }
+            }
+          },
+          "readOnly": true
+        },
+        "adjustmentDetails": {
+          "description": "List of Adjustments (Promo credit, SIE credit etc.).",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "description": "the name of new adjustment.",
+                "type": "string",
+                "readOnly": true
+              },
+              "value": {
+                "description": "the value of new adjustment.",
+                "type": "number",
+                "format": "decimal",
+                "readOnly": true
+              }
+            }
+          },
+          "readOnly": true
+        }
+      }
+    },
+    "ReservationSummary": {
+      "description": "reservation summary resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ReservationSummaryProperties",
+          "title": "Reservation Summary properties"
+        }
+      }
+    },
+    "ReservationSummariesListResult": {
+      "description": "Result of listing reservation summaries.",
+      "properties": {
+        "value": {
+          "description": "The list of reservation summaries.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ReservationSummary"
+          }
+        },
+        "nextLink": {
+          "description": "The link (url) to the next page of results.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "ReservationSummaryProperties": {
+      "description": "The properties of the reservation summary.",
+      "properties": {
+        "reservationOrderId": {
+          "description": "The reservation order ID is the identifier for a reservation purchase. Each reservation order ID represents a single purchase transaction. A reservation order contains reservations. The reservation order specifies the VM size and region for the reservations.",
+          "type": "string",
+          "readOnly": true
+        },
+        "reservationId": {
+          "description": "The reservation ID is the identifier of a reservation within a reservation order. Each reservation is the grouping for applying the benefit scope and also specifies the number of instances to which the reservation benefit can be applied to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "skuName": {
+          "description": "This is the ARM Sku name. It can be used to join with the servicetype field in additoinalinfo in usage records.",
+          "type": "string",
+          "readOnly": true
+        },
+        "reservedHours": {
+          "description": "This is the total hours reserved. E.g. if reservation for 1 instance was made on 1 PM, this will be 11 hours for that day and 24 hours from subsequent days",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "usageDate": {
+          "description": "Data corresponding to the utilization record. If the grain of data is monthly, it will be first day of month.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "usedHours": {
+          "description": "Total used hours by the reservation",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "minUtilizationPercentage": {
+          "description": "This is the minimum hourly utilization in the usage time (day or month). E.g. if usage record corresponds to 12/10/2017 and on that for hour 4 and 5, utilization was 10%, this field will return 10% for that day",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "avgUtilizationPercentage": {
+          "description": "This is average utilization for the entire time range. (day or month depending on the grain)",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "maxUtilizationPercentage": {
+          "description": "This is the maximum hourly utilization in the usage time (day or month). E.g. if usage record corresponds to 12/10/2017 and on that for hour 4 and 5, utilization was 100%, this field will return 100% for that day.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        }
+      }
+    },
+    "ReservationDetail": {
+      "description": "reservation detail resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ReservationDetailProperties",
+          "title": "Reservation Detail properties"
+        }
+      }
+    },
+    "ReservationDetailsListResult": {
+      "description": "Result of listing reservation details.",
+      "properties": {
+        "value": {
+          "description": "The list of reservation details.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ReservationDetail"
+          }
+        },
+        "nextLink": {
+          "description": "The link (url) to the next page of results.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "ReservationDetailProperties": {
+      "description": "The properties of the reservation detail.",
+      "properties": {
+        "reservationOrderId": {
+          "description": "The reservation order ID is the identifier for a reservation purchase. Each reservation order ID represents a single purchase transaction. A reservation order contains reservations. The reservation order specifies the VM size and region for the reservations.",
+          "type": "string",
+          "readOnly": true
+        },
+        "reservationId": {
+          "description": "The reservation ID is the identifier of a reservation within a reservation order. Each reservation is the grouping for applying the benefit scope and also specifies the number of instances to which the reservation benefit can be applied to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "skuName": {
+          "description": "This is the ARM Sku name. It can be used to join with the servicetype field in additoinalinfo in usage records.",
+          "type": "string",
+          "readOnly": true
+        },
+        "reservedHours": {
+          "description": "This is the total hours reserved for the day. E.g. if reservation for 1 instance was made on 1 PM, this will be 11 hours for that day and 24 hours from subsequent days.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "usageDate": {
+          "description": "The date on which consumption occurred.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "usedHours": {
+          "description": "This is the total hours used by the instance.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "instanceId": {
+          "description": "This identifier is the name of the resource or the fully qualified Resource ID.",
+          "type": "string",
+          "readOnly": true
+        },
+        "totalReservedQuantity": {
+          "description": "This is the total count of instances that are reserved for the reservationid.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        }
+      }
+    },
+    "ReservationRecommendation": {
+      "description": "Reservation recommendation resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        },
+        {
+          "$ref": "#/definitions/ResourceAttributes"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ReservationRecommendationProperties",
+          "title": "Reservation Recommendation properties"
+        }
+      }
+    },
+    "ReservationRecommendationsListResult": {
+      "description": "Result of listing reservation recommendations.",
+      "properties": {
+        "value": {
+          "description": "The list of reservation recommendations.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ReservationRecommendation"
+          }
+        },
+        "nextLink": {
+          "description": "The link (url) to the next page of results.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "ReservationRecommendationProperties": {
+      "description": "The properties of the reservation recommendation.",
+      "properties": {
+        "lookBackPeriod": {
+          "description": "The number of days of usage to look back for recommendation.",
+          "type": "string",
+          "readOnly": true
+        },
+        "meterId": {
+          "description": "The meter id (GUID)",
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true
+        },
+        "term": {
+          "description": "RI recommendations in one or three year terms.",
+          "type": "string",
+          "readOnly": true
+        },
+        "costWithNoReservedInstances": {
+          "description": "The total amount of cost without reserved instances.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "recommendedQuantity": {
+          "description": "Recomended quality for reserved instances.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "totalCostWithReservedInstances": {
+          "description": "The total amount of cost with reserved instances.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "netSavings": {
+          "description": "Total estimated savings with reserved instances.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "firstUsageDate": {
+          "description": "The usage date for looking back.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "scope": {
+          "description": "Shared or single recommendation.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "TagsResult": {
+      "description": "A resource listing all tags.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ProxyResource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/TagProperties",
+          "title": "Tag properties"
+        }
+      }
+    },
+    "TagProperties": {
+      "description": "The properties of the tag.",
+      "properties": {
+        "tags": {
+          "description": "A list of Tag.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Tag"
+          }
+        }
+      }
+    },
+    "Tag": {
+      "description": "The tag resource.",
+      "properties": {
+        "key": {
+          "description": "Tag key.",
+          "type": "string"
+        }
+      }
+    },
+    "BudgetsListResult": {
+      "description": "Result of listing budgets. It contains a list of available budgets in the scope provided.",
+      "properties": {
+        "value": {
+          "description": "The list of budgets.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/Budget"
+          }
+        },
+        "nextLink": {
+          "description": "The link (url) to the next page of results.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "Budget": {
+      "description": "A budget resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ProxyResource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/BudgetProperties",
+          "title": "Budget properties"
+        }
+      }
+    },
+    "BudgetProperties": {
+      "description": "The properties of the budget.",
+      "properties": {
+        "category": {
+          "description": "The category of the budget, whether the budget tracks cost or usage.",
+          "type": "string",
+          "enum": [
+            "Cost",
+            "Usage"
+          ],
+          "x-ms-enum": {
+            "name": "CategoryType",
+            "modelAsString": true
+          }
+        },
+        "amount": {
+          "description": "The total amount of cost to track with the budget",
+          "type": "number",
+          "format": "decimal"
+        },
+        "timeGrain": {
+          "description": "The time covered by a budget. Tracking of the amount will be reset based on the time grain.",
+          "type": "string",
+          "enum": [
+            "Monthly",
+            "Quarterly",
+            "Annually"
+          ],
+          "x-ms-enum": {
+            "name": "TimeGrainType",
+            "modelAsString": true
+          }
+        },
+        "timePeriod": {
+          "description": "Has start and end date of the budget. The start date must be first of the month and should be less than the end date. Budget start date must be on or after June 1, 2017. Future start date should not be more than three months. Past start date should  be selected within the timegrain preiod. There are no restrictions on the end date.",
+          "$ref": "#/definitions/BudgetTimePeriod"
+        },
+        "filters": {
+          "description": "May be used to filter budgets by resource group, resource, or meter.",
+          "type": "object",
+          "$ref": "#/definitions/Filters"
+        },
+        "currentSpend": {
+          "description": "The current amount of cost which is being tracked for a budget.",
+          "$ref": "#/definitions/CurrentSpend",
+          "readOnly": true
+        },
+        "notifications": {
+          "type": "object",
+          "description": "Dictionary of notifications associated with the budget. Budget can have up to five notifications.",
+          "additionalProperties": {
+            "type": "object",
+            "$ref": "#/definitions/Notification"
+          },
+          "maxItems": 5
+        }
+      },
+      "required": [
+        "category",
+        "amount",
+        "timeGrain",
+        "timePeriod"
+      ]
+    },
+    "BudgetTimePeriod": {
+      "description": "The start and end date for a budget.",
+      "properties": {
+        "startDate": {
+          "description": "The start date for the budget.",
+          "type": "string",
+          "format": "date-time"
+        },
+        "endDate": {
+          "description": "The end date for the budget. If not provided, we default this to 10 years from the start date.",
+          "type": "string",
+          "format": "date-time"
+        }
+      },
+      "required": [
+        "startDate"
+      ]
+    },
+    "Filters": {
+      "description": "May be used to filter budgets by resource group, resource, or meter.",
+      "properties": {
+        "resourceGroups": {
+          "description": "The list of filters on resource groups, allowed at subscription level only.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "minItems": 0,
+          "maxItems": 10
+        },
+        "resources": {
+          "description": "The list of filters on resources.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "minItems": 0,
+          "maxItems": 10
+        },
+        "meters": {
+          "description": "The list of filters on meters (GUID), mandatory for budgets of usage category. ",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "minItems": 0,
+          "maxItems": 10
+        },
+        "tags": {
+          "type": "object",
+          "description": "The dictionary of filters on tags.",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "minItems": 0,
+          "maxItems": 10
+        }
+      }
+    },
+    "CurrentSpend": {
+      "description": "The current amount of cost which is being tracked for a budget.",
+      "properties": {
+        "amount": {
+          "description": "The total amount of cost which is being tracked by the budget.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "unit": {
+          "description": "The unit of measure for the budget amount.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "Notification": {
+      "description": "The notification associated with a budget.",
+      "properties": {
+        "enabled": {
+          "description": "The notification is enabled or not.",
+          "type": "boolean"
+        },
+        "operator": {
+          "description": "The comparison operator.",
+          "type": "string",
+          "enum": [
+            "EqualTo",
+            "GreaterThan",
+            "GreaterThanOrEqualTo"
+          ],
+          "x-ms-enum": {
+            "name": "OperatorType",
+            "modelAsString": true
+          }
+        },
+        "threshold": {
+          "description": "Threshold value associated with a notification. Notification is sent when the cost exceeded the threshold. It is always percent and has to be between 0 and 1000.",
+          "type": "number",
+          "format": "decimal"
+        },
+        "contactEmails": {
+          "description": "Email addresses to send the budget notification to when the threshold is exceeded.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "minItems": 1,
+          "maxItems": 50
+        },
+        "contactRoles": {
+          "description": "Contact roles to send the budget notification to when the threshold is exceeded.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "contactGroups": {
+          "description": "Action groups to send the budget notification to when the threshold is exceeded.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "minItems": 0,
+          "maxItems": 50
+        }
+      },
+      "required": [
+        "enabled",
+        "operator",
+        "threshold",
+        "contactEmails"
+      ]
+    },
+    "PriceSheetResult": {
+      "description": "An pricesheet resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PriceSheetModel",
+          "title": "Price sheet properties"
+        }
+      }
+    },
+    "PriceSheetModel": {
+      "description": "price sheet result. It contains the pricesheet associated with billing period",
+      "properties": {
+        "pricesheets": {
+          "description": "Price sheet",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/PriceSheetProperties"
+          }
+        },
+        "nextLink": {
+          "description": "The link (url) to the next page of results.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "PriceSheetProperties": {
+      "description": "The properties of the price sheet.",
+      "properties": {
+        "billingPeriodId": {
+          "description": "The id of the billing period resource that the usage belongs to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "meterId": {
+          "description": "The meter id (GUID)",
+          "type": "string",
+          "format": "uuid",
+          "readOnly": true
+        },
+        "meterDetails": {
+          "description": "The details about the meter. By default this is not populated, unless it's specified in $expand.",
+          "$ref": "#/definitions/MeterDetails",
+          "readOnly": true
+        },
+        "unitOfMeasure": {
+          "description": "Unit of measure",
+          "type": "string",
+          "readOnly": true
+        },
+        "includedQuantity": {
+          "description": "Included quality for an offer",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "partNumber": {
+          "description": "Part Number",
+          "type": "string",
+          "readOnly": true
+        },
+        "unitPrice": {
+          "description": "Unit Price",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "currencyCode": {
+          "description": "Currency Code",
+          "type": "string",
+          "readOnly": true
+        },
+        "offerId": {
+          "description": "Offer Id",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "Forecast": {
+      "description": "A forecast resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ForecastProperties",
+          "title": "Forecast properties"
+        }
+      }
+    },
+    "ForecastsListResult": {
+      "description": "Result of listing forecasts. It contains a list of available forecasts.",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "The list of forecasts.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/Forecast"
+          }
+        }
+      }
+    },
+    "ForecastProperties": {
+      "description": "The properties of the forecast charge.",
+      "type": "object",
+      "properties": {
+        "usageDate": {
+          "description": "The usage date of the forecast.",
+          "type": "string",
+          "readOnly": true
+        },
+        "grain": {
+          "description": "The granularity of forecast.",
+          "type": "string",
+          "enum": [
+            "Daily",
+            "Monthly",
+            "Yearly"
+          ],
+          "x-ms-enum": {
+            "name": "Grain",
+            "modelAsString": true
+          }
+        },
+        "charge": {
+          "description": "The amount of charge",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "currency": {
+          "description": "The ISO currency in which the meter is charged, for example, USD.",
+          "type": "string",
+          "readOnly": true
+        },
+        "chargeType": {
+          "description": "The type of the charge. Could be actual or forecast",
+          "type": "string",
+          "enum": [
+            "Actual",
+            "Forecast"
+          ],
+          "x-ms-enum": {
+            "name": "ChargeType",
+            "modelAsString": true
+          }
+        },
+        "confidenceLevels": {
+          "description": "The details about the forecast confidence levels. This is populated only when chargeType is Forecast.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "percentage": {
+                "description": "The percentage level of the confidence",
+                "type": "number",
+                "format": "decimal",
+                "readOnly": true
+              },
+              "bound": {
+                "description": "The boundary of the percentage, values could be 'Upper' or 'Lower'",
+                "type": "string",
+                "enum": [
+                  "Upper",
+                  "Lower"
+                ],
+                "x-ms-enum": {
+                  "name": "Bound",
+                  "modelAsString": true
+                }
+              },
+              "value": {
+                "description": "The amount of forecast within the percentage level",
+                "type": "number",
+                "format": "decimal",
+                "readOnly": true
+              }
+            }
+          },
+          "readOnly": true
+        }
+      }
+    },
+    "ManagementGroupAggregatedCostResult": {
+      "description": "A management group aggregated cost resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ManagementGroupAggregatedCostProperties",
+          "title": "Management Group Aggregated Cost properties"
+        }
+      }
+    },
+    "ManagementGroupAggregatedCostProperties": {
+      "description": "The properties of the Management Group Aggregated Cost.",
+      "type": "object",
+      "properties": {
+        "billingPeriodId": {
+          "description": "The id of the billing period resource that the aggregated cost belongs to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "usageStart": {
+          "description": "The start of the date time range covered by aggregated cost.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "usageEnd": {
+          "description": "The end of the date time range covered by the aggregated cost.",
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true
+        },
+        "azureCharges": {
+          "description": "Azure Charges.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "marketplaceCharges": {
+          "description": "Marketplace Charges.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "chargesBilledSeparately": {
+          "description": "Charges Billed Separately.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "currency": {
+          "description": "The ISO currency in which the meter is charged, for example, USD.",
+          "type": "string",
+          "readOnly": true
+        },
+        "children": {
+          "description": "Children of a management group",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ManagementGroupAggregatedCostResult"
+          }
+        },
+		"includedSubscriptions": {
+          "description": "List of subscription Guids included in the calculation of aggregated cost",
+		  "type": "array",
+          "items": {
+            "type": "string"
+           }
+        },
+		"excludedSubscriptions": {
+          "description": "List of subscription Guids excluded from the calculation of aggregated cost",
+		  "type": "array",
+          "items": {
+            "type": "string"
+           }
+        }
+      }
+    },
+    "ChargesListResult": {
+      "description": "Result of listing charge summary.",
+      "properties": {
+        "value": {
+          "description": "The list of charge summary",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/ChargeSummary"
+          }
+        }
+      }
+    },
+    "ChargeSummary": {
+      "description": "A charge summary resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ChargeSummaryProperties",
+          "title": "Charge summary properties"
+        }
+      }
+    },
+    "ChargeSummaryProperties": {
+      "description": "The properties of the charge summary.",
+      "type": "object",
+      "properties": {
+        "billingPeriodId": {
+          "description": "The id of the billing period resource that the charge belongs to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "usageStart": {
+          "description": "Usage start date.",
+          "type": "string",
+          "readOnly": true
+        },
+        "usageEnd": {
+          "description": " Usage end date.",
+          "type": "string",
+          "readOnly": true
+        },
+        "azureCharges": {
+          "description": "Azure Charges.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "chargesBilledSeparately": {
+          "description": "Charges Billed separately.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "marketplaceCharges": {
+          "description": "Marketplace Charges.",
+          "type": "number",
+          "format": "decimal",
+          "readOnly": true
+        },
+        "currency": {
+          "description": "Currency Code",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "ErrorDetails": {
+      "description": "The details of the error.",
+      "properties": {
+        "code": {
+          "description": "Error code.",
+          "type": "string",
+          "readOnly": true
+        },
+        "message": {
+          "description": "Error message indicating why the operation failed.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "ErrorResponse": {
+      "description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message.",
+      "type": "object",
+      "properties": {
+        "error": {
+          "description": "The details of the error.",
+          "$ref": "#/definitions/ErrorDetails"
+        }
+      }
+    },
+    "Operation": {
+      "description": "A Consumption REST API operation.",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Operation name: {provider}/{resource}/{operation}.",
+          "type": "string",
+          "readOnly": true
+        },
+        "display": {
+          "description": "The object that represents the operation.",
+          "properties": {
+            "provider": {
+              "description": "Service provider: Microsoft.Consumption.",
+              "type": "string",
+              "readOnly": true
+            },
+            "resource": {
+              "description": "Resource on which the operation is performed: UsageDetail, etc.",
+              "type": "string",
+              "readOnly": true
+            },
+            "operation": {
+              "description": "Operation type: Read, write, delete, etc.",
+              "type": "string",
+              "readOnly": true
+            }
+          }
+        }
+      }
+    },
+    "OperationListResult": {
+      "description": "Result of listing consumption operations. It contains a list of operations and a URL link to get the next set of results.",
+      "properties": {
+        "value": {
+          "description": "List of consumption operations supported by the Microsoft.Consumption resource provider.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/Operation"
+          }
+        },
+        "nextLink": {
+          "description": "URL to get the next set of operation list results if there are any.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "Resource": {
+      "description": "The Resource model definition.",
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource Id."
+        },
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name."
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource type."
+        },
+        "tags": {
+          "readOnly": true,
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags."
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "ResourceAttributes": {
+      "description": "The Resource model definition.",
+      "properties": {
+        "location": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource location"
+        },
+        "sku": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource sku"
+        }
+      }
+    },
+    "ProxyResource": {
+      "description": "The Resource model definition.",
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource Id."
+        },
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name."
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource type."
+        },
+        "eTag": {
+          "type": "string",
+          "description": "eTag of the resource. To handle concurrent update scenarion, this field will be used to determine whether the user is updating the latest version or not."
+        }
+      },
+      "x-ms-azure-resource": true
+    }
+  },
+  "parameters": {
+    "apiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "description": "Version of the API to be used with the client request. The current version is 2018-10-01."
+    },
+    "billingAccountIdParameter": {
+      "name": "billingAccountId",
+      "in": "path",
+      "description": "BillingAccount ID",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "departmentIdParameter": {
+      "name": "departmentId",
+      "in": "path",
+      "description": "Department ID",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "enrollmentAccountIdParameter": {
+      "name": "enrollmentAccountId",
+      "in": "path",
+      "description": "EnrollmentAccount ID",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "subscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "description": "Azure Subscription ID.",
+      "required": true,
+      "type": "string"
+    },
+    "resourceGroupNameParameter": {
+      "name": "resourceGroupName",
+      "in": "path",
+      "description": "Azure Resource Group Name.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "budgetNameParameter": {
+      "name": "budgetName",
+      "in": "path",
+      "description": "Budget Name.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "billingPeriodNameParameter": {
+      "name": "billingPeriodName",
+      "in": "path",
+      "description": "Billing Period Name.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "reservationOrderIdParameter": {
+      "name": "reservationOrderId",
+      "in": "path",
+      "description": "Order Id of the reservation",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "reservationIdParameter": {
+      "name": "reservationId",
+      "in": "path",
+      "description": "Id of the reservation",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "grainParameter": {
+      "name": "grain",
+      "description": "Can be daily or monthly",
+      "x-ms-parameter-location": "method",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "daily",
+        "monthly"
+      ],
+      "x-ms-enum": {
+        "name": "datagrain",
+        "modelAsString": true,
+        "values": [
+          {
+            "value": "daily",
+            "description": "Daily grain of data",
+            "name": "DailyGrain"
+          },
+          {
+            "value": "monthly",
+            "description": "Monthly grain of data",
+            "name": "MonthlyGrain"
+          }
+        ]
+      }
+    },
+	"managementGroupIdParameter": {
+      "name": "managementGroupId",
+      "in": "path",
+      "description": "Azure Management Group ID.",
+      "required": true,
+      "type": "string",
+	  "x-ms-parameter-location": "method"
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostByManagementGroup.json
new file mode 100644
index 000000000000..0a567a8ad034
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostByManagementGroup.json
@@ -0,0 +1,47 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "managementGroupId": "managementGroupForTest"
+  },
+  "responses": {
+    "200": {
+      "body": {
+		"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1",
+		"name": "aggregatedcostId1",
+		"type": "Microsoft.Consumption/aggregatedcost",
+		"properties": {
+			"includedSubscriptions": [
+				"1caaa5a3-2b66-438e-8ab4-bce37d518c5d"
+			],
+			"excludedSubscriptions": [],
+			"usageStart": "2018-10-01T00:00:00.0000000Z",
+			"usageEnd": "2018-10-31T00:00:00.0000000Z",
+			"azureCharges": 250.9876,
+			"marketplaceCharges": 150.786,
+			"chargesBilledSeparately": 120.345,
+			"currency": "USD",
+			"children": [
+			  {
+				"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2",
+				"name": "aggregatedcostId2",
+				"type": "Microsoft.Consumption/aggregatedcost",
+				"properties": {
+					"includedSubscriptions": [
+                        "c349567d-c83a-48c9-ab0e-578c69dc97a4"
+                    ],
+                    "excludedSubscriptions": [],					
+					"usageStart": "2018-10-01T00:00:00.0000000Z",
+					"usageEnd": "2018-10-31T00:00:00.0000000Z",
+					"azureCharges": 150.0,
+					"marketplaceCharges": 50.786,
+					"chargesBilledSeparately": 30.345,
+					"currency": "USD",
+					"children": []
+				}
+			  }
+		    ]
+		}
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostByManagementGroupFilterByDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostByManagementGroupFilterByDate.json
new file mode 100644
index 000000000000..ebeff92e8c2b
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostByManagementGroupFilterByDate.json
@@ -0,0 +1,48 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "managementGroupId": "managementGroupForTest",
+	"$filter": "usageStart ge '2018-08-15' and properties/usageStart le '2018-08-31'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+		"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1",
+		"name": "aggregatedcostId1",
+		"type": "Microsoft.Consumption/aggregatedcost",
+		"properties": {
+			"includedSubscriptions": [
+				"1caaa5a3-2b66-438e-8ab4-bce37d518c5d"
+			],
+			"excludedSubscriptions": [],
+			"usageStart": "2018-08-15T00:00:00.0000000Z",
+			"usageEnd": "2018-08-31T00:00:00.0000000Z",
+			"azureCharges": 150.9876,
+			"marketplaceCharges": 80.786,
+			"chargesBilledSeparately": 90.345,
+			"currency": "USD",
+			"children": [
+			  {
+				"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2",
+				"name": "aggregatedcostId2",
+				"type": "Microsoft.Consumption/aggregatedcost",
+				"properties": {
+					"includedSubscriptions": [
+                        "c349567d-c83a-48c9-ab0e-578c69dc97a4"
+                    ],
+                    "excludedSubscriptions": [],					
+					"usageStart": "2018-08-15T00:00:00.0000000Z",
+					"usageEnd": "2018-08-31T00:00:00.0000000Z",
+					"azureCharges": 50.0,
+					"marketplaceCharges": 10.786,
+					"chargesBilledSeparately": 30.345,
+					"currency": "USD",
+					"children": []                  
+				}
+			  }
+		    ]
+		}
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json
new file mode 100644
index 000000000000..b71bb1d6d2f5
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json
@@ -0,0 +1,40 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "managementGroupId": "managementGroupForTest",
+    "billingPeriodName": "201807"
+  },
+  "responses": {
+    "200": {
+      "body": {
+		"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1",
+		"name": "aggregatedcostId1",
+		"type": "Microsoft.Consumption/aggregatedcost",
+		"properties": {
+			"usageStart": "2018-07-01T00:00:00.0000000Z",
+			"usageEnd": "2018-07-31T00:00:00.0000000Z",
+			"azureCharges": 250.9876,
+			"marketplaceCharges": 150.786,
+			"chargesBilledSeparately": 120.345,
+			"currency": "USD",
+			"children": [
+			  {
+				"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2",
+				"name": "aggregatedcostId2",
+				"type": "Microsoft.Consumption/aggregatedcost",
+				"properties": {
+					"usageStart": "2018-07-01T00:00:00.0000000Z",
+					"usageEnd": "2018-07-31T00:00:00.0000000Z",
+					"azureCharges": 150.0,
+					"marketplaceCharges": 50.786,
+					"chargesBilledSeparately": 30.345,
+					"currency": "USD",
+					"children": []
+				}
+			  }
+		    ]
+		}
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BalancesByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BalancesByBillingAccount.json
new file mode 100644
index 000000000000..3f01b26c5f53
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BalancesByBillingAccount.json
@@ -0,0 +1,46 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",    
+    "billingAccountId": "123456"
+  },
+  "responses": {
+    "200": {
+      "body": {
+		"id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", 
+		"name": "balanceId1",
+		"type": "Microsoft.Consumption/balances",
+		"properties": {
+			"currency": "USD  ",
+			"beginningBalance": 3396469.19,
+			"endingBalance": 2922371.02,
+			"newPurchases": 0,
+			"adjustments": 0,
+			"utilized": 474098.17,
+			"serviceOverage": 0,
+			"chargesBilledSeparately": 0,
+			"totalOverage": 0,
+			"totalUsage": 474098.17,
+			"azureMarketplaceServiceCharges": 609.82,
+			"billingFrequency": "Month",
+			"priceHidden": false,
+			"newPurchasesDetails": [
+			 {
+				"name": "Promo Purchase",
+				"value": 1
+			 }
+			],
+			"adjustmentDetails": [
+			 {
+				"name": "Promo Credit",
+				"value": 1.1
+			 },
+			 {
+				"name": "SIE Credit",
+				"value": 1.0
+			 }
+			]
+		}
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BalancesByBillingAccountForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BalancesByBillingAccountForBillingPeriod.json
new file mode 100644
index 000000000000..fce905c79042
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BalancesByBillingAccountForBillingPeriod.json
@@ -0,0 +1,47 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "123456",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+		"id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1",
+		"name": "balanceId1",
+		"type": "Microsoft.Consumption/balances",
+		"properties": {
+			"currency": "USD  ",
+			"beginningBalance": 3396469.19,
+			"endingBalance": 2922371.02,
+			"newPurchases": 0,
+			"adjustments": 0,
+			"utilized": 474098.17,
+			"serviceOverage": 0,
+			"chargesBilledSeparately": 0,
+			"totalOverage": 0,
+			"totalUsage": 474098.17,
+			"azureMarketplaceServiceCharges": 609.82,
+			"billingFrequency": "Month",
+			"priceHidden": false,
+			"newPurchasesDetails": [
+			 {
+				"name": "Promo Purchase",
+				"value": 1
+			 }
+			],
+			"adjustmentDetails": [
+			 {
+				"name": "Promo Credit",
+				"value": 1.1
+			 },
+			 {
+				"name": "SIE Credit",
+				"value": 1.0
+			 }
+			]
+		}
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/Budget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/Budget.json
new file mode 100644
index 000000000000..89685f59aeef
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/Budget.json
@@ -0,0 +1,71 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "MYDEVTESTRG",
+    "budgetName": "TestBudget"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget",
+        "name": "TestBudget",
+        "type": "Microsoft.Consumption/budgets",
+        "eTag": "\"1d34d012214157f\"",
+        "properties": {
+          "category": "Cost",
+          "amount": 100.65,
+          "timeGrain": "Monthly",
+          "timePeriod": {
+            "startDate": "2017-10-01T00:00:00Z",
+            "endDate": "2018-10-31T00:00:00Z"
+          },
+          "filters": {
+            "resourceGroups": [
+              "MPDEVTESTRG"
+            ],
+            "resources": [
+              "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSVM2",
+              "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1"
+            ],
+            "meters": [
+              "00000000-0000-0000-0000-000000000000"
+            ],
+            "tags": {
+                "category": [
+                    "Dev",
+                    "Prod"
+                ],
+                "department": [
+                    "engineering",
+                    "sales"
+                ]
+            }
+          },
+          "currentSpend": {
+            "amount": 80.89,
+            "unit": "USD"
+          },
+          "notifications": {
+            "Actual_GreaterThan_80_Percent": {
+              "enabled": true,
+              "operator": "GreaterThan",
+              "threshold": 80,
+              "contactEmails": [
+                "johndoe@contoso.com",
+                "janesmith@contoso.com"
+              ],
+              "contactRoles": [
+                "Contributor",
+                "Reader"
+              ],
+              "contactGroups": [
+                "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BudgetsList.json
new file mode 100644
index 000000000000..1eb38097cf1e
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/BudgetsList.json
@@ -0,0 +1,159 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "MYDEVTESTRG"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget",
+            "name": "TestBudget",
+            "type": "Microsoft.Consumption/budgets",
+            "eTag": "\"1d34d012214157f\"",
+            "properties": {
+              "category": "Cost",
+              "amount": 100.65,
+              "timeGrain": "Monthly",
+              "timePeriod": {
+                "startDate": "2017-10-01T00:00:00Z",
+                "endDate": "2018-10-31T00:00:00Z"
+              },
+              "filters": {
+                "resourceGroups": [
+                  "MYDEVTESTRG"
+                ],
+                "resources": [
+                  "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2",
+                  "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1"
+                ],
+                "meters": [
+                  "00000000-0000-0000-0000-000000000000"
+                ],
+                "tags": {
+                    "category": [
+                        "Dev",
+                        "Prod"
+                    ],
+                    "department": [
+                        "engineering",
+                        "sales"
+                    ]
+                }
+              },
+              "currentSpend": {
+                "amount": 80.89,
+                "unit": "USD"
+              },
+              "notifications": {
+                "Actual_GreaterThan_80_Percent": {
+                  "enabled": true,
+                  "operator": "GreaterThan",
+                  "threshold": 80,
+                  "contactEmails": [
+                    "johndoe@contoso.com",
+                    "janesmith@contoso.com"
+                  ],
+                  "contactRoles": [
+                    "Contributor",
+                    "Reader"
+                  ]
+                },
+                "Actual_GreaterThanOrEqualTo_90_Percent": {
+                  "enabled": true,
+                  "operator": "GreaterThanOrEqualTo",
+                  "threshold": 90,
+                  "contactEmails": [
+                    "johndoe@contoso.com",
+                    "janesmith@contoso.com"
+                  ],
+                  "contactRoles": [
+                    "Contributor",
+                    "Reader"
+                  ],
+                  "contactGroups": [
+                    "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
+                  ]
+                }
+              }
+            }
+          },
+          {
+            "id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget",
+            "name": "TestBudget",
+            "type": "Microsoft.Consumption/budgets",
+            "eTag": "\"1d34d012214157f\"",
+            "properties": {
+              "category": "Cost",
+              "amount": 600.65,
+              "timeGrain": "Monthly",
+              "timePeriod": {
+                "startDate": "2017-10-01T00:00:00Z",
+                "endDate": "2018-10-31T00:00:00Z"
+              },
+              "filters": {
+                "resourceGroups": [
+                  "MYDEVTESTRG"
+                ],
+                "resources": [
+                  "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2",
+                  "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1"
+                ],
+                "meters": [
+                  "00000000-0000-0000-0000-000000000000"
+                ],
+                "tags": {
+                    "category": [
+                        "Dev",
+                        "Prod"
+                    ],
+                    "department": [
+                        "engineering",
+                        "sales"
+                    ]
+                }
+              },
+              "currentSpend": {
+                "amount": 120.89,
+                "unit": "USD"
+              },
+              "notifications": {
+                "Actual_GreaterThan_40_Percent": {
+                  "enabled": true,
+                  "operator": "GreaterThan",
+                  "threshold": 40,
+                  "contactEmails": [
+                    "johndoe@contoso.com",
+                    "janesmith@contoso.com"
+                  ],
+                  "contactRoles": [
+                    "Contributor",
+                    "Reader"
+                  ]
+                },
+                "Actual_GreaterThanOrEqualTo_60_Percent": {
+                  "enabled": true,
+                  "operator": "GreaterThanOrEqualTo",
+                  "threshold": 60,
+                  "contactEmails": [
+                    "johndoe@contoso.com",
+                    "janesmith@contoso.com"
+                  ],
+                  "contactRoles": [
+                    "Contributor",
+                    "Reader"
+                  ],
+                  "contactGroups": [
+                    "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesForBillingPeriodByDepartment.json
new file mode 100644
index 000000000000..99a957e2a3b7
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesForBillingPeriodByDepartment.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "1234",
+    "departmentId": "42425",
+    "billingPeriodName": "201804"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1",
+        "name": "chargeSummaryId1",
+        "type": "Microsoft.Consumption/charges",
+        "properties": {
+          "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804",
+          "usageStart": "2018-04-01",
+          "usageEnd": "2018-04-30",
+          "azureCharges": 5000.00,
+          "chargesBilledSeparately": 60.90,
+          "marketplaceCharges": 100.00,
+          "currency": "USD"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json
new file mode 100644
index 000000000000..b55de844b763
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "1234",
+    "enrollmentAccountId": "42425",
+    "billingPeriodName": "201804"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1",
+        "name": "chargeSummaryId1",
+        "type": "Microsoft.Consumption/charges",
+        "properties": {
+          "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804",
+          "usageStart": "2018-04-01",
+          "usageEnd": "2018-04-30",
+          "azureCharges": 5000.00,
+          "chargesBilledSeparately": 60.90,
+          "marketplaceCharges": 100.00,
+          "currency": "USD"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForDepartment.json
new file mode 100644
index 000000000000..d6b43c0c5afd
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForDepartment.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "1234",
+    "departmentId": "42425",
+    "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1",
+            "name": "chargeSummaryId1",
+            "type": "Microsoft.Consumption/charges",
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804",
+              "usageStart": "2018-04-01",
+              "usageEnd": "2018-04-30",
+              "azureCharges": 5000.00,
+              "chargesBilledSeparately": 60.90,
+              "marketplaceCharges": 100.00,
+              "currency": "USD"
+            }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2",
+            "name": "chargeSummaryId2",
+            "type": "Microsoft.Consumption/charges",
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805",
+              "usageStart": "2018-05-01",
+              "usageEnd": "2018-05-30",
+              "azureCharges": 5000.00,
+              "chargesBilledSeparately": 60.90,
+              "marketplaceCharges": 100.00,
+              "currency": "USD"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForDepartmentFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForDepartmentFilterByStartEndDate.json
new file mode 100644
index 000000000000..d6b43c0c5afd
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForDepartmentFilterByStartEndDate.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "1234",
+    "departmentId": "42425",
+    "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1",
+            "name": "chargeSummaryId1",
+            "type": "Microsoft.Consumption/charges",
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804",
+              "usageStart": "2018-04-01",
+              "usageEnd": "2018-04-30",
+              "azureCharges": 5000.00,
+              "chargesBilledSeparately": 60.90,
+              "marketplaceCharges": 100.00,
+              "currency": "USD"
+            }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2",
+            "name": "chargeSummaryId2",
+            "type": "Microsoft.Consumption/charges",
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805",
+              "usageStart": "2018-05-01",
+              "usageEnd": "2018-05-30",
+              "azureCharges": 5000.00,
+              "chargesBilledSeparately": 60.90,
+              "marketplaceCharges": 100.00,
+              "currency": "USD"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForEnrollmentAccount.json
new file mode 100644
index 000000000000..9a585552ca1a
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForEnrollmentAccount.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "1234",
+    "enrollmentAccountId": "42425",
+    "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1",
+            "name": "chargeSummaryId1",
+            "type": "Microsoft.Consumption/charges",
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804",
+              "usageStart": "2018-04-01",
+              "usageEnd": "2018-04-30",
+              "azureCharges": 5000.00,
+              "chargesBilledSeparately": 60.90,
+              "marketplaceCharges": 100.00,
+              "currency": "USD"
+            }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2",
+            "name": "chargeSummaryId2",
+            "type": "Microsoft.Consumption/charges",
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805",
+              "usageStart": "2018-05-01",
+              "usageEnd": "2018-05-30",
+              "azureCharges": 5000.00,
+              "chargesBilledSeparately": 60.90,
+              "marketplaceCharges": 100.00,
+              "currency": "USD"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json
new file mode 100644
index 000000000000..1d9fd3274f76
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json
@@ -0,0 +1,43 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "1234",
+    "enrollmentAccountId": "42425"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1",
+            "name": "chargeSummaryId1",
+            "type": "Microsoft.Consumption/charges",
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804",
+              "usageStart": "2018-04-01",
+              "usageEnd": "2018-04-30",
+              "azureCharges": 5000.00,
+              "chargesBilledSeparately": 60.90,
+              "marketplaceCharges": 100.00,
+              "currency": "USD"
+            }
+          },
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2",
+            "name": "chargeSummaryId2",
+            "type": "Microsoft.Consumption/charges",
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805",
+              "usageStart": "2018-05-01",
+              "usageEnd": "2018-05-30",
+              "azureCharges": 5000.00,
+              "chargesBilledSeparately": 60.90,
+              "marketplaceCharges": 100.00,
+              "currency": "USD"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/CreateOrUpdateBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/CreateOrUpdateBudget.json
new file mode 100644
index 000000000000..bf3ce764512a
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/CreateOrUpdateBudget.json
@@ -0,0 +1,184 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "MYDEVTESTRG",
+    "budgetName": "TestBudget",
+    "parameters": {
+      "eTag": "\"1d34d016a593709\"",
+      "properties": {
+        "category": "Cost",
+        "amount": 100.65,
+        "timeGrain": "Monthly",
+        "timePeriod": {
+          "startDate": "2017-10-01T00:00:00Z",
+          "endDate": "2018-10-31T00:00:00Z"
+        },
+        "filters": {
+          "resourceGroups": [
+            "MYDEVTESTRG"
+          ],
+          "resources": [
+            "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2",
+            "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1"
+          ],
+          "meters": [
+            "00000000-0000-0000-0000-000000000000"
+          ],
+          "tags": {
+              "category": [
+                  "Dev",
+                  "Prod"
+              ],
+              "department": [
+                  "engineering",
+                  "sales"
+              ]
+          }
+        },
+        "notifications": {
+          "Actual_GreaterThan_80_Percent": {
+            "enabled": true,
+            "operator": "GreaterThan",
+            "threshold": 80,
+            "contactEmails": [
+              "johndoe@contoso.com",
+              "janesmith@contoso.com"
+            ],
+            "contactRoles": [
+              "Contributor",
+              "Reader"
+            ],
+            "contactGroups": [
+              "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget",
+        "name": "TestBudget",
+        "type": "Microsoft.Consumption/budgets",
+        "eTag": "\"1d34d012214157f\"",
+        "properties": {
+          "category": "Cost",
+          "amount": 100.65,
+          "timeGrain": "Monthly",
+          "timePeriod": {
+            "startDate": "2017-10-01T00:00:00Z",
+            "endDate": "2018-10-31T00:00:00Z"
+          },
+          "filters": {
+            "resourceGroups": [
+              "MPDEVTESTRG"
+            ],
+            "resources": [
+              "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2",
+              "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1"
+            ],
+            "meters": [
+              "00000000-0000-0000-0000-000000000000"
+            ],
+            "tags": {
+                "category": [
+                    "Dev",
+                    "Prod"
+                ],
+                "department": [
+                    "engineering",
+                    "sales"
+                ]
+            }
+          },
+          "currentSpend": {
+            "amount": 80.89,
+            "unit": "USD"
+          },
+          "notifications": {
+            "Actual_GreaterThan_80_Percent": {
+              "enabled": true,
+              "operator": "GreaterThan",
+              "threshold": 80,
+              "contactEmails": [
+                "johndoe@contoso.com",
+                "janesmith@contoso.com"
+              ],
+              "contactRoles": [
+                "Contributor",
+                "Reader"
+              ],
+              "contactGroups": [
+                "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
+              ]
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "body": {
+        "id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget",
+        "name": "TestBudget",
+        "type": "Microsoft.Consumption/budgets",
+        "eTag": "\"1d34d012214157f\"",
+        "properties": {
+          "category": "Cost",
+          "amount": 100.65,
+          "timeGrain": "Monthly",
+          "timePeriod": {
+            "startDate": "2017-10-01T00:00:00Z",
+            "endDate": "2018-10-31T00:00:00Z"
+          },
+          "filters": {
+            "resourceGroups": [
+              "MPDEVTESTRG"
+            ],
+            "resources": [
+              "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2",
+              "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1"
+            ],
+            "meters": [
+              "00000000-0000-0000-0000-000000000000"
+            ],
+            "tags": {
+                "category": [
+                    "Dev",
+                    "Prod"
+                ],
+                "department": [
+                    "engineering",
+                    "sales"
+                ]
+            }
+          },
+          "currentSpend": {
+            "amount": 80.89,
+            "unit": "USD"
+          },
+          "notifications": {
+            "Actual_GreaterThan_80_Percent": {
+              "enabled": true,
+              "operator": "GreaterThan",
+              "threshold": 80,
+              "contactEmails": [
+                "johndoe@contoso.com",
+                "janesmith@contoso.com"
+              ],
+              "contactRoles": [
+                "Contributor",
+                "Reader"
+              ],
+              "contactGroups": [
+                "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/DeleteBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/DeleteBudget.json
new file mode 100644
index 000000000000..81ec4a459995
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/DeleteBudget.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "MYDEVTESTRG",
+    "budgetName": "TestBudget"
+  },
+  "responses": {
+    "200": {
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsList.json
new file mode 100644
index 000000000000..b5bc863eab64
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsList.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId1",
+            "name": "forecastId1",
+            "type": "Microsoft.Consumption/forecasts",
+            "properties": {
+              "usageDate": "2018-04-01",
+              "grain": "Daily",
+              "charge": 752.000000,
+              "currency": "USD",
+              "chargeType": "Actual",
+              "confidenceLevels": null
+            }
+          },
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId2",
+            "name": "forecastId2",
+            "type": "Microsoft.Consumption/forecasts",
+            "properties": {
+              "usageDate": "2018-04-02",
+              "grain": "Daily",
+              "charge": 753.809074,
+              "currency": "USD",
+              "chargeType": "Forecast",
+              "confidenceLevels": [
+                {
+                  "percentage": 95,
+                  "bound": "Upper",
+                  "value": 1165.951737
+                },
+                {
+                  "percentage": 95,
+                  "bound": "Lower",
+                  "value": 340.753404
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsListFilterByDates.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsListFilterByDates.json
new file mode 100644
index 000000000000..cb135d432af3
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsListFilterByDates.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "$filter": "usagedate ge '2018-04-01' AND usagedate le '2018-04-02'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId1",
+            "name": "forecastId1",
+            "type": "Microsoft.Consumption/forecasts",
+            "properties": {
+              "usageDate": "2018-04-01",
+              "grain": "Daily",
+              "charge": 752.000000,
+              "currency": "USD",
+              "chargeType": "Actual",
+              "confidenceLevels": null
+            }
+          },
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId2",
+            "name": "forecastId2",
+            "type": "Microsoft.Consumption/forecasts",
+            "properties": {
+              "usageDate": "2018-04-02",
+              "grain": "Daily",
+              "charge": 753.809074,
+              "currency": "USD",
+              "chargeType": "Forecast",
+              "confidenceLevels": [
+                {
+                  "percentage": 95,
+                  "bound": "Upper",
+                  "value": 1165.951737
+                },
+                {
+                  "percentage": 95,
+                  "bound": "Lower",
+                  "value": 340.753404
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsListFilterByGrain.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsListFilterByGrain.json
new file mode 100644
index 000000000000..aa7d510eb50f
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ForecastsListFilterByGrain.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "$filter": "Grain eq 'Monthly'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId1",
+            "name": "forecastId1",
+            "type": "Microsoft.Consumption/forecasts",
+            "properties": {
+              "usageDate": "2018-04-01",
+              "grain": "Monthly",
+              "charge": 752.000000,
+              "currency": "USD",
+              "chargeType": "Actual",
+              "confidenceLevels": null
+            }
+          },
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId2",
+            "name": "forecastId2",
+            "type": "Microsoft.Consumption/forecasts",
+            "properties": {
+              "usageDate": "2018-05-01",
+              "grain": "Monthly",
+              "charge": 753.809074,
+              "currency": "USD",
+              "chargeType": "Forecast",
+              "confidenceLevels": [
+                {
+                  "percentage": 95,
+                  "bound": "Upper",
+                  "value": 1165.951737
+                },
+                {
+                  "percentage": 95,
+                  "bound": "Lower",
+                  "value": 340.753404
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByBillingAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByBillingAccountList.json
new file mode 100644
index 000000000000..552fa130f927
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByBillingAccountList.json
@@ -0,0 +1,48 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",    
+    "billingAccountId": "123456"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", 
+            "name": "marketplaceId1",
+            "type": "Microsoft.Consumption/marketPlaces",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "accountName": "Account1",
+              "additionalProperties": "additionalProperties",
+              "costCenter": "Center1",
+              "departmentName": "Department1",
+              "billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "currency": "USD",
+              "consumedQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "offerName": "offer1",
+              "resourceGroup": "TEST",
+              "orderNumber": "00000000-0000-0000-0000-000000000000",
+              "publisherName": "xyz",
+              "planName": "plan1",
+              "resourceRate": 0.24,
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "azure subscription",
+              "unitOfMeasure": "10 Hours",
+              "isRecurringCharge": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json
new file mode 100644
index 000000000000..b2a70f93c2fd
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "123456",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
+            "name": "marketplacesId1",
+            "type": "Microsoft.Consumption/marketPlaces",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "accountName": "Account1",
+              "additionalProperties": "additionalProperties",
+              "costCenter": "Center1",
+              "departmentName": "Department1",
+              "billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "currency": "USD",
+              "consumedQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "offerName": "offer1",
+              "resourceGroup": "TEST",
+              "orderNumber": "00000000-0000-0000-0000-000000000000",
+              "publisherName": "xyz",
+              "planName": "plan2",
+              "resourceRate": 0.24,
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "azure subscription",
+              "unitOfMeasure": "10 Hours",
+              "isRecurringCharge": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByDepartmentList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByDepartmentList.json
new file mode 100644
index 000000000000..eb77536dc1ba
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByDepartmentList.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "departmentId": "123456",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
+            "name": "marketplacesId1",
+            "type": "Microsoft.Consumption/marketPlaces",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "accountName": "Account1",
+              "additionalProperties": "additionalProperties",
+              "costCenter": "Center1",
+              "departmentName": "Department1",
+              "billingPeriodId": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "currency": "USD",
+              "consumedQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "offerName": "offer1",
+              "resourceGroup": "TEST",
+              "orderNumber": "00000000-0000-0000-0000-000000000000",
+              "publisherName": "xyz",
+              "planName": "plan2",
+              "resourceRate": 0.24,
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "azure subscription",
+              "unitOfMeasure": "10 Hours",
+              "isRecurringCharge": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json
new file mode 100644
index 000000000000..eb77536dc1ba
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "departmentId": "123456",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
+            "name": "marketplacesId1",
+            "type": "Microsoft.Consumption/marketPlaces",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "accountName": "Account1",
+              "additionalProperties": "additionalProperties",
+              "costCenter": "Center1",
+              "departmentName": "Department1",
+              "billingPeriodId": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "currency": "USD",
+              "consumedQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "offerName": "offer1",
+              "resourceGroup": "TEST",
+              "orderNumber": "00000000-0000-0000-0000-000000000000",
+              "publisherName": "xyz",
+              "planName": "plan2",
+              "resourceRate": 0.24,
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "azure subscription",
+              "unitOfMeasure": "10 Hours",
+              "isRecurringCharge": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByEnrollmentAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByEnrollmentAccountList.json
new file mode 100644
index 000000000000..646b4ad3cce2
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByEnrollmentAccountList.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "enrollmentAccountId": "123456",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
+            "name": "marketplacesId1",
+            "type": "Microsoft.Consumption/marketPlaces",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "accountName": "Account1",
+              "additionalProperties": "additionalProperties",
+              "costCenter": "Center1",
+              "departmentName": "Department1",
+              "billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "currency": "USD",
+              "consumedQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "offerName": "offer1",
+              "resourceGroup": "TEST",
+              "orderNumber": "00000000-0000-0000-0000-000000000000",
+              "publisherName": "xyz",
+              "planName": "plan2",
+              "resourceRate": 0.24,
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "azure subscription",
+              "unitOfMeasure": "10 Hours",
+              "isRecurringCharge": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json
new file mode 100644
index 000000000000..646b4ad3cce2
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "enrollmentAccountId": "123456",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
+            "name": "marketplacesId1",
+            "type": "Microsoft.Consumption/marketPlaces",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "accountName": "Account1",
+              "additionalProperties": "additionalProperties",
+              "costCenter": "Center1",
+              "departmentName": "Department1",
+              "billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "currency": "USD",
+              "consumedQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "offerName": "offer1",
+              "resourceGroup": "TEST",
+              "orderNumber": "00000000-0000-0000-0000-000000000000",
+              "publisherName": "xyz",
+              "planName": "plan2",
+              "resourceRate": 0.24,
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "azure subscription",
+              "unitOfMeasure": "10 Hours",
+              "isRecurringCharge": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesList.json
new file mode 100644
index 000000000000..0fca8efbfe36
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesList.json
@@ -0,0 +1,48 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",    
+    "subscriptionId": "00000000-0000-0000-0000-000000000000"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketPlaces/marketplaceId1",
+            "name": "marketplaceId1",
+            "type": "Microsoft.Consumption/marketPlaces",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "accountName": "Account1",
+              "additionalProperties": "additionalProperties",
+              "costCenter": "Center1",
+              "departmentName": "Department1",
+              "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "currency": "USD",
+              "consumedQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "offerName": "offer1",
+              "resourceGroup": "TEST",
+              "orderNumber": "00000000-0000-0000-0000-000000000000",
+              "publisherName": "xyz",
+              "planName": "plan1",
+              "resourceRate": 0.24,
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "azure subscription",
+              "unitOfMeasure": "10 Hours",
+              "isRecurringCharge": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesListForBillingPeriod.json
new file mode 100644
index 000000000000..a23af29eb339
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/MarketplacesListForBillingPeriod.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "billingPeriodName": "201801"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketPlaces/marketplacesId1",
+            "name": "marketplacesId1",
+            "type": "Microsoft.Consumption/marketPlaces",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+			        "accountName": "Account1",
+			        "additionalProperties": "additionalProperties",
+			        "costCenter": "Center1",
+			        "departmentName": "Department1",
+              "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "currency": "USD",
+              "consumedQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "offerName": "offer1",
+              "resourceGroup": "TEST",
+              "orderNumber": "00000000-0000-0000-0000-000000000000",
+              "publisherName": "xyz",
+              "planName": "plan2",
+              "resourceRate": 0.24,
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "azure subscription",
+			        "unitOfMeasure": "10 Hours",
+			        "isRecurringCharge": false
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheet.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheet.json
new file mode 100644
index 000000000000..396cda0aa2dd
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheet.json
@@ -0,0 +1,34 @@
+{
+    "parameters":
+    {
+        "api-version": "2018-10-01",
+        "subscriptionId": "00000000-0000-0000-0000-000000000000"
+    },
+    "responses":
+    {
+        "200":
+        {
+            "body":
+            {
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/pricesheets/default",
+                "name": "default",
+                "type": "Microsoft.Consumption/pricesheets",
+                "properties":
+                {
+                    "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31&$skiptoken=AQAAAA%3D%3D",
+                    "pricesheets": [
+                    {
+                        "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
+                        "meterId": "00000000-0000-0000-0000-000000000000",
+                        "unitOfMeasure": "100 Hours",
+                        "includedQuantity": 100,
+                        "partNumber": "XX-11110",
+                        "unitPrice": 0.00328,
+                        "currencyCode": "EUR",
+                        "offerId":"OfferId 1"
+                    }]
+                }
+            }
+        }
+    }
+}
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheetExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheetExpand.json
new file mode 100644
index 000000000000..b26949deaa5b
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheetExpand.json
@@ -0,0 +1,45 @@
+{
+    "parameters":
+    {
+        "api-version": "2018-10-01",
+        "subscriptionId": "00000000-0000-0000-0000-000000000000",
+        "billingPeriodName": "201801",
+        "$expand": "meterDetails"
+    },
+    "responses":
+    {
+        "200":
+        {
+            "body":
+            {
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/pricesheets/default",
+                "name": "default",
+                "type": "Microsoft.Consumption/pricesheets",
+                "properties":
+                {
+                    "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31&$skiptoken=AQAAAA%3D%3D&$expand=properties/pricesheets/meterDetails",
+                    "pricesheets": [
+                    {
+                        "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
+                        "meterId": "00000000-0000-0000-0000-000000000000",
+                        "unitOfMeasure": "100 Hours",
+                        "includedQuantity": 100,
+                        "partNumber": "XX-11110",
+                        "unitPrice": 0.00328,
+                        "currencyCode": "EUR",
+                        "offerId":"OfferId 1",
+                        "meterDetails":
+                        {
+                            "meterName": "Data Transfer Out (GB)",
+                            "meterCategory": "Networking",
+                            "unit": "GB",
+                            "meterLocation": "Zone 2",
+                            "totalIncludedQuantity": 0,
+                            "pretaxStandardRate": 0.138
+                        }
+                    }]
+                }
+            }
+        }
+    }
+}
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheetForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheetForBillingPeriod.json
new file mode 100644
index 000000000000..44fa9b6f68ce
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/PriceSheetForBillingPeriod.json
@@ -0,0 +1,35 @@
+{
+    "parameters":
+    {
+        "api-version": "2018-10-01",
+        "subscriptionId": "00000000-0000-0000-0000-000000000000",
+        "billingPeriodName": "201801"
+    },
+    "responses":
+    {
+        "200":
+        {
+            "body":
+            {
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/pricesheets/default",
+                "name": "default",
+                "type": "Microsoft.Consumption/pricesheets",
+                "properties":
+                {
+                    "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31",
+                    "pricesheets": [
+                    {
+                        "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
+                        "meterId": "00000000-0000-0000-0000-000000000000",
+                        "unitOfMeasure": "100 Hours",
+                        "includedQuantity": 100,
+                        "partNumber": "XX-11110",
+                        "unitPrice": 0.00328,
+                        "currencyCode": "EUR",
+                        "offerId":"OfferId 1"
+                    }]
+                }
+            }
+        }
+    }
+}
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationDetails.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationDetails.json
new file mode 100644
index 000000000000..ec1c691c37dd
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationDetails.json
@@ -0,0 +1,34 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+    "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationDetails/20171129",
+            "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171129",
+            "type": "Microsoft.Consumption/reservationDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+              "reservationId": "00000000-0000-0000-0000-000000000000",
+              "usageDate": "2017-11-29T00:00:00Z",
+              "skuName": "Standard_D2_v2",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/wvn-sql/providers/microsoft.compute/virtualmachines/abc-sql2014sp33",
+              "totalReservedQuantity": 1.000000000000000,
+              "reservedHours": 24.000000000000000,
+              "usedHours": 24.000000000000000
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationDetailsWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationDetailsWithReservationId.json
new file mode 100644
index 000000000000..8ee3d58e1872
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationDetailsWithReservationId.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+    "reservationId": "00000000-0000-0000-0000-000000000000",
+    "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationDetails/20171129",
+            "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171129",
+            "type": "Microsoft.Consumption/reservationDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+              "reservationId": "00000000-0000-0000-0000-000000000000",
+              "usageDate": "2017-11-29T00:00:00Z",
+              "skuName": "Standard_D2_v2",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/wvn-sql/providers/microsoft.compute/virtualmachines/wvn-sql2014sp33",
+              "totalReservedQuantity": 1.000000000000000,
+              "reservedHours": 24.000000000000000,
+              "usedHours": 24.000000000000000
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json
new file mode 100644
index 000000000000..1788d2142a5b
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json
@@ -0,0 +1,52 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "$filter": "properties/scope eq 'Single' AND properties/lookBackPeriod eq 'Last7Days'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations/reservationRecommendations1",
+            "name": "reservationRecommendations1",
+            "type": "Microsoft.Consumption/reservationRecommendations",
+            "sku": "Standard_DS1_v2",
+            "location": "northeurope",
+            "properties": {
+              "lookBackPeriod": "Last7Days",
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "term": "P1Y",
+              "costWithNoReservedInstances": 0.0,
+              "recommendedQuantity": 1,
+              "totalCostWithReservedInstances": 0.0,
+              "netSavings": 4.634521202630137,
+              "firstUsageDate": "2018-03-06T00:00:00Z",
+              "scope": "Single"
+            }
+          },
+          {
+            "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations/reservationRecommendations2",
+            "name": "reservationRecommendations2",
+            "type": "Microsoft.Consumption/reservationRecommendations",
+            "sku": "Standard_DS1_v2",
+            "location": "northeurope",
+            "properties": {
+              "lookBackPeriod": "Last7Days",
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "term": "P3Y",
+              "costWithNoReservedInstances": 0.0,
+              "recommendedQuantity": 1,
+              "totalCostWithReservedInstances": 0.0,
+              "netSavings": 7.2893157231780812,
+              "firstUsageDate": "2018-03-06T00:00:00Z",
+              "scope": "Single"
+            }
+          }
+        ],
+        "nextLink" : "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations?api-version=2018-03-31&$filter=properties/scope+eq+'Single'+AND+properties/lookBackPeriod+eq+'Last7Days'&$skiptoken=AQAAAA%3D%3D&"      
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationRecommendationsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationRecommendationsList.json
new file mode 100644
index 000000000000..948b29713ccf
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationRecommendationsList.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations/reservationRecommendations1",
+            "name": "reservationRecommendations1",
+            "type": "Microsoft.Consumption/reservationRecommendations",
+            "sku": "Standard_DS1_v2",
+            "location": "northeurope",
+            "properties": {
+              "lookBackPeriod": "Last7Days",
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "term": "P1Y",
+              "costWithNoReservedInstances": 0.0,
+              "recommendedQuantity": 1,
+              "totalCostWithReservedInstances": 0.0,
+              "netSavings": 4.634521202630137,
+              "firstUsageDate": "2018-03-06T00:00:00Z",
+              "scope": "Single"
+            }
+          },
+          {
+            "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations/reservationRecommendations2",
+            "name": "reservationRecommendations2",
+            "type": "Microsoft.Consumption/reservationRecommendations",
+            "sku": "Standard_DS1_v2",
+            "location": "northeurope",
+            "properties": {
+              "lookBackPeriod": "Last7Days",
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "term": "P3Y",
+              "costWithNoReservedInstances": 0.0,
+              "recommendedQuantity": 1,
+              "totalCostWithReservedInstances": 0.0,
+              "netSavings": 7.2893157231780812,
+              "firstUsageDate": "2018-03-06T00:00:00Z",
+              "scope": "Single"
+            }
+          }
+        ],
+        "nextLink" : "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations?api-version=2018-03-31&$skiptoken=AQAAAA%3D%3D&"      
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesDaily.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesDaily.json
new file mode 100644
index 000000000000..4c04b590a33f
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesDaily.json
@@ -0,0 +1,36 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+    "grain":"daily",
+    "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-11-20'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20171001",
+            "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171001",
+            "type": "Microsoft.Consumption/reservationsummaries",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+              "reservationId": "00000000-0000-0000-0000-000000000000",
+              "skuName": "Standard_D8s_v3",
+              "reservedHours": 0.0,
+              "usageDate": "2017-10-01T00:00:00Z",
+              "usedHours": 0.0,
+              "minUtilizationPercentage": 0.0,
+              "avgUtilizationPercentage": 0.0,
+              "maxUtilizationPercentage": 0.0
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesDailyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesDailyWithReservationId.json
new file mode 100644
index 000000000000..af67081aaa23
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesDailyWithReservationId.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+    "reservationId": "00000000-0000-0000-0000-000000000000",
+    "grain":"daily",
+    "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-11-20'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20171001",
+            "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171001",
+            "type": "Microsoft.Consumption/reservationsummaries",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+              "reservationId": "00000000-0000-0000-0000-000000000000",
+              "skuName": "Standard_D8s_v3",
+              "reservedHours": 0.0,
+              "usageDate": "2017-10-01T00:00:00Z",
+              "usedHours": 0.0,
+              "minUtilizationPercentage": 0.0,
+              "avgUtilizationPercentage": 0.0,
+              "maxUtilizationPercentage": 0.0
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesMonthly.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesMonthly.json
new file mode 100644
index 000000000000..5aee21c657f8
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesMonthly.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+    "grain":"monthly"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20171001",
+            "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171001",
+            "type": "Microsoft.Consumption/reservationsummaries",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+              "reservationId": "00000000-0000-0000-0000-000000000000",
+              "skuName": "Standard_D8s_v3",
+              "reservedHours": 0.0,
+              "usageDate": "2017-10-01T00:00:00Z",
+              "usedHours": 0.0,
+              "minUtilizationPercentage": 0.0,
+              "avgUtilizationPercentage": 0.0,
+              "maxUtilizationPercentage": 0.0
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesMonthlyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesMonthlyWithReservationId.json
new file mode 100644
index 000000000000..712ad858def6
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/ReservationSummariesMonthlyWithReservationId.json
@@ -0,0 +1,36 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+    "reservationId": "00000000-0000-0000-0000-000000000000",
+    "grain":"monthly"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20171001",
+            "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171001",
+            "type": "Microsoft.Consumption/reservationsummaries",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "reservationOrderId": "00000000-0000-0000-0000-000000000000",
+              "reservationId": "00000000-0000-0000-0000-000000000000",
+              "skuName": "Standard_D8s_v3",
+              "reservedHours": 0.0,
+              "usageDate": "2017-10-01T00:00:00Z",
+              "usedHours": 0.0,
+              "minUtilizationPercentage": 0.0,
+              "avgUtilizationPercentage": 0.0,
+              "maxUtilizationPercentage": 0.0
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/Tags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/Tags.json
new file mode 100644
index 000000000000..cbf624aad895
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/Tags.json
@@ -0,0 +1,47 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "12345"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/tags/tags1",
+        "name": "tags1",
+        "type": "Microsoft.Consumption/tags",
+        "eTag": "\"1d34d012214157f\"",
+        "properties": {
+          "tags": [
+            {
+              "key": "Department"
+            },
+            {
+              "key": "CostCenter"
+            },
+            {
+              "key": "Portal"
+            },
+            {
+              "key": "OrgName"
+            },
+            {
+              "key": "Namespace"
+            },
+            {
+              "key": "resourceType"
+            },
+            {
+              "key": "Subsystem"
+            },
+            {
+              "key": "Environment"
+            },
+            {
+              "key": "clusterName"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsExpand.json
new file mode 100644
index 000000000000..220581576d98
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsExpand.json
@@ -0,0 +1,65 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "billingPeriodName": "201702",
+    "$expand": "meterDetails,additionalProperties",
+    "$filter": "properties/usageEnd ge '2018-01-14' AND properties/usageEnd le '2018-02-14' AND tags eq 'dev:tools'",
+    "$top": 1
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "meterDetails": {
+                "meterName": "Data Transfer Out (GB)",
+                "meterCategory": "Networking",
+                "unit": "GB",
+                "meterLocation": "Zone 2",
+                "totalIncludedQuantity": 0,
+                "pretaxStandardRate": 0.138,
+                "serviceName":"Bandwidth",
+                "serviceTier":"Bandwidth - Outbound Data Transfer"
+              },
+              "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
+              "subscriptionName": "Dummy subscription",
+              "accountName": "My account name",
+              "departmentName": "My department name",
+              "product": "My product name",
+              "consumedService": "My consumed service",
+              "costCenter": "Cost center 1",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West",
+              "additionalProperties": "{\"MyType\":\"\",\"ServiceType\":\"\",\"VMName\":\"\",\"UsageType\":\"MyUsage\"}"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsList.json
new file mode 100644
index 000000000000..e40d20524463
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsList.json
@@ -0,0 +1,43 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByBillingAccount.json
new file mode 100644
index 000000000000..01d06c006d14
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByBillingAccount.json
@@ -0,0 +1,45 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "1234"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id":
+            "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": 
+              "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByDepartment.json
new file mode 100644
index 000000000000..99cba183f6bf
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByDepartment.json
@@ -0,0 +1,45 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "departmentId": "1234"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id":
+            "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": 
+              "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByEnrollmentAccount.json
new file mode 100644
index 000000000000..50761a6a5b96
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByEnrollmentAccount.json
@@ -0,0 +1,45 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "enrollmentAccountId": "1234"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id":
+            "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": 
+              "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByManagementGroup.json
new file mode 100644
index 000000000000..e47f3719e2ad
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListByManagementGroup.json
@@ -0,0 +1,70 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "managementGroupId": "managementGroupForTest"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201808",
+              "usageStart": "2018-08-13T00:00:00Z",
+              "usageEnd": "2018-08-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          },
+		  {
+            "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201808",
+              "usageStart": "2018-08-13T00:00:00Z",
+              "usageEnd": "2018-08-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00120,
+              "billableQuantity": 0.00128,
+              "pretaxCost": 0.26,
+              "isEstimated": false,
+              "meterId": "11111111-1111-1111-1111-111111111111",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"11111111-1111-1111-1111-111111111111",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListFilterByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListFilterByTag.json
new file mode 100644
index 000000000000..aa214dd95834
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListFilterByTag.json
@@ -0,0 +1,43 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "$filter": "tags eq 'dev:tools'"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriod.json
new file mode 100644
index 000000000000..5acf75b6aec3
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriod.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json
new file mode 100644
index 000000000000..912722a0805f
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "billingAccountId": "1234",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByDepartment.json
new file mode 100644
index 000000000000..fe4c93d16946
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByDepartment.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "departmentId": "1234",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json
new file mode 100644
index 000000000000..502e8e52cf50
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "enrollmentAccountId": "1234",
+    "billingPeriodName": "201702"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702",
+              "invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/invoices/201703-123456789",
+              "usageStart": "2017-02-13T00:00:00Z",
+              "usageEnd": "2017-02-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json
new file mode 100644
index 000000000000..30c4b50e9b47
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json
@@ -0,0 +1,71 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "managementGroupId": "managementGroupForTest",
+    "billingPeriodName": "201807"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180701/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201807",
+              "usageStart": "2018-07-13T00:00:00Z",
+              "usageEnd": "2018-07-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00328,
+              "billableQuantity": 0.00328,
+              "pretaxCost": 0.67,
+              "isEstimated": false,
+              "meterId": "00000000-0000-0000-0000-000000000000",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"00000000-0000-0000-0000-000000000000",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          },
+		  {
+            "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/20180701/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "env": "newcrp",
+              "dev": "tools"
+            },
+            "properties": {
+              "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201807",
+              "usageStart": "2018-07-13T00:00:00Z",
+              "usageEnd": "2018-07-13T23:59:59Z",
+              "instanceName": "shared1",
+              "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
+              "instanceLocation": "eastasia",
+              "currency": "USD",
+              "usageQuantity": 0.00120,
+              "billableQuantity": 0.00128,
+              "pretaxCost": 0.26,
+              "isEstimated": false,
+              "meterId": "11111111-1111-1111-1111-111111111111",
+              "partNumber":"Part Number 1",
+              "resourceGuid":"11111111-1111-1111-1111-111111111111",
+              "offerId":"Offer Id 1",
+              "chargesBilledSeparately":true,
+              "location":"EU West"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json
new file mode 100644
index 000000000000..9da109cc935e
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "billingPeriodName": "201803",
+    "$apply": "groupby((tags))"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "description": "Azure VCAP STA - RDS Server"
+            },
+            "properties": {
+              "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301",
+              "usageQuantity": 11.11111,
+              "pretaxCost": 0,
+              "currency": "USD"
+            }
+          },
+          {
+            "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "description": "Domain controller - STA"
+            },
+            "properties": {
+              "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301",
+              "usageQuantity": 111.11111111111,
+              "pretaxCost": 0,
+              "currency": "USD"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListGroupByTagDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListGroupByTagDate.json
new file mode 100644
index 000000000000..0ce084093597
--- /dev/null
+++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-10-01/examples/UsageDetailsListGroupByTagDate.json
@@ -0,0 +1,47 @@
+{
+  "parameters": {
+    "api-version": "2018-10-01",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "$apply": "groupby((tags,properties/usageStart))"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "description": "Azure VCAP STA - RDS Server"
+            },
+            "properties": {
+              "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301",
+              "usageStart": "2018-03-01T00:00:00.0000000Z",
+              "usageEnd": "2018-03-01T23:59:59.0000000Z",
+              "usageQuantity": 11.11111,
+              "pretaxCost": 0,
+              "currency": "USD"
+            }
+          },
+          {
+            "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301/providers/Microsoft.Consumption/usageDetails/usageDetailsId1",
+            "name": "usageDetailsId1",
+            "type": "Microsoft.Consumption/usageDetails",
+            "tags": {
+              "description": "Azure VCAP STA - RDS Server"
+            },
+            "properties": {
+              "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301",
+              "usageStart": "2018-03-02T00:00:00.0000000Z",
+              "usageEnd": "2018-03-02T23:59:59.0000000Z",
+              "usageQuantity": 1.11111111111,
+              "pretaxCost": 0,
+              "currency": "USD"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/consumption/resource-manager/readme.go.md b/specification/consumption/resource-manager/readme.go.md
new file mode 100644
index 000000000000..46dadcc2948b
--- /dev/null
+++ b/specification/consumption/resource-manager/readme.go.md
@@ -0,0 +1,98 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: consumption
+  clear-output-folder: true
+```
+
+### Go multi-api
+``` yaml $(go) && $(multiapi)
+batch:
+   - tag: package-2017-04-preview
+   - tag: package-2017-11
+   - tag: package-2017-12-preview
+   - tag: package-2018-01
+   - tag: package-2018-03
+   - tag: package-2018-05
+   - tag: package-2018-06
+   - tag: package-2018-08
+   - tag: package-2018-10
+```
+
+
+### Tag: package-2017-04-preview and go
+
+These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-04-24-preview/$(namespace)
+```
+
+### Tag: package-2017-11 and go
+These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-11' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-11-30/$(namespace)
+```
+
+### Tag: package-2017-12-preview and go
+These settings apply only when `--tag=package-2017-12-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-12-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-12-30-preview/$(namespace)
+```
+
+### Tag: package-2018-01 and go
+These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-01-31/$(namespace)
+```
+
+### Tag: package-2018-03 and go
+These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-03-31/$(namespace)
+```
+
+### Tag: package-2018-05 and go
+These settings apply only when `--tag=package-2018-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-05' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-05-31/$(namespace)
+```
+
+### Tag: package-2018-06 and go
+These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-06-30/$(namespace)
+```
+
+### Tag: package-2018-08 and go
+These settings apply only when `--tag=package-2018-08 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-08' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-08-31/$(namespace)
+```
+
+### Tag: package-2018-10 and go
+These settings apply only when `--tag=package-2018-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-10' && $(go)
+output-folder: $(go-sdk-folder)/services/consumption/mgmt/2018-10-01/consumption
+```
diff --git a/specification/consumption/resource-manager/readme.md b/specification/consumption/resource-manager/readme.md
index 50c9f200602d..8a253969a640 100644
--- a/specification/consumption/resource-manager/readme.md
+++ b/specification/consumption/resource-manager/readme.md
@@ -26,7 +26,7 @@ These are the global settings for the Consumption API.
 
 ``` yaml
 openapi-type: arm
-tag: package-2018-08
+tag: package-2018-10
 ```
 
 ### Tag: package-2017-11
@@ -88,6 +88,16 @@ input-file:
 - Microsoft.Consumption/stable/2018-08-31/consumption.json
 ```
 
+---
+### Tag: package-2018-10
+
+These settings apply only when `--tag=package-2018-10` is specified on the command line.
+
+``` yaml $(tag) == 'package-2018-10'
+input-file:
+- Microsoft.Consumption/stable/2018-10-01/consumption.json
+```
+
 ## Suppression
 ``` yaml
 directive:
@@ -130,6 +140,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -179,98 +190,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-consumption
 ```
 
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: consumption
-  clear-output-folder: true
-```
-
-### Go multi-api
-``` yaml $(go) && $(multiapi)
-batch:
-   - tag: package-2017-04-preview
-   - tag: package-2017-11
-   - tag: package-2017-12-preview
-   - tag: package-2018-01
-   - tag: package-2018-03
-   - tag: package-2018-05
-   - tag: package-2018-06
-   - tag: package-2018-08
-```
-
-
-### Tag: package-2017-04-preview and go
-
-These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/consumption/mgmt/2017-04-24-preview/consumption
-```
-
-### Tag: package-2017-11 and go
-These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-11' && $(go)
-output-folder: $(go-sdk-folder)/services/consumption/mgmt/2017-11-30/consumption
-```
-
-### Tag: package-2017-12-preview and go
-These settings apply only when `--tag=package-2017-12-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-12-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/consumption/mgmt/2017-12-30-preview/consumption
-```
-
-### Tag: package-2018-01 and go
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/consumption/mgmt/2018-01-31/consumption
-```
-
-### Tag: package-2018-03 and go
-These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-03' && $(go)
-output-folder: $(go-sdk-folder)/services/consumption/mgmt/2018-03-31/consumption
-```
-
-### Tag: package-2018-05 and go
-These settings apply only when `--tag=package-2018-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-05' && $(go)
-output-folder: $(go-sdk-folder)/services/consumption/mgmt/2018-05-31/consumption
-```
-
-### Tag: package-2018-06 and go
-These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-06' && $(go)
-output-folder: $(go-sdk-folder)/services/consumption/mgmt/2018-06-30/consumption
-```
-
-### Tag: package-2018-08 and go
-These settings apply only when `--tag=package-2018-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-08' && $(go)
-output-folder: $(go-sdk-folder)/services/consumption/mgmt/2018-08-31/consumption
-```
-
-
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
@@ -297,6 +216,7 @@ batch:
   - tag: package-2018-05
   - tag: package-2018-06
   - tag: package-2018-08
+  - tag: package-2018-10
 ```
 
 ### Tag: package-2017-04-preview and java
@@ -403,3 +323,16 @@ regenerate-manager: true
 generate-interface: true
 ```
 
+### Tag: package-2018-10 and java
+
+These settings apply only when `--tag=package-2018-10 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
+
+``` yaml $(tag) == 'package-2018-10' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.consumption.v2018_10_01
+  output-folder: $(azure-libraries-for-java-folder)/consumption/resource-manager/v2018_10_01
+regenerate-manager: true
+generate-interface: true
+```
+
diff --git a/specification/consumption/resource-manager/readme.typescript.md b/specification/consumption/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..96078aaff521
--- /dev/null
+++ b/specification/consumption/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-consumption"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-consumption"
+  generate-metadata: true
+```
diff --git a/specification/containerinstance/resource-manager/readme.go.md b/specification/containerinstance/resource-manager/readme.go.md
index 42184c9536e2..337b7b5056c8 100644
--- a/specification/containerinstance/resource-manager/readme.go.md
+++ b/specification/containerinstance/resource-manager/readme.go.md
@@ -29,7 +29,7 @@ These settings apply only when `--tag=package-2018-10 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-10' && $(go)
-output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-10-01/containerinstance
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-10-01/$(namespace)
 ```
 
 ### Tag: package-2018-09 and go
@@ -38,7 +38,7 @@ These settings apply only when `--tag=package-2018-09 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-09' && $(go)
-output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-09-01/containerinstance
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-09-01/$(namespace)
 ```
 
 ### Tag: package-2018-06 and go
@@ -47,7 +47,7 @@ These settings apply only when `--tag=package-2018-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-06' && $(go)
-output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-06-01/containerinstance
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-06-01/$(namespace)
 ```
 
 ### Tag: package-2018-04 and go
@@ -56,7 +56,7 @@ These settings apply only when `--tag=package-2018-04 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-04' && $(go)
-output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-04-01/containerinstance
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-04-01/$(namespace)
 ```
 
 ### Tag: package-2018-02-preview and go
@@ -65,7 +65,7 @@ These settings apply only when `--tag=package-2018-02-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-02-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-02-01-preview/$(namespace)
 ```
 
 ### Tag: package-2017-12-preview and go
@@ -74,7 +74,7 @@ These settings apply only when `--tag=package-2017-12-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-12-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-12-01-preview/containerinstance
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-12-01-preview/$(namespace)
 ```
 
 ### Tag: package-2017-10-preview and go
@@ -83,7 +83,7 @@ These settings apply only when `--tag=package-2017-10-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-10-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-10-01-preview/containerinstance
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-10-01-preview/$(namespace)
 ```
 
 ### Tag: package-2017-08-preview and go
@@ -92,5 +92,5 @@ These settings apply only when `--tag=package-2017-08-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-08-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-08-01-preview/containerinstance
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-08-01-preview/$(namespace)
 ```
diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md
index a2b641fda938..62f70ee7c491 100644
--- a/specification/containerinstance/resource-manager/readme.md
+++ b/specification/containerinstance/resource-manager/readme.md
@@ -126,6 +126,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -177,6 +178,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-containerinstance
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/containerinstance/resource-manager/readme.typescript.md b/specification/containerinstance/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..7f4639a78bea
--- /dev/null
+++ b/specification/containerinstance/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-containerinstance"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-containerinstance"
+  generate-metadata: true
+```
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/containerregistry.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/containerregistry.json
new file mode 100644
index 000000000000..219039288eb5
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/containerregistry.json
@@ -0,0 +1,1435 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "description": "V2 API definition for the Azure Container Registry runtime",
+        "version": "2018-08-10-preview",
+        "title": "Azure Container Registry"
+    },
+    "host": "acrapi.azurecr-test.io",
+    "tags": [{
+        "name": "v2",
+        "description": "Root API"
+    }, {
+        "name": "Manifest",
+        "description": "Everything about manfests"
+    }, {
+        "name": "Tag",
+        "description": "Everything about tags"
+    }, {
+        "name": "Layer",
+        "description": "Everything about layers"
+    }, {
+        "name": "Repository",
+        "description": "Everyting about repository"
+    }, {
+        "name": "AcrRepository",
+        "description": "ACR APIs related to repositories"
+    }, {
+        "name": "AcrManifest",
+        "description": "ACR APIs related to manifests"
+    }, {
+        "name": "AcrTag",
+        "description": "ACR APIs related to tags"
+    }],
+    "schemes": ["https"],
+    "security": [{
+        "registry_auth": []
+    }],
+    "produces": [
+        "application/json"
+    ],
+    "paths": {
+        "/v2/": {
+            "get": {
+                "tags": ["v2"],
+                "description": "Tells whether this Docker Registry instance supports Docker Registry HTTP API v2",
+                "x-ms-examples": {
+                    "Check Docker Registry V2 Support": { "$ref": "./examples/GetDockerRegistryV2Support.json" }
+                },
+                "operationId": "GetDockerRegistryV2Support",
+                "responses": {
+                    "200": {
+                        "description": "Successful response. API v2 supported"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/v2/{name}/tags/list": {
+            "get": {
+                "tags": ["Tag"],
+                "description": "Fetch the tags under the repository identified by 'name'",
+                "x-ms-examples": {
+                    "List tags": { "$ref": "./examples/GetTagList.json" }
+                },
+                "operationId": "GetTagList",
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "Gives a list of tags for the names repository.",
+                        "schema": {
+                            "$ref": "#/definitions/RepositoryTags"
+                        }
+                    },
+                    "404": {
+                        "description": "Image doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/v2/{name}/manifests/{reference}": {
+            "get": {
+                "tags": ["Manifest"],
+                "description": "Pulls the image manifest file associated with the specified name and reference. Reference may be a tag or a digest",
+                "x-ms-examples": {
+                    "Get manifest": { "$ref": "./examples/GetManifest.json" }
+                },
+                "operationId": "GetManifest",
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "reference",
+                    "in": "path",
+                    "description": "A tag or a digest, pointing to a specific image",
+                    "required": true,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "Returns the requested manifest file",
+                        "schema": {
+                            "$ref": "#/definitions/Manifest"
+                        }
+                    },
+                    "404": {
+                        "description": "Image doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/v2/_catalog": {
+            "get": {
+                "tags": ["Repository"],
+                "description": "List respositories",
+                "operationId": "GetRepositories",
+                "x-ms-examples": {
+                    "Get repositories in a registry": { "$ref": "./examples/GetRepositories.json" }
+                },
+                "parameters": [{
+                    "name": "last",
+                    "in": "query",
+                    "description": "query parameter for the last item in previou query",
+                    "required": false,
+                    "type": "string"
+                }, {
+                    "name": "n",
+                    "in": "query",
+                    "description": "query parameter for max number of items",
+                    "required": false,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "Returns a list of repositories",
+                        "schema": {
+                            "$ref": "#/definitions/Repositories"
+                        }
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/acr/v1/_catalog": {
+            "get": {
+                "tags": ["AcrRepository"],
+                "description": "List respositories",
+                "operationId": "GetAcrRepositories",
+                "x-ms-examples": {
+                    "Get repositories in a registry": { "$ref": "./examples/GetRepositories.json" }
+                },
+                "parameters": [{
+                    "name": "last",
+                    "in": "query",
+                    "description": "query parameter for the last item in previou query",
+                    "required": false,
+                    "type": "string"
+                }, {
+                    "name": "n",
+                    "in": "query",
+                    "description": "query parameter for max number of items",
+                    "required": false,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "Returns a list of repositories",
+                        "schema": {
+                            "$ref": "#/definitions/Repositories"
+                        }
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/acr/v1/{name}": {
+            "get": {
+                "tags": ["AcrRepository", "AcrMetadata"],
+                "description": "Get respository attributes",
+                "operationId": "GetAcrRepositoryAttributes",
+                "x-ms-examples": {
+                    "Get details of repository": { "$ref": "./examples/GetAcrRepositoryAttributes.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "Returns a list of attributes",
+                        "schema": {
+                            "$ref": "#/definitions/RepositoryAttributes"
+                        }
+                    },
+                    "404": {
+                        "description": "Image doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": ["AcrRepository"],
+                "description": "Delete a respository",
+                "operationId": "DeleteAcrRepository",
+                "x-ms-examples": {
+                    "Delete a repository": { "$ref": "./examples/DeleteAcrRepository.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }],
+                "responses": {
+                    "202": {
+                        "description": "The repoisotry is deleted",
+                        "schema": {
+                            "$ref": "#/definitions/DeletedRepository"
+                        }
+                    },
+                    "404": {
+                        "description": "Image doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            },
+            "patch": {
+                "tags": ["AcrRepository", "AcrMetadata"],
+                "description": "Update attributes of a repository",
+                "operationId": "UpdateAcrRepositoryAttributes",
+                "x-ms-examples": {
+                    "Update repository attributes": { "$ref": "./examples/UpdateAcrRepository.json" }
+                },
+                "consumes": ["application/json"],
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "value",
+                    "in": "body",
+                    "description": "Repository attribute value",
+                    "required": false,
+                    "schema": {
+                        "$ref": "#/definitions/ChangeableAttributes"
+                    }
+                }],
+                "responses": {
+                    "204": {
+                        "description": "The attributes is updated"
+                    },
+                    "404": {
+                        "description": "Image doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/acr/v1/{name}/_tags": {
+            "get": {
+                "tags": ["AcrTag", "AcrMetadata"],
+                "description": "List tags of a repository",
+                "operationId": "GetAcrTags",
+                "x-ms-examples": {
+                    "Get tags of a repository": { "$ref": "./examples/GetAcrTags.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "last",
+                    "in": "query",
+                    "description": "query parameter for the last item in previou query",
+                    "required": false,
+                    "type": "string"
+                }, {
+                    "name": "n",
+                    "in": "query",
+                    "description": "query parameter for max number of items",
+                    "required": false,
+                    "type": "string"
+                }, {
+                    "name": "orderby",
+                    "in": "query",
+                    "description": "orderby query parameter",
+                    "required": false,
+                    "type": "string"
+                }, {
+                    "name": "digest",
+                    "in": "query",
+                    "description": "filter by digest",
+                    "required": false,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "Tag details of a repository",
+                        "schema": {
+                            "$ref": "#/definitions/AcrRepositoryTags"
+                        }
+                    },
+                    "404": {
+                        "description": "Image doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/acr/v1/{name}/_tags/{reference}": {
+            "get": {
+                "tags": ["AcrTag", "AcrMetadata"],
+                "description": "Get manifest attributes by tag",
+                "operationId": "GetAcrTagAttributes",
+                "x-ms-examples": {
+                    "Get manifest attributes": { "$ref": "./examples/GetAcrTagAttributes.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "reference",
+                    "in": "path",
+                    "description": "A tag name of the image",
+                    "required": true,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "Tag attributes",
+                        "schema": {
+                            "$ref": "#/definitions/AcrTagAttributes"
+                        }
+                    },
+                    "404": {
+                        "description": "Tag doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            },
+            "patch": {
+                "tags": ["AcrTag", "AcrMetadata"],
+                "description": "Update tag attributes",
+                "operationId": "UpdateAcrTagAttributes",
+                "consumes": ["application/json"],
+                "x-ms-examples": {
+                    "Update attributes of a manifest": { "$ref": "./examples/UpdateAcrTagAttributes.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "reference",
+                    "in": "path",
+                    "description": "A tag name of the image",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "in": "body",
+                    "name": "value",
+                    "description": "Changeable attribute value",
+                    "required": false,
+                    "schema": {
+                        "$ref": "#/definitions/ChangeableAttributes"
+                    }
+                }],
+                "responses": {
+                    "204": {
+                        "description": "The attributes are updated"
+                    },
+                    "404": {
+                        "description": "Manifest doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": ["AcrTag", "AcrMetadata"],
+                "description": "Delete tag",
+                "operationId": "DeleteAcrTag",
+                "consumes": ["application/json"],
+                "x-ms-examples": {
+                    "Update attributes of a manifest": { "$ref": "./examples/DeleteAcrTag.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "reference",
+                    "in": "path",
+                    "description": "A tag name of the image",
+                    "required": true,
+                    "type": "string"
+                }],
+                "responses": {
+                    "204": {
+                        "description": "The tag is deleted"
+                    },
+                    "404": {
+                        "description": "Tag doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/acr/v1/{name}/_manifests": {
+            "get": {
+                "tags": ["AcrManifest", "AcrMetadata"],
+                "description": "List manifests of a repository",
+                "operationId": "GetAcrManifests",
+                "x-ms-examples": {
+                    "Get details of repository": { "$ref": "./examples/GetAcrManifests.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "last",
+                    "in": "query",
+                    "description": "query parameter for the last item in previou query",
+                    "required": false,
+                    "type": "string"
+                }, {
+                    "name": "n",
+                    "in": "query",
+                    "description": "query parameter for max number of items",
+                    "required": false,
+                    "type": "string"
+                }, {
+                    "name": "orderby",
+                    "in": "query",
+                    "description": "orderby query parameter",
+                    "required": false,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "Returns a list of manifests",
+                        "schema": {
+                            "$ref": "#/definitions/AcrManifests"
+                        }
+                    },
+                    "404": {
+                        "description": "Image doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        },
+        "/acr/v1/{name}/_manifests/{reference}": {
+            "get": {
+                "tags": ["AcrManifest", "AcrMetadata"],
+                "description": "Get manifest attributes",
+                "operationId": "GetAcrManifestAttributes",
+                "x-ms-examples": {
+                    "Get manifest attributes": { "$ref": "./examples/GetAcrManifestAttributes.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "reference",
+                    "in": "path",
+                    "description": "A digest pointing to a specific image",
+                    "required": true,
+                    "type": "string"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "List of attributes",
+                        "schema": {
+                            "$ref": "#/definitions/AcrManifestAttributes"
+                        }
+                    },
+                    "404": {
+                        "description": "Manifest doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            },
+            "patch": {
+                "tags": ["AcrManifest", "AcrMetadata"],
+                "description": "Update attributes of a manifest",
+                "operationId": "UpdateAcrManifestAttributes",
+                "consumes": ["application/json"],
+                "x-ms-examples": {
+                    "Update attributes of a manifest": { "$ref": "./examples/UpdateAcrManifestAttributes.json" }
+                },
+                "parameters": [{
+                    "name": "name",
+                    "in": "path",
+                    "description": "Name of the image (including the namespace)",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "name": "reference",
+                    "in": "path",
+                    "description": "A tag or a digest, pointing to a specific image",
+                    "required": true,
+                    "type": "string"
+                }, {
+                    "in": "body",
+                    "name": "value",
+                    "description": "Changeable attribute value",
+                    "required": false,
+                    "schema": {
+                        "$ref": "#/definitions/ChangeableAttributes"
+                    }
+                }],
+                "responses": {
+                    "204": {
+                        "description": "The attributes are updated"
+                    },
+                    "404": {
+                        "description": "Manifest doesn't exist"
+                    },
+                    "default": {
+                        "description": "ACR error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/AcrErrors"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "securityDefinitions": {
+        "registry_auth": {
+            "type": "basic"
+        }
+    },
+    "definitions": {
+        "RepositoryAttributes": {
+            "type": "object",
+            "description": "Repository attributes",
+            "properties": {
+                "registry": {
+                    "type": "string",
+                    "description": "Registry name"
+                },
+                "imageName": {
+                    "type": "string",
+                    "description": "Image name"
+                },
+                "createdTime": {
+                    "type": "string",
+                    "description": "Image created time"
+                },
+                "lastUpdateTime": {
+                    "type": "string",
+                    "description": "Image last update time"
+                },
+                "manifestCount": {
+                    "type": "number",
+                    "description": "Number of the manifests"
+                },
+                "tagCount": {
+                    "type": "number",
+                    "description": "Number of the tags"
+                },
+                "changeableAttributes": {
+                    "description": "Changeable attributes",
+                    "$ref": "#/definitions/ChangeableAttributes"
+                }
+            },
+            "example": {
+                "registry": "registryname.azurecr.io",
+                "changeableAttributes": {
+                    "readEnabled": true,
+                    "listEnabled": true,
+                    "deleteEnabled": true,
+                    "writeEnabled": true
+                },
+                "imageName": "imageName",
+                "createdTime": "2018-09-07T16:30:46.6583219Z",
+                "tagCount": 6,
+                "manifestCount": 2,
+                "lastUpdateTime": "2018-09-07T16:30:46.6583219Z"
+            }
+        },
+        "AcrRepositoryTags": {
+            "description": "List of tag details",
+            "properties": {
+                "registry": {
+                    "type": "string",
+                    "description": "Registry name"
+                },
+                "imageName": {
+                    "type": "string",
+                    "description": "Image name"
+                },
+                "tags": {
+                    "type": "array",
+                    "x-ms-client-name": "TagsAttributes",
+                    "description": "List of tag attribute details",
+                    "items": {
+                        "$ref": "#/definitions/AcrTagAttributesBase"
+                    }
+                }
+            },
+            "example": {
+                "registry": "registry",
+                "imageName": "imageName",
+                "tags": [{
+                    "changeableAttributes": {
+                        "readEnabled": true,
+                        "listEnabled": true,
+                        "deleteEnabled": true,
+                        "writeEnabled": true
+                    },
+                    "name": "name",
+                    "digest": "digest",
+                    "createdTime": "createdTime",
+                    "signed": true,
+                    "quarantineState": "quarantineState",
+                    "lastUpdateTime": "lastUpdateTime"
+                }, {
+                    "changeableAttributes": {
+                        "readEnabled": true,
+                        "listEnabled": true,
+                        "deleteEnabled": true,
+                        "writeEnabled": true
+                    },
+                    "name": "name",
+                    "digest": "digest",
+                    "createdTime": "createdTime",
+                    "signed": true,
+                    "quarantineState": "quarantineState",
+                    "lastUpdateTime": "lastUpdateTime"
+                }]
+            }
+        },
+        "AcrTagAttributes": {
+            "description": "Tag attributes",
+            "properties": {
+                "registry": {
+                    "type": "string",
+                    "description": "Registry name"
+                },
+                "imageName": {
+                    "type": "string",
+                    "description": "Image name"
+                },
+                "tag": {
+                    "x-ms-client-name": "TagAttributes",
+                    "description": "List of tag attribute details",
+                    "$ref": "#/definitions/AcrTagAttributesBase"
+                }
+            },
+            "example": {
+                "registry": "registry",
+                "imageName": "imageName",
+                "tag": {
+                    "changeableAttributes": {
+                        "readEnabled": true,
+                        "listEnabled": true,
+                        "deleteEnabled": true,
+                        "writeEnabled": true
+                    },
+                    "name": "name",
+                    "digest": "digest",
+                    "createdTime": "createdTime",
+                    "signed": true,
+                    "quarantineState": "quarantineState",
+                    "lastUpdateTime": "lastUpdateTime"
+                }
+            }
+        },
+        "TagAttributes": {
+            "description": "Tag attributes",
+            "properties": {
+                "registry": {
+                    "description": "Registry name",
+                    "type": "string"
+                },
+                "imageName": {
+                    "description": "Image name",
+                    "type": "string"
+                },
+                "tag": {
+                    "$ref": "#/definitions/TagAttributes_tag",
+                    "description": "Tag attributes"
+                }
+            },
+            "example": {
+                "registry": "registry",
+                "imageName": "imageName",
+                "tag": {
+                    "signatureRecord": "signatureRecord"
+                }
+            }
+        },
+        "AcrTagAttributesBase": {
+            "description": "Tag attribute details",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "description": "Tag name"
+                },
+                "digest": {
+                    "type": "string",
+                    "description": "Tag digest"
+                },
+                "createdTime": {
+                    "type": "string",
+                    "description": "Tag created time"
+                },
+                "lastUpdateTime": {
+                    "type": "string",
+                    "description": "Tag last update time"
+                },
+                "signed": {
+                    "type": "boolean",
+                    "description": "Is signed"
+                },
+                "changeableAttributes": {
+                    "$ref": "#/definitions/ChangeableAttributes",
+                    "description": "Changeable attributes"
+                }
+            },
+            "example": {
+                "changeableAttributes": {
+                    "readEnabled": true,
+                    "listEnabled": true,
+                    "deleteEnabled": true,
+                    "writeEnabled": true
+                },
+                "name": "tagname",
+                "digest": "sha256:0873c923e00e0fd2ba78041bfb64a105e1ecb7678916d1f7776311e45bf5634b",
+                "createdTime": "2018-08-10T17:28:44.1082945Z",
+                "signed": true,
+                "lastUpdateTime": "2018-08-10T17:28:44.1082945Z"
+            }
+        },
+        "AcrManifests": {
+            "description": "Manifest attributes",
+            "properties": {
+                "registry": {
+                    "type": "string",
+                    "description": "Registry name"
+                },
+                "imageName": {
+                    "type": "string",
+                    "description": "Image name"
+                },
+                "manifests": {
+                    "type": "array",
+                    "description": "List of manifests",
+                    "items": {
+                        "$ref": "#/definitions/AcrManifestAttributesBase",
+                        "description": "Manifest details"
+                    }
+                }
+            },
+            "example": {
+                "registry": "registry",
+                "imageName": "imageName",
+                "manifests": [{
+                    "changeableAttributes": {
+                        "quarantineDetails": "quarantineDetails",
+                        "readEnabled": true,
+                        "quarantineState": "quarantineState",
+                        "listEnabled": true,
+                        "deleteEnabled": true,
+                        "writeEnabled": true
+                    },
+                    "os": "os",
+                    "digest": "digest",
+                    "createdTime": "createdTime",
+                    "mediaType": "mediaType",
+                    "lastUpdateTime": "lastUpdateTime",
+                    "architecture": "architecture",
+                    "tags": ["tags", "tags"]
+                }, {
+                    "changeableAttributes": {
+                        "quarantineDetails": "quarantineDetails",
+                        "readEnabled": true,
+                        "quarantineState": "quarantineState",
+                        "listEnabled": true,
+                        "deleteEnabled": true,
+                        "writeEnabled": true
+                    },
+                    "os": "os",
+                    "digest": "digest",
+                    "createdTime": "createdTime",
+                    "mediaType": "mediaType",
+                    "lastUpdateTime": "lastUpdateTime",
+                    "architecture": "architecture",
+                    "tags": ["tags", "tags"]
+                }]
+            }
+        },
+        "AcrManifestAttributes": {
+            "description": "Manifest attributes details",
+            "properties": {
+                "registry": {
+                    "description": "Registry name",
+                    "type": "string"
+                },
+                "imageName": {
+                    "description": "Image name",
+                    "type": "string"
+                },
+                "manifest": {
+                    "description": "Manifest attributes",
+                    "$ref": "#/definitions/AcrManifestAttributesBase"
+                }
+            },
+            "example": {
+                "registry": "acrapi.azurecr-test.io",
+                "imageName": "nanoserver",
+                "manifest": {
+                    "digest": "sha256:110d2b6c84592561338aa040b1b14b7ab81c2f9edbd564c2285dd7d70d777086",
+                    "createdTime": "2018-09-06T06:17:20.9983915Z",
+                    "lastUpdateTime": "2018-09-06T06:17:20.9983915Z",
+                    "architecture": "amd64",
+                    "os": "windows",
+                    "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+                    "tags": ["4.7.2-20180905-nanoserver-1803"],
+                    "changeableAttributes": {
+                        "deleteEnabled": true,
+                        "writeEnabled": true,
+                        "readEnabled": true,
+                        "listEnabled": true
+                    }
+                }
+            }
+        },
+        "AcrManifestAttributesBase": {
+            "type": "object",
+            "description": "Manifest details",
+            "properties": {
+                "digest": {
+                    "type": "string",
+                    "description": "Manifest digest"
+                },
+                "createdTime": {
+                    "type": "string",
+                    "description": "Created time"
+                },
+                "lastUpdateTime": {
+                    "type": "string",
+                    "description": "Last update time"
+                },
+                "architecture": {
+                    "type": "string",
+                    "description": "CPU architecture"
+                },
+                "os": {
+                    "type": "string",
+                    "description": "Operating system"
+                },
+                "mediaType": {
+                    "type": "string",
+                    "description": "Media type"
+                },
+                "tags": {
+                    "type": "array",
+                    "description": "List of tags",
+                    "items": {
+                        "type": "string",
+                        "description": "Tag name"
+                    }
+                },
+                "changeableAttributes": {
+                    "$ref": "#/definitions/ChangeableAttributes",
+                    "description": "Changeable attributes"
+                }
+            },
+            "example": {
+                "changeableAttributes": {
+                    "readEnabled": true,
+                    "listEnabled": true,
+                    "deleteEnabled": true,
+                    "writeEnabled": true
+                },
+                "os": "os",
+                "digest": "digest",
+                "createdTime": "createdTime",
+                "mediaType": "mediaType",
+                "lastUpdateTime": "lastUpdateTime",
+                "architecture": "architecture",
+                "tags": ["tags", "tags"]
+            }
+        },
+        "AcrErrors": {
+            "description": "Acr error response describing why the operation failed",
+            "properties": {
+                "errors": {
+                    "type": "array",
+                    "description": "Array of detailed error",
+                    "items": {
+                        "$ref": "#/definitions/AcrErrorInfo"
+                    }
+                }
+            }
+        },
+        "RepositoryTags": {
+            "description": "Result of the request to list tags of the image",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "description": "Name of the image"
+                },
+                "tags": {
+                    "type": "array",
+                    "description": "List of tags",
+                    "items": {
+                        "type": "string",
+                        "description": "Tag name"
+                    }
+                }
+            },
+            "example": {
+                "name": "name",
+                "tags": ["tags", "tags"]
+            }
+        },
+        "Manifest": {
+            "description": "Returns the requested manifest file",
+            "properties": {
+                "schemaVersion": {
+                    "type": "number",
+                    "description": "Schema version"
+                },
+                "architecture": {
+                    "type": "string",
+                    "description": "CPU architecture"
+                },
+                "name": {
+                    "type": "string",
+                    "description": "Image name"
+                },
+                "tag": {
+                    "type": "string",
+                    "description": "Image tag"
+                },
+                "fsLayers": {
+                    "type": "array",
+                    "description": "List of layer information",
+                    "items": {
+                        "$ref": "#/definitions/ImageLayer"
+                    }
+                },
+                "history": {
+                    "type": "array",
+                    "description": "Image history",
+                    "x-ms-client-name": "ImageHistories",
+                    "items": {
+                        "$ref": "#/definitions/ImageHistory"
+                    }
+                },
+                "signatures": {
+                    "type": "array",
+                    "description": "Image signature",
+                    "items": {
+                        "$ref": "#/definitions/ImageSignature"
+                    }
+                }
+            },
+            "example": {
+                "name": "name",
+                "tag": "tag",
+                "fsLayers": [{
+                    "blobSum": "sha256:1f7d468f830cb0ed4beb8edc9438f18096e8c682e56a35242f60e6c61b718b30"
+                }, {
+                    "blobSum": "sha256:2f7d468f830cb0ed4beb8edc9438f18096e8c682e56a35242f60e6c61b718b31"
+                }],
+                "history": "history",
+                "signatures": [{
+                    "header": {
+                        "jwk": {
+                            "crv": "P-256",
+                            "kid": "WGXM:EYWQ:DA53:LQUP:BCWG:5RDG:S3ZM:ETH7:VMQS:WWKZ:EWDG:V74Q",
+                            "kty": "EC",
+                            "x": "OxZ9k5BVjPZ7jb3BmBD4X0d8MVPJqfF4NeSe8reoqnY",
+                            "y": "EaCqTe4-vYwhk7qU6Bs2-AeLGOVtCe_-IY2MdE0Vfyc"
+                        },
+                        "alg": "ES256"
+                    },
+                    "signature": "p73LfotMGD8nNXz2g9YX2XtSllb4GI5-b3vjqP5N0nkv8QXg-r5z_omGiVbOZE2BYG1X_4TIN23l1KSEqsXxOg",
+                    "protected": "eyJmb3JtYXRMZW5ndGgiOjI5ODYsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxOC0wOS0yMFQyMzo0MTo1MloifQ"
+                }]
+            }
+        },
+        "ImageSignature": {
+            "description": "Signature of a signed manifest",
+            "properties": {
+                "header": {
+                    "description": "A JSON web signature",
+                    "$ref": "#/definitions/JWK"
+                },
+                "signature": {
+                    "type": "string",
+                    "description": "A signature for the image manifest, signed by a libtrust private key"
+                },
+                "protected": {
+                    "type": "string",
+                    "x-ms-client-name": "protectedHeader",
+                    "description": "The signed protected header"
+                }
+            },
+            "example": {
+                "header": {
+                    "jwk": {
+                        "crv": "P-256",
+                        "kid": "WGXM:EYWQ:DA53:LQUP:BCWG:5RDG:S3ZM:ETH7:VMQS:WWKZ:EWDG:V74Q",
+                        "kty": "EC",
+                        "x": "OxZ9k5BVjPZ7jb3BmBD4X0d8MVPJqfF4NeSe8reoqnY",
+                        "y": "EaCqTe4-vYwhk7qU6Bs2-AeLGOVtCe_-IY2MdE0Vfyc"
+                    },
+                    "alg": "ES256"
+                },
+                "signature": "p73LfotMGD8nNXz2g9YX2XtSllb4GI5-b3vjqP5N0nkv8QXg-r5z_omGiVbOZE2BYG1X_4TIN23l1KSEqsXxOg",
+                "protected": "eyJmb3JtYXRMZW5ndGgiOjI5ODYsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxOC0wOS0yMFQyMzo0MTo1MloifQ"
+            }
+        },
+        "JWK": {
+            "description": "A JSON web signature",
+            "properties": {
+                "jwk": {
+                    "$ref": "#/definitions/JWKHeader"
+                },
+                "alg": {
+                    "type": "string",
+                    "description": "The algorithm used to sign or encrypt the JWT"
+                }
+            }
+        },
+        "JWKHeader": {
+            "description": "JSON web key parameter",
+            "properties": {
+                "crv": {
+                    "type": "string",
+                    "description": "crv value"
+                },
+                "kid": {
+                    "type": "string",
+                    "description": "kid value"
+                },
+                "kty": {
+                    "type": "string",
+                    "description": "kty value"
+                },
+                "x": {
+                    "type": "string",
+                    "description": "x value"
+                },
+                "y": {
+                    "type": "string",
+                    "description": "y value"
+                }
+            }
+        },
+        "ImageHistory": {
+            "description": "A list of unstructured historical data for v1 compatibility",
+            "properties": {
+                "v1Compatibility": {
+                    "type": "string",
+                    "description": "The raw v1 compatibility information"
+                }
+            },
+            "example": {
+                "v1Compatibility": "v1 compatibility info"
+            }
+        },
+        "Repositories": {
+            "description": "List of repositories",
+            "properties": {
+                "repositories": {
+                    "type": "array",
+                    "x-ms-client-name": "Names",
+                    "description": "Repository names",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "example": {
+                "repositories": ["production/apline", "testing/apline"]
+            }
+        },
+        "DeletedRepository": {
+            "description": "Deleted repository",
+            "properties": {
+                "manifestsDeleted": {
+                    "type": "array",
+                    "description": "SHA of the deleted image",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "tagsDeleted": {
+                    "type": "array",
+                    "description": "Tag of the deleted image",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        },
+        "AcrErrorInfo": {
+            "description": "Error information",
+            "properties": {
+                "code": {
+                    "description": "Error code",
+                    "type": "string"
+                },
+                "message": {
+                    "type": "string",
+                    "description": "Error message"
+                },
+                "detail": {
+                    "type": "string",
+                    "description": "Error details"
+                }
+            }
+        },
+        "ImageLayer": {
+            "description": "Image layer information",
+            "properties": {
+                "blobSum": {
+                    "type": "string",
+                    "description": "SHA of an image layer"
+                }
+            },
+            "example": {
+                "blobSum": "sha256:1f7d468f830cb0ed4beb8edc9438f18096e8c682e56a35242f60e6c61b718b30"
+            }
+        },
+        "ChangeableAttributes": {
+            "properties": {
+                "deleteEnabled": {
+                    "type": "boolean",
+                    "description": "Delete enabled"
+                },
+                "writeEnabled": {
+                    "type": "boolean",
+                    "description": "Write enabled"
+                },
+                "listEnabled": {
+                    "type": "boolean",
+                    "description": "List enabled"
+                },
+                "readEnabled": {
+                    "type": "boolean",
+                    "description": "Read enabled"
+                }
+            },
+            "example": {
+                "readEnabled": true,
+                "listEnabled": true,
+                "deleteEnabled": true,
+                "writeEnabled": true
+            }
+        },
+        "TagAttributes_tag": {
+            "description": "Tag",
+            "properties": {
+                "signatureRecord": {
+                    "description": "SignatureRecord value",
+                    "type": "string"
+                }
+            },
+            "example": {
+                "signatureRecord": "signatureRecord"
+            }
+        },
+        "ManifestAttributes_manifest_references": {
+            "description": "Manifest attributes details",
+            "properties": {
+                "digest": {
+                    "type": "string",
+                    "description": "Manifest digest"
+                },
+                "architecture": {
+                    "type": "string",
+                    "description": "CPU architecture"
+                },
+                "os": {
+                    "type": "string",
+                    "description": "Operating system"
+                }
+            },
+            "example": {
+                "os": "os",
+                "digest": "digest",
+                "architecture": "architecture"
+            }
+        },
+        "ManifestAttributes_manifest": {
+            "description": "List of manifest attributes",
+            "properties": {
+                "references": {
+                    "type": "array",
+                    "description": "List of manifest attributes details",
+                    "items": {
+                        "$ref": "#/definitions/ManifestAttributes_manifest_references",
+                        "description": "Manifest attributes details"
+                    }
+                },
+                "quarantineTag": {
+                    "type": "string",
+                    "description": "Quarantine tag name"
+                }
+            },
+            "example": {
+                "quarantineTag": "quarantineTag",
+                "references": [{
+                    "os": "os",
+                    "digest": "digest",
+                    "architecture": "architecture"
+                }, {
+                    "os": "os",
+                    "digest": "digest",
+                    "architecture": "architecture"
+                }]
+            }
+        },
+        "ManifestChangeableAttributes": {
+            "description": "Changeable attributes",
+            "properties": {
+                "deleteEnabled": {
+                    "type": "boolean",
+                    "description": "Delete enabled"
+                },
+                "writeEnabled": {
+                    "type": "boolean",
+                    "description": "Write enabled"
+                },
+                "listEnabled": {
+                    "type": "boolean",
+                    "description": "List enabled"
+                },
+                "readEnabled": {
+                    "type": "boolean",
+                    "description": "Read enabled"
+                },
+                "quarantineState": {
+                    "type": "string",
+                    "description": "Quarantine state"
+                },
+                "quarantineDetails": {
+                    "type": "string",
+                    "description": "Quarantine details"
+                }
+            },
+            "example": {
+                "quarantineDetails": "quarantineDetails",
+                "readEnabled": true,
+                "quarantineState": "quarantineState",
+                "listEnabled": true,
+                "deleteEnabled": true,
+                "writeEnabled": true
+            }
+        }
+    },
+    "parameters": {
+        "name": {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the image (including the namespace)",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "reference": {
+            "name": "reference",
+            "in": "path",
+            "description": "A tag or a digest, pointing to a specific image",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "digest": {
+            "name": "digest",
+            "in": "path",
+            "description": "Digest of a desired BLOB",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "metadata": {
+            "name": "metadata",
+            "in": "path",
+            "description": "Name of the metadata",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "property": {
+            "name": "property",
+            "in": "path",
+            "description": "Name of the property",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "queryOrderBy": {
+            "name": "orderby",
+            "in": "query",
+            "description": "orderby query parameter",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "queryNum": {
+            "name": "n",
+            "in": "query",
+            "description": "query parameter for max number of items",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "queryLast": {
+            "name": "last",
+            "in": "query",
+            "description": "query parameter for the last item in previou query",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        },
+        "queryDigest": {
+            "name": "digest",
+            "in": "query",
+            "description": "filter by digest",
+            "required": false,
+            "type": "string",
+            "x-ms-parameter-location": "method"
+        }
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/DeleteAcrRepository.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/DeleteAcrRepository.json
new file mode 100644
index 000000000000..2a34867591ed
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/DeleteAcrRepository.json
@@ -0,0 +1,14 @@
+{
+    "parameters": {
+        "name": "nanoserver"
+    },
+    "responses": {
+        "202": {
+            "body": {
+                "manifestsDeleted": ["sha256:e31831d63f77a0a6d74ef5b16df619a50808dac842190d07ae24e8b520d159fa"],
+                "tagsDeleted": ["4.7.2-20180814-windowsservercore-1709"]
+            }
+        },
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/DeleteAcrTag.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/DeleteAcrTag.json
new file mode 100644
index 000000000000..6f7b5737f7f0
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/DeleteAcrTag.json
@@ -0,0 +1,10 @@
+{
+    "parameters": {
+        "name": "nanoserver",
+        "reference": "4.7.2-20180905-nanoserver-1803"
+    },
+    "responses": {
+        "204": {},
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrManifestAttributes.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrManifestAttributes.json
new file mode 100644
index 000000000000..52b999399595
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrManifestAttributes.json
@@ -0,0 +1,30 @@
+{
+    "parameters": {
+        "name": "nanoserver",
+        "reference": "sha256:110d2b6c84592561338aa040b1b14b7ab81c2f9edbd564c2285dd7d70d777086"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "registry": "acrapi.azurecr-test.io",
+                "imageName": "nanoserver",
+                "manifest": {
+                    "digest": "sha256:110d2b6c84592561338aa040b1b14b7ab81c2f9edbd564c2285dd7d70d777086",
+                    "createdTime": "2018-09-06T06:17:20.9983915Z",
+                    "lastUpdateTime": "2018-09-06T06:17:20.9983915Z",
+                    "architecture": "amd64",
+                    "os": "windows",
+                    "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+                    "tags": ["4.7.2-20180905-nanoserver-1803"],
+                    "changeableAttributes": {
+                        "deleteEnabled": true,
+                        "writeEnabled": true,
+                        "readEnabled": true,
+                        "listEnabled": true
+                    }
+                }
+            }
+        },
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrManifests.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrManifests.json
new file mode 100644
index 000000000000..5219e6820b8f
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrManifests.json
@@ -0,0 +1,44 @@
+{
+    "parameters": {
+        "name": "nanoserver"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "registry": "acrapi.azurecr-test.io",
+                "imageName": "nanoserver",
+                "manifests": [{
+                    "digest": "sha256:110d2b6c84592561338aa040b1b14b7ab81c2f9edbd564c2285dd7d70d777086",
+                    "createdTime": "2018-09-06T06:17:20.9983915Z",
+                    "lastUpdateTime": "2018-09-06T06:17:20.9983915Z",
+                    "architecture": "amd64",
+                    "os": "windows",
+                    "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+                    "tags": ["4.7.2-20180905-nanoserver-1803"],
+                    "changeableAttributes": {
+                        "deleteEnabled": true,
+                        "writeEnabled": true,
+                        "readEnabled": true,
+                        "listEnabled": true
+                    }
+                }, {
+                    "digest": "sha256:7af5cd1dde3e8f5c2c9103860afa4ca871a6075373b6564b0e7b1b47866dab52",
+                    "createdTime": "2018-09-07T16:30:46.5651701Z",
+                    "lastUpdateTime": "2018-09-07T16:30:46.5651701Z",
+                    "architecture": "amd64",
+                    "os": "windows",
+                    "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+                    "tags": ["4.7.2-20180906-nanoserver-1803"],
+                    "changeableAttributes": {
+                        "deleteEnabled": true,
+                        "writeEnabled": true,
+                        "readEnabled": true,
+                        "listEnabled": true
+                    }
+                }]
+            }
+
+        },
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrRepositoryAttributes.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrRepositoryAttributes.json
new file mode 100644
index 000000000000..ac60f5a8805b
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrRepositoryAttributes.json
@@ -0,0 +1,24 @@
+{
+    "parameters": {
+        "name": "nanoserver"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "registry": "acrapi.azurecr-test.io",
+                "imageName": "nanoserver",
+                "createdTime": "2018-09-06T06:17:20.9531248Z",
+                "lastUpdateTime": "2018-09-07T16:30:46.6583219Z",
+                "manifestCount": 2,
+                "tagCount": 2,
+                "changeableAttributes": {
+                    "deleteEnabled": true,
+                    "writeEnabled": true,
+                    "readEnabled": true,
+                    "listEnabled": true
+                }
+            }
+        },
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrTagAttributes.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrTagAttributes.json
new file mode 100644
index 000000000000..5ece3fb81463
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrTagAttributes.json
@@ -0,0 +1,26 @@
+{
+    "parameters": {
+        "name": "test/bash",
+        "reference": "tagName"
+    },
+    "responses": {
+        "200": {
+            "registry": "acrapi.azurecr-test.io",
+            "imageName": "test/bash",
+            "tag": {
+                "name": "tagName",
+                "digest": "sha256:eabe547f78d4c18c708dd97ec3166cf7464cc651f1cbb67e70d407405b7ad7b6",
+                "createdTime": "2018-10-05T20:54:24.1286047Z",
+                "lastUpdateTime": "2018-10-05T20:54:24.1286047Z",
+                "signed": false,
+                "changeableAttributes": {
+                    "deleteEnabled": true,
+                    "writeEnabled": false,
+                    "readEnabled": true,
+                    "listEnabled": true
+                }
+            }
+        },
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrTags.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrTags.json
new file mode 100644
index 000000000000..39199cc68d4e
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetAcrTags.json
@@ -0,0 +1,39 @@
+{
+    "parameters": {
+        "name": "nanoserver"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "registry": "acrapi.azurecr-test.io",
+                "imageName": "nanoserver",
+                "tags": [{
+                    "name": "4.7.2-20180905-nanoserver-1803",
+                    "digest": "sha256:110d2b6c84592561338aa040b1b14b7ab81c2f9edbd564c2285dd7d70d777086",
+                    "createdTime": "2018-09-06T06:17:21.0856539Z",
+                    "lastUpdateTime": "2018-09-06T06:17:21.0856539Z",
+                    "signed": false,
+                    "changeableAttributes": {
+                        "deleteEnabled": true,
+                        "writeEnabled": true,
+                        "readEnabled": true,
+                        "listEnabled": true
+                    }
+                }, {
+                    "name": "4.7.2-20180906-nanoserver-1803",
+                    "digest": "sha256:7af5cd1dde3e8f5c2c9103860afa4ca871a6075373b6564b0e7b1b47866dab52",
+                    "createdTime": "2018-09-06T16:30:43.3860166Z",
+                    "lastUpdateTime": "2018-09-07T16:30:46.7022734Z",
+                    "signed": false,
+                    "changeableAttributes": {
+                        "deleteEnabled": true,
+                        "writeEnabled": true,
+                        "readEnabled": true,
+                        "listEnabled": true
+                    }
+                }]
+            }
+        },
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetDockerRegistryV2Support.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetDockerRegistryV2Support.json
new file mode 100644
index 000000000000..eb639a1b8c68
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetDockerRegistryV2Support.json
@@ -0,0 +1,6 @@
+{
+    "parameters": {},
+    "responses": {
+        "200": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetManifest.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetManifest.json
new file mode 100644
index 000000000000..0a75c9db1eda
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetManifest.json
@@ -0,0 +1,57 @@
+{
+    "parameters": {
+        "name": "nanoserver",
+        "reference": "4.7.2-20180905-nanoserver-1803"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "schemaVersion": 1,
+                "name": "nanoserver",
+                "tag": "4.7.2-20180905-nanoserver-1803",
+                "architecture": "amd64",
+                "fsLayers": [{
+                        "blobSum": "sha256:b9bd2388a23447de788a154093dd9b89a822725492b7bfafab9015ce93b871e0"
+                    },
+                    {
+                        "blobSum": "sha256:c1f8a6fa5e3d3117531e76b205d7370057628908490cf961c71b92f915fa6254"
+                    },
+                    {
+                        "blobSum": "sha256:1f7d468f830cb0ed4beb8edc9438f18096e8c682e56a35242f60e6c61b718b30"
+                    },
+                    {
+                        "blobSum": "sha256:e46172273a4e4384e1eec7fb01091c828a256ea0f87b30f61381fba9bc511371"
+                    }
+                ],
+                "history": [{
+                        "v1Compatibility": "{\"architecture\":\"amd64\",\"config\":{\"Hostname\":\"\",\"Domainname\":\"\",\"User\":\"ContainerUser\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"cmd\",\"/C\",\"type C:\\\\hello.txt\"],\"ArgsEscaped\":true,\"Image\":\"sha256:efe84b3d2d41c56b455412b710c700ccd28ca370d6804522a733ba6bcdae8e00\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":null},\"container\":\"0a87ffdd343b17ed11efbbd7607330e6c2119579cf9d3a90611f44a26761ab82\",\"container_config\":{\"Hostname\":\"0a87ffdd343b\",\"Domainname\":\"\",\"User\":\"ContainerUser\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"cmd\",\"/S\",\"/C\",\"#(nop) \",\"CMD [\\\"cmd\\\" \\\"/C\\\" \\\"type C:\\\\\\\\hello.txt\\\"]\"],\"ArgsEscaped\":true,\"Image\":\"sha256:efe84b3d2d41c56b455412b710c700ccd28ca370d6804522a733ba6bcdae8e00\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"created\":\"2018-09-06T05:19:24.0396273Z\",\"docker_version\":\"18.03.1-ee-2\",\"id\":\"ab4de54a8b50f761f99f27212594a5bcf6d7d2a82b0a056b8376cab244ecdf65\",\"os\":\"windows\",\"os.version\":\"10.0.17134.228\",\"parent\":\"446a68d4429c55d85a52160454e3437fe5aea4e51f9010623d010b5f14c1c8f6\"}"
+                    },
+                    {
+                        "v1Compatibility": "{\"id\":\"446a68d4429c55d85a52160454e3437fe5aea4e51f9010623d010b5f14c1c8f6\",\"parent\":\"70a9fdb67496aa42b7fc7162133e635f8c66bd0bcfdab80d7dcd4c2342e57e20\",\"created\":\"2018-09-06T05:19:22.749573Z\",\"container_config\":{\"Cmd\":[\"cmd /S /C #(nop) COPY file:c6a48931fdbc0a16819a7896580105073d7c78961ee467d2512d8a5d68e011de in C: \"]}}"
+                    },
+                    {
+                        "v1Compatibility": "{\"id\":\"70a9fdb67496aa42b7fc7162133e635f8c66bd0bcfdab80d7dcd4c2342e57e20\",\"parent\":\"c25e10f4a7396863709cbbb107c1ee148fee59b8b20994a42817d4cc6c6981bd\",\"created\":\"2018-08-06T18:09:11.4272822Z\",\"container_config\":{\"Cmd\":[\"Install update 10.0.17134.228\"]}}"
+                    },
+                    {
+                        "v1Compatibility": "{\"id\":\"c25e10f4a7396863709cbbb107c1ee148fee59b8b20994a42817d4cc6c6981bd\",\"created\":\"2018-04-11T22:12:30.263Z\",\"container_config\":{\"Cmd\":[\"Apply image 10.0.17134.1\"]}}"
+                    }
+                ],
+                "signatures": [{
+                    "header": {
+                        "jwk": {
+                            "crv": "P-256",
+                            "kid": "WGXM:EYWQ:DA53:LQUP:BCWG:5RDG:S3ZM:ETH7:VMQS:WWKZ:EWDG:V74Q",
+                            "kty": "EC",
+                            "x": "OxZ9k5BVjPZ7jb3BmBD4X0d8MVPJqfF4NeSe8reoqnY",
+                            "y": "EaCqTe4-vYwhk7qU6Bs2-AeLGOVtCe_-IY2MdE0Vfyc"
+                        },
+                        "alg": "ES256"
+                    },
+                    "signature": "p73LfotMGD8nNXz2g9YX2XtSllb4GI5-b3vjqP5N0nkv8QXg-r5z_omGiVbOZE2BYG1X_4TIN23l1KSEqsXxOg",
+                    "protected": "eyJmb3JtYXRMZW5ndGgiOjI5ODYsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxOC0wOS0yMFQyMzo0MTo1MloifQ"
+                }]
+            }
+        },
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetRepositories.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetRepositories.json
new file mode 100644
index 000000000000..97d76d07301e
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetRepositories.json
@@ -0,0 +1,10 @@
+{
+    "parameters": {},
+    "responses": {
+        "200": {
+            "body": {
+                "repositories": ["production/apline", "testing/apline"]
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetTagList.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetTagList.json
new file mode 100644
index 000000000000..27e0d3e2c005
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/GetTagList.json
@@ -0,0 +1,14 @@
+{
+    "parameters": {
+        "name": "nanoserver"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "name": "nanoserver",
+                "tags": ["4.7.2-20180905-nanoserver-1803", "4.7.2-20180906-nanoserver-1803"]
+            }
+        },
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrManifestAttributes.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrManifestAttributes.json
new file mode 100644
index 000000000000..12fe6391f4f1
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrManifestAttributes.json
@@ -0,0 +1,11 @@
+{
+    "parameters": {
+        "name": "nanoserver",
+        "reference": "sha256:110d2b6c84592561338aa040b1b14b7ab81c2f9edbd564c2285dd7d70d777086",
+        "value": "{\"writeEnabled\": false}"
+    },
+    "responses": {
+        "204": {},
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrRepository.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrRepository.json
new file mode 100644
index 000000000000..8da0d0fabebd
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrRepository.json
@@ -0,0 +1,10 @@
+{
+    "parameters": {
+        "name": "nanoserver",
+        "writeEnabled": false
+    },
+    "responses": {
+        "204": {},
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrTagAttributes.json b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrTagAttributes.json
new file mode 100644
index 000000000000..8310fb936a99
--- /dev/null
+++ b/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/examples/UpdateAcrTagAttributes.json
@@ -0,0 +1,11 @@
+{
+    "parameters": {
+        "name": "nanoserver",
+        "reference": "4.7.2-20180905-nanoserver-1803",
+        "value": "{\"writeEnabled\": false}"
+    },
+    "responses": {
+        "204": {},
+        "404": {}
+    }
+}
\ No newline at end of file
diff --git a/specification/containerregistry/data-plane/readme.md b/specification/containerregistry/data-plane/readme.md
new file mode 100644
index 000000000000..8757508a0a44
--- /dev/null
+++ b/specification/containerregistry/data-plane/readme.md
@@ -0,0 +1,68 @@
+# ContainerRegistry
+    
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for ContainerRegistry.
+
+
+
+---
+## Getting Started 
+To build the SDK for ContainerRegistry, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
+
+> `autorest`
+
+To see additional help and options, run:
+
+> `autorest --help`
+---
+
+## Configuration
+
+
+#### Basic Information 
+These are the global settings for the ContainerRegistry API.
+
+``` yaml
+# common 
+openapi-type: data-plane
+tag: package-2018-08
+```
+
+### Tag: package-2018-08
+
+These settings apply only when `--tag=package-2018-08` is specified on the command line.
+
+``` yaml $(tag) == 'package-2018-08'
+input-file:
+- Microsoft.ContainerRegistry/preview/2018-08-10/containerregistry.json
+```
+
+---
+# Code Generation
+
+## Swagger to SDK
+
+This section describes what SDK should be generated by the automatic system.
+This is not used by Autorest itself.
+
+``` yaml $(swagger-to-sdk)
+swagger-to-sdk:
+  - repo: azure-sdk-for-net
+```
+
+## C#
+
+These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
+
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  namespace: Microsoft.Azure.ContainerRegistry
+  sync-methods: None
+  output-folder: $(csharp-sdks-folder)/ContainerRegistry/dataPlane/Microsoft.Azure.ContainerRegistry/Generated
+  clear-output-folder: true
+  add-credentials: true
+```
\ No newline at end of file
diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json
index 1443ffcc24f0..3bfc07179b16 100644
--- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json
+++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json
@@ -1407,10 +1407,6 @@
           "$ref": "#/definitions/Sku",
           "description": "The SKU of the container registry."
         },
-        "identity": {
-          "$ref": "#/definitions/RegistryIdentity",
-          "description": "The identity of the container registry."
-        },
         "properties": {
           "$ref": "#/definitions/RegistryProperties",
           "description": "The properties of the container registry.",
@@ -1456,24 +1452,6 @@
         }
       }
     },
-    "RegistryIdentity": {
-      "description": "The identity of the container registry.",
-      "type": "object",
-      "properties": {
-        "type": {
-          "description": "The type of identity used for the registry.",
-          "type": "string"
-        },
-        "principalId": {
-          "description": "The principal ID of registry identity.",
-          "type": "string"
-        },
-        "tenantId": {
-          "description": "The tenant ID associated with the registry.",
-          "type": "string"
-        }
-      }
-    },
     "RegistryProperties": {
       "description": "The properties of a container registry.",
       "type": "object",
@@ -1572,10 +1550,6 @@
           "$ref": "#/definitions/Sku",
           "description": "The SKU of the container registry."
         },
-        "identity": {
-          "$ref": "#/definitions/RegistryIdentity",
-          "description": "The identity of the container registry."
-        },
         "properties": {
           "$ref": "#/definitions/RegistryPropertiesUpdateParameters",
           "description": "The properties that the container registry will be updated with.",
diff --git a/specification/containerregistry/resource-manager/readme.go.md b/specification/containerregistry/resource-manager/readme.go.md
new file mode 100644
index 000000000000..1712041f331b
--- /dev/null
+++ b/specification/containerregistry/resource-manager/readme.go.md
@@ -0,0 +1,76 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: containerregistry
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-09
+  - tag: package-2018-02-preview
+  - tag: package-2017-10
+  - tag: package-2017-06-preview
+  - tag: package-2017-03
+  - tag: package-2016-06-preview
+```
+
+### Tag: package-2018-09 and go
+
+These settings apply only when `--tag=package-2018-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-09' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-09-01/$(namespace)
+```
+
+### Tag: package-2018-02-preview and go
+
+These settings apply only when `--tag=package-2018-02-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-02-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-02-01/$(namespace)
+```
+
+### Tag: package-2017-10 and go
+
+These settings apply only when `--tag=package-2017-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-10' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-10-01/$(namespace)
+```
+
+### Tag: package-2017-06-preview and go
+
+These settings apply only when `--tag=package-2017-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-06-01-preview/$(namespace)
+```
+
+### Tag: package-2017-03 and go
+
+These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-03-01/$(namespace)
+```
+
+### Tag: package-2016-06-preview and go
+
+These settings apply only when `--tag=package-2016-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2016-06-27-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/containerregistry/resource-manager/readme.md b/specification/containerregistry/resource-manager/readme.md
index 5cfae82d4da0..044cd903ae01 100644
--- a/specification/containerregistry/resource-manager/readme.md
+++ b/specification/containerregistry/resource-manager/readme.md
@@ -102,6 +102,7 @@ swagger-to-sdk:
       - python ./scripts/multiapi_init_gen.py azure-mgmt-containerregistry
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -117,7 +118,7 @@ Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azur
 ``` yaml $(csharp)
 csharp:
   # stop the simplifier from making Task conflict:
-  skip-simplifier-on-namespace: 
+  skip-simplifier-on-namespace:
     - System.Threading.Tasks
   # last generated using AutoRest.1.0.0-Nightly20170212 with commit 3b0b26b4b6e3bc5e7cf3610b0866d310abb5b814
   azure-arm: true
@@ -128,84 +129,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: containerregistry
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-09
-  - tag: package-2018-02-preview
-  - tag: package-2017-10
-  - tag: package-2017-06-preview
-  - tag: package-2017-03
-  - tag: package-2016-06-preview
-```
-
-### Tag: package-2018-09 and go
-
-These settings apply only when `--tag=package-2018-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-09' && $(go)
-output-folder: $(go-sdk-folder)/services/containerregistry/mgmt/2018-09-01/containerregistry
-```
-
-### Tag: package-2018-02-preview and go
-
-These settings apply only when `--tag=package-2018-02-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-02-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerregistry/mgmt/2018-02-01/containerregistry
-```
-
-### Tag: package-2017-10 and go
-
-These settings apply only when `--tag=package-2017-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-10' && $(go)
-output-folder: $(go-sdk-folder)/services/containerregistry/mgmt/2017-10-01/containerregistry
-```
-
-### Tag: package-2017-06-preview and go
-
-These settings apply only when `--tag=package-2017-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerregistry/mgmt/2017-06-01-preview/containerregistry
-```
-
-### Tag: package-2017-03 and go
-
-These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-03' && $(go)
-output-folder: $(go-sdk-folder)/services/containerregistry/mgmt/2017-03-01/containerregistry
-```
-
-### Tag: package-2016-06-preview and go
-
-These settings apply only when `--tag=package-2016-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerregistry/mgmt/2016-06-27-preview/containerregistry
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/containerregistry/resource-manager/readme.typescript.md b/specification/containerregistry/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..9e381eb29a42
--- /dev/null
+++ b/specification/containerregistry/resource-manager/readme.typescript.md
@@ -0,0 +1,15 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+input-file:
+  - Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json
+  - Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-containerregistry"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-containerregistry"
+  generate-metadata: true
+```
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json
new file mode 100644
index 000000000000..01bff520aec2
--- /dev/null
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json
@@ -0,0 +1,185 @@
+{
+  "parameters": {
+    "api-version": "2018-09-30-preview",
+    "subscriptionId": "subid1",
+    "resourceGroupName": "rg1",
+    "resourceName": "clustername1",
+    "parameters": {
+      "location": "location1",
+      "tags": {
+        "tier": "production",
+        "archv2": ""
+      },
+      "properties": {
+        "openShiftVersion": "v3.10",
+        "fqdn": "clustername1.location1.cloudapp.azure.com",
+        "networkProfile":{
+          "vnetCidr":"10.0.0.0/8"
+        },
+        "masterPoolProfile": {
+          "name": "master",
+          "count": 3,
+          "vmSize": "Standard_D2s_v3",
+          "osType": "Linux",
+          "subnetCidr": "10.0.0.0/24"
+        },
+        "agentPoolProfiles": [
+          {
+            "name": "infra",
+            "role": "infra",
+            "count": 2,
+            "vmSize": "Standard_D4s_v3",
+            "osType": "Linux",
+            "subnetCidr": "10.0.0.0/24"
+          },
+          {
+            "name": "compute",
+            "role": "compute",
+            "count": 4,
+            "vmSize": "Standard_D4s_v3",
+            "osType": "Linux",
+            "subnetCidr": "10.0.0.0/24"
+          }
+        ],
+        "routerProfiles": [
+          {
+            "name": "default"
+          }
+        ],
+        "authProfile": {
+          "identityProviders": [{
+             "name": "Azure AD",
+             "provider": {
+                "kind": "AADIdentityProvider",
+                "clientId": "clientId",
+                "secret": "secret",
+                "tenantId": "tenantId"
+             }
+          }]
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1",
+        "location": "location1",
+        "name": "clustername1",
+        "tags": {
+          "archv2": "",
+          "tier": "production"
+        },
+        "type": "Microsoft.ContainerService/OpenShiftManagedClusters",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "openShiftVersion": "v3.10",
+          "fqdn": "clustername1.location1.cloudapp.azure.com",
+          "networkProfile":{
+            "vnetCidr":"10.0.0.0/8"
+          },
+          "masterPoolProfile": {
+              "count": 3,
+              "vmSize": "Standard_D2s_v3",
+              "subnetCidr": "10.0.0.0/24"
+          },
+          "agentPoolProfiles": [
+            {
+              "name": "infra",
+              "role": "infra",
+              "count": 2,
+              "vmSize": "Standard_D4s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+            },
+            {
+              "name": "compute",
+              "role": "compute",
+              "count": 4,
+              "vmSize": "Standard_D4s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+            }
+          ],
+          "routerProfiles": [
+            {
+              "name": "default",
+              "fqdn": "2925bdf9337748f4bd3b.location1.cloudapp.azure.com",
+              "publicSubdomain": "bc309ee87c164153871c.location1.int.aksapp.io"
+            }
+          ],
+          "authProfile": {
+            "identityProviders": [{
+               "name": "Azure AD",
+               "provider": {
+                  "kind": "AADIdentityProvider",
+                  "clientId": "clientId",
+                  "tenantId": "tenantId"
+               }
+            }]
+          }
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1",
+        "location": "location1",
+        "name": "clustername1",
+        "tags": {
+          "archv2": "",
+          "tier": "production"
+        },
+        "type": "Microsoft.ContainerService/OpenShiftManagedClusters",
+        "properties": {
+          "provisioningState": "Creating",
+          "openShiftVersion": "v3.10",
+          "fqdn": "clustername1.location1.cloudapp.azure.com",
+          "networkProfile":{
+            "vnetCidr":"10.0.0.0/8"
+          },
+          "masterPoolProfile": {
+              "name": "master",
+              "count": 3,
+              "vmSize": "Standard_D2s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+          },
+          "agentPoolProfiles": [
+            {
+              "name": "infra",
+              "role": "infra",
+              "count": 2,
+              "vmSize": "Standard_D4s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+            },
+            {
+              "name": "compute",
+              "role": "compute",
+              "count": 4,
+              "vmSize": "Standard_D4s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+            }
+          ],
+          "routerProfiles": [
+            {
+              "name": "default"
+            }
+          ],
+          "authProfile": {
+            "identityProviders": [{
+               "name": "Azure AD",
+               "provider": {
+                  "kind": "AADIdentityProvider",
+                  "clientId": "clientId",
+                  "tenantId": "tenantId"
+               }
+            }]
+          }
+        } 
+      }
+    }
+  }
+}
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersDelete.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersDelete.json
new file mode 100644
index 000000000000..efe2349b9ef0
--- /dev/null
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersDelete.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "api-version": "2018-09-30-preview",
+    "subscriptionId": "subid1",
+    "resourceGroupName": "rg1",
+    "resourceName": "clustername1"
+  },
+  "responses": {
+    "202": {},
+    "204": {}
+  }
+}
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json
new file mode 100644
index 000000000000..d54e3a4110bb
--- /dev/null
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json
@@ -0,0 +1,71 @@
+{
+  "parameters": {
+    "api-version": "2018-09-30-preview",
+    "subscriptionId": "subid1",
+    "resourceGroupName": "rg1",
+    "resourceName": "clustername1"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1",
+        "location": "location1",
+        "name": "clustername1",
+        "tags": {
+          "archv2": "",
+          "tier": "production"
+        },
+        "type": "Microsoft.ContainerService/OpenShiftManagedClusters",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "openShiftVersion": "v3.10",
+          "fqdn": "clustername1.location1.cloudapp.azure.com",
+          "networkProfile":{
+            "vnetCidr":"10.0.0.0/8"
+          },
+          "masterPoolProfile": {
+              "count": 3,
+              "vmSize": "Standard_D2s_v3",
+              "subnetCidr": "10.0.0.0/24"
+          },
+          "agentPoolProfiles": [
+            {
+              "name": "infra",
+              "role": "infra",
+              "count": 2,
+              "vmSize": "Standard_D4s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+            },
+            {
+              "name": "compute",
+              "role": "compute",
+              "count": 4,
+              "vmSize": "Standard_D4s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+            }
+          ],
+          "routerProfiles": [
+            {
+              "fqdn": "dce5faa189c841b99f8a.location1.cloudapp.azure.com",
+              "name": "default",
+              "publicSubdomain": "b788fade68d345da9b77.location1.int.aksapp.io"
+            }
+          ],
+          "authProfile": {
+            "identityProviders": [
+                {
+                    "name": "Azure AD",
+                    "provider": {
+                        "kind": "AADIdentityProvider",
+                        "clientId": "clientId",
+                        "tenantId": "tenantId"
+                    }
+                }]
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json
new file mode 100644
index 000000000000..fc939f348e06
--- /dev/null
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json
@@ -0,0 +1,76 @@
+{
+  "parameters": {
+    "api-version": "2018-09-30-preview",
+    "subscriptionId": "subid1",
+    "resourceGroupName": "rg1",
+    "resourceName": "clustername1",
+    "parameters": {
+      "tags": {
+        "tier": "testing",
+        "archv3": ""
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1",
+        "location": "location1",
+        "name": "clustername1",
+        "tags": {
+          "archv3": "",
+          "tier": "testing"
+        },
+        "type": "Microsoft.ContainerService/OpenShiftManagedClusters",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "openShiftVersion": "v3.10",
+          "fqdn": "clustername1.location1.cloudapp.azure.com",
+          "networkProfile":{
+            "vnetCidr":"10.0.0.0/8"
+          },
+          "masterPoolProfile": {
+              "count": 3,
+              "vmSize": "Standard_D2s_v3",
+              "subnetCidr": "10.0.0.0/24"
+          },
+          "agentPoolProfiles": [
+            {
+              "name": "infra",
+              "role": "infra",
+              "count": 2,
+              "vmSize": "Standard_D4s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+            },
+            {
+              "name": "compute",
+              "role": "compute",
+              "count": 4,
+              "vmSize": "Standard_D4s_v3",
+              "osType": "Linux",
+              "subnetCidr": "10.0.0.0/24"
+            }
+          ],
+          "routerProfiles": [
+            {
+              "name": "default",
+              "fqdn": "2925bdf9337748f4bd3b.location1.cloudapp.azure.com",
+              "publicSubdomain": "bc309ee87c164153871c.location1.int.aksapp.io"
+            }
+          ],
+          "authProfile": {
+            "identityProviders": [{
+               "name": "Azure AD",
+               "provider": {
+                  "kind": "AADIdentityProvider",
+                  "clientId": "clientId",
+                  "tenantId": "tenantId"
+               }
+            }]
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json
new file mode 100644
index 000000000000..f43a0f78f1cb
--- /dev/null
+++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json
@@ -0,0 +1,664 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ContainerServiceClient",
+    "description": "The Container Service Client.",
+    "version": "2018-09-30-preview"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}": {
+      "get": {
+        "tags": [
+          "OpenShiftManagedClusters"
+        ],
+        "operationId": "OpenShiftManagedClusters_Get",
+        "summary": "Gets a openshift managed cluster.",
+        "description": "Gets the details of the managed openshift cluster with a specified resource group and name.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "resourceName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the openshift managed cluster resource."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/OpenShiftManagedCluster"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Get OpenShift Managed Cluster": {
+            "$ref": "./examples/OpenShiftManagedClustersGet.json"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "OpenShiftManagedClusters"
+        ],
+        "operationId": "OpenShiftManagedClusters_CreateOrUpdate",
+        "summary": "Creates or updates an openshift managed cluster.",
+        "description": "Creates or updates a openshift managed cluster with the specified configuration for agents and OpenShift version.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "resourceName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the openshift managed cluster resource."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/OpenShiftManagedCluster"
+            },
+            "description": "Parameters supplied to the Create or Update an OpenShift Managed Cluster operation."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/OpenShiftManagedCluster"
+            }
+          },
+          "201": {
+            "description": "Created",
+            "schema": {
+              "$ref": "#/definitions/OpenShiftManagedCluster"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.If any of the input parameters is wrong, 400(Bad Request) is returned.",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Create/Update OpenShift Managed Cluster": {
+            "$ref": "./examples/OpenShiftManagedClustersCreate_Update.json"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "OpenShiftManagedClusters"
+        ],
+        "operationId": "OpenShiftManagedClusters_UpdateTags",
+        "summary": "Updates tags on an openshift managed cluster.",
+        "description": "Updates an openshift managed cluster with the specified tags.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "resourceName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the openshift managed cluster resource."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/TagsObject"
+            },
+            "description": "Parameters supplied to the Update OpenShift Managed Cluster Tags operation."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/OpenShiftManagedCluster"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Update OpenShift Managed Cluster Tags": {
+            "$ref": "./examples/OpenShiftManagedClustersUpdateTags.json"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "OpenShiftManagedClusters"
+        ],
+        "operationId": "OpenShiftManagedClusters_Delete",
+        "summary": "Deletes an openshift managed cluster.",
+        "description": "Deletes the openshift managed cluster with a specified resource group and name.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "resourceName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the openshift managed cluster resource."
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted"
+          },
+          "204": {
+            "description": "NoContent"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Delete OpenShift Managed Cluster": {
+            "$ref": "./examples/OpenShiftManagedClustersDelete.json"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "Resource": {
+      "description": "The Resource model definition.",
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name"
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource type"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ]
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags"
+        }
+      },
+      "required": [
+        "location"
+      ],
+      "x-ms-azure-resource": true
+    },
+    "CloudError": {
+      "x-ms-external": true,
+      "properties": {
+        "error": {
+          "$ref": "#/definitions/CloudErrorBody"
+        }
+      },
+      "description": "An error response from the Container service."
+    },
+    "CloudErrorBody": {
+      "x-ms-external": true,
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically."
+        },
+        "message": {
+          "type": "string",
+          "description": "A message describing the error, intended to be suitable for display in a user interface."
+        },
+        "target": {
+          "type": "string",
+          "description": "The target of the particular error. For example, the name of the property in error."
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CloudErrorBody"
+          },
+          "description": "A list of additional details about the error."
+        }
+      },
+      "description": "An error response from the Container service."
+    },
+    "PurchasePlan": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The plan ID."
+        },
+        "product": {
+          "type": "string",
+          "description": "Specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element."
+        },
+        "promotionCode": {
+          "type": "string",
+          "description": "The promotion code."
+        },
+        "publisher": {
+          "type": "string",
+          "description": "The plan ID."
+        }
+      },
+      "description": "Used for establishing the purchase context of any 3rd Party artifact through MarketPlace."
+    },
+    "OpenShiftRouterProfile": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the router profile."
+        },
+        "publicSubdomain" : {
+          "type": "string",
+          "description": "DNS subdomain for openshift router."
+        },
+        "fqdn": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Auto-allocated FQDN for the OpenShift router."
+        }
+      },
+      "description": "Represents an OpenShift router"
+    },
+    "NetworkProfile": {
+      "properties": {
+        "vnetCidr": {
+          "type": "string",
+          "description": "CIDR for the OpenShift Vnet.",
+          "default": "10.0.0.0/8"
+        },
+        "peerVnetId" : {
+          "type": "string",
+          "description": "CIDR of the Vnet to peer."
+        }
+      },
+      "description": "Represents the OpenShift networking configuration"
+    },
+    "OSType": {
+      "type": "string",
+      "default": "Linux",
+      "enum": [
+        "Linux",
+        "Windows"
+      ],
+      "x-ms-enum": {
+        "name": "OSType",
+        "modelAsString": true
+      },
+      "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux."
+    },
+    "OpenShiftContainerServiceVMSize": {
+      "type": "string",
+      "x-ms-enum": {
+        "name": "OpenShiftContainerServiceVMSize",
+        "modelAsString": true
+      },
+      "description": "Size of OpenShift VMs.",
+      "enum": [
+        "Standard_D2s_v3",
+        "Standard_D4s_v3"
+      ]
+    },
+    "OpenShiftAgentPoolProfileRole": {
+      "type": "string",
+      "enum": [
+        "compute",
+        "infra"
+      ],
+      "x-ms-enum": {
+        "name": "OpenShiftAgentPoolProfileRole",
+        "modelAsString": true
+      },
+      "description": "OpenShiftAgentPoolProfileRole represents the role of the AgentPoolProfile."
+    },
+    "OpenShiftManagedClusterMasterPoolProfile": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Unique name of the master pool profile in the context of the subscription and resource group."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int32",
+          "maximum": 10,
+          "minimum": 1,
+          "description": "Number of masters (VMs) to host docker containers. The default value is 3.",
+          "default": 3
+        },
+        "vmSize": {
+          "$ref": "#/definitions/OpenShiftContainerServiceVMSize",
+          "description": "Size of agent VMs."
+        },
+        "subnetCidr": {
+          "type": "string",
+          "description": "Subnet CIDR for the peering."
+        },
+        "osType": {
+          "$ref": "#/definitions/OSType",
+          "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux."
+        }
+      },
+      "required": [
+        "count",
+        "vmSize"
+      ],
+      "description": "OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift master VMs."
+    },
+    "OpenShiftManagedClusterAgentPoolProfile": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Unique name of the pool profile in the context of the subscription and resource group."
+        },
+        "count": {
+          "type": "integer",
+          "format": "int32",
+          "maximum": 5,
+          "minimum": 1,
+          "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 5 (inclusive). The default value is 2. ",
+          "default": 2
+        },
+        "vmSize": {
+          "$ref": "#/definitions/OpenShiftContainerServiceVMSize",
+          "description": "Size of agent VMs."
+        },
+        "subnetCidr": {
+          "type": "string",
+          "description": "Subnet CIDR for the peering.",
+          "default": "10.0.0.0/24"
+        },
+        "osType": {
+          "$ref": "#/definitions/OSType",
+          "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux."
+        },
+        "role" : {
+          "description": "Define the role of the AgentPoolProfile.",
+          "$ref": "#/definitions/OpenShiftAgentPoolProfileRole"
+        }
+      },
+      "required": [
+        "name",
+        "count",
+        "vmSize"
+      ],
+      "description": "Defines the configuration of the OpenShift cluster VMs."
+    },
+    "OpenShiftManagedClusterIdentityProvider": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the provider."
+        },
+        "provider": {
+          "$ref": "#/definitions/OpenShiftManagedClusterBaseIdentityProvider",
+          "description": "Configuration of the provider."
+        }
+      },
+      "description": "Defines the configuration of the identity providers to be used in the OpenShift cluster."
+    },
+    "OpenShiftManagedClusterAuthProfile": {
+      "properties": {
+        "identityProviders": {
+          "type": "array",
+          "items" : {
+            "$ref": "#/definitions/OpenShiftManagedClusterIdentityProvider"
+          },
+          "description": "Type of authentication profile to use."
+        }
+      },
+      "description": "Defines all possible authentication profiles for the OpenShift cluster."
+    },
+    "OpenShiftManagedClusterProperties": {
+      "properties": {
+        "provisioningState": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The current deployment or provisioning state, which only appears in the response."
+        },
+        "openShiftVersion": {
+          "type": "string",
+          "description": "Version of OpenShift specified when creating the cluster."
+        },
+        "publicHostname": {
+          "type": "string",
+          "description": "Optional user-specified FQDN for OpenShift API server."
+        },
+        "fqdn": {
+          "type": "string",
+          "description": "User-specified FQDN for OpenShift API server loadbalancer internal hostname."
+        },
+        "networkProfile": {
+          "$ref": "#/definitions/NetworkProfile",
+          "description": "Configuration for OpenShift networking."
+        },
+        "routerProfiles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/OpenShiftRouterProfile"
+          },
+          "description": "Configuration for OpenShift router(s)."
+        },
+        "masterPoolProfile": {
+          "$ref": "#/definitions/OpenShiftManagedClusterMasterPoolProfile",
+          "description": "Configuration for OpenShift master VMs."
+        },
+        "agentPoolProfiles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/OpenShiftManagedClusterAgentPoolProfile"
+          },
+          "description": "Configuration of OpenShift cluster VMs."
+        },
+        "authProfile": {
+          "$ref": "#/definitions/OpenShiftManagedClusterAuthProfile",
+          "description": "Configures OpenShift authentication."
+        }
+      },
+      "required": [
+        "openShiftVersion"
+      ],
+      "description": "Properties of the openshift managed cluster."
+    },
+    "OpenShiftManagedCluster": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        },
+        {
+          "properties": {
+            "plan" : {
+              "description": "Define the resource plan as required by ARM for billing purposes",
+              "$ref": "#/definitions/PurchasePlan"
+            },
+            "properties": {
+              "description": "Properties of a openshift managed cluster.",
+              "$ref": "#/definitions/OpenShiftManagedClusterProperties",
+              "x-ms-client-flatten": true
+            }
+          }
+        }
+      ],
+      "description": "OpenShift Managed cluster."
+    },
+    "OpenShiftManagedClusterBaseIdentityProvider":
+    {
+      "discriminator": "kind",
+      "required": ["kind"],
+      "properties": {
+          "kind": {
+            "type": "string",
+            "description": "The kind of the provider."
+          }
+        },
+        "description": "Structure for any Identity provider."
+    },
+    "OpenShiftManagedClusterAADIdentityProvider": {
+      "x-ms-discriminator-value": "AADIdentityProvider",
+      "allOf": [
+      { 
+          "$ref": "#/definitions/OpenShiftManagedClusterBaseIdentityProvider"
+      },
+      {
+        "properties": {
+          "clientId": {
+            "type": "string",
+            "description": "The clientId password associated with the provider."
+          },
+          "secret": {
+            "type": "string",
+            "description": "The secret password associated with the provider."
+          },
+          "tenantId": {
+            "type": "string",
+            "description": "The tenantId associated with the provider."
+          }
+        }
+      }
+      ],
+      "description": "Defines the Identity provider for MS AAD."
+    },
+    "TagsObject": {
+      "properties": {
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags."
+        }
+      },
+      "description": "Tags object for patch operations."
+    }
+  },
+  "parameters": {
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.",
+      "x-ms-parameter-location": "client"
+    },
+    "ApiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "description": "Client Api Version.",
+      "x-ms-parameter-location": "client"
+    }
+  }
+}
diff --git a/specification/containerservices/resource-manager/readme.go.md b/specification/containerservices/resource-manager/readme.go.md
new file mode 100644
index 000000000000..c15fd1eae818
--- /dev/null
+++ b/specification/containerservices/resource-manager/readme.go.md
@@ -0,0 +1,70 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-09-30-preview
+  - tag: package-2018-03
+  - tag: package-2017-09
+  - tag: package-2017-08
+  - tag: package-2017-07
+```
+
+### Tag: package-2018-09-30-preview and go
+
+These settings apply only when `--package-2018-09-30-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-09-30-preview' && $(go)
+namespace: containerservice
+output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2018-09-30-preview/containerservice
+```
+
+### Tag: package-2018-03 and go
+
+These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-03' && $(go)
+namespace: containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-03-31/$(namespace)
+```
+
+### Tag: package-2017-09 and go
+
+These settings apply only when `--tag=package-2017-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-09' && $(go)
+namespace: containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-09-30/$(namespace)
+```
+
+### Tag: package-2017-08 and go
+
+These settings apply only when `--tag=package-2017-08 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-08' && $(go)
+namespace: containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-08-31/$(namespace)
+```
+
+### Tag: package-2017-07 and go
+
+These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-07' && $(go)
+namespace: containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-07-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md
index 0a85d3b35182..fa3b702e8477 100644
--- a/specification/containerservices/resource-manager/readme.md
+++ b/specification/containerservices/resource-manager/readme.md
@@ -2,7 +2,7 @@
 
 > see https://aka.ms/autorest
 
-This is the AutoRest configuration file for ContainerServices (ACS/AKS).
+This is the AutoRest configuration file for ContainerServices (ACS/AKS/OpenShift).
 
 The ContainerServices RPv2 consists of two similar services: ContainerServices and ManagedClusters.
 Each service has its own swagger spec.
@@ -34,7 +34,19 @@ These are the global settings for the ContainerServices API.
 
 ```yaml
 openapi-type: arm
-tag: package-2018-03
+tag: package-2018-09-30-preview
+```
+
+### Tag: package-2018-09-30-preview
+
+These settings apply only when `--tag=package-2018-09-30-preview` is specified on the command line.
+
+``` yaml $(tag) == 'package-2018-09-30-preview'
+input-file:
+- Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json
+- Microsoft.ContainerService/stable/2017-07-01/containerService.json
+- Microsoft.ContainerService/stable/2018-03-31/managedClusters.json
+- Microsoft.ContainerService/stable/2017-09-30/location.json
 ```
 
 ### Tag: package-2018-03
@@ -138,73 +150,13 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
       - bundle install && rake arm:regen_all_profiles['azure_mgmt_container_service']
 ```
 
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-03
-  - tag: package-2017-09
-  - tag: package-2017-08
-  - tag: package-2017-07
-```
-
-### Tag: package-2018-03 and go
-
-These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-03' && $(go)
-namespace: containerservice
-output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2018-03-31/containerservice
-```
-
-### Tag: package-2017-09 and go
-
-These settings apply only when `--tag=package-2017-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-09' && $(go)
-namespace: containerservice
-output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2017-09-30/containerservice
-```
-
-### Tag: package-2017-08 and go
-
-These settings apply only when `--tag=package-2017-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-08' && $(go)
-namespace: containerservice
-output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2017-08-31/containerservice
-```
-
-### Tag: package-2017-07 and go
-
-These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-07' && $(go)
-namespace: containerservice
-output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2017-07-01/containerservice
-```
-
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
@@ -219,7 +171,7 @@ python:
   payload-flattening-threshold: 2
   namespace: azure.mgmt.containerservice
   package-name: azure-mgmt-containerservice
-  package-version: 4.1.0
+  package-version: 4.3.0
   clear-output-folder: true
 ```
 ``` yaml $(python) && $(python-mode) == 'update'
@@ -233,6 +185,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-containerservice
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/containerservices/resource-manager/readme.typescript.md b/specification/containerservices/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..9ffef4d9698e
--- /dev/null
+++ b/specification/containerservices/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-containerservice"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-containerservice"
+  generate-metadata: true
+```
diff --git a/specification/cosmos-db/resource-manager/readme.go.md b/specification/cosmos-db/resource-manager/readme.go.md
new file mode 100644
index 000000000000..91ccd4fa86fc
--- /dev/null
+++ b/specification/cosmos-db/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: documentdb
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-04
+```
+
+### Tag: package-2015-04 and go
+
+These settings apply only when `--tag=package-2015-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-04' && $(go)
+output-folder: $(go-sdk-folder)/services/cosmos-db/mgmt/2015-04-08/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/cosmos-db/resource-manager/readme.md b/specification/cosmos-db/resource-manager/readme.md
index abb18ec08e80..485144ce4239 100644
--- a/specification/cosmos-db/resource-manager/readme.md
+++ b/specification/cosmos-db/resource-manager/readme.md
@@ -98,6 +98,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -132,31 +133,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: documentdb
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-04
-```
-
-### Tag: package-2015-04 and go
-
-These settings apply only when `--tag=package-2015-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-04' && $(go)
-output-folder: $(go-sdk-folder)/services/cosmos-db/mgmt/2015-04-08/documentdb
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/cosmos-db/resource-manager/readme.typescript.md b/specification/cosmos-db/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..a19d8eba771c
--- /dev/null
+++ b/specification/cosmos-db/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-cosmosdb"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-cosmosdb"
+  override-client-name: CosmosDBManagementClient
+  generate-metadata: true
+```
diff --git a/specification/cost-management/resource-manager/readme.md b/specification/cost-management/resource-manager/readme.md
index c1451b8a4a27..d7bae3938af8 100644
--- a/specification/cost-management/resource-manager/readme.md
+++ b/specification/cost-management/resource-manager/readme.md
@@ -106,6 +106,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-costmanagement
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/customer-insights/resource-manager/readme.go.md b/specification/customer-insights/resource-manager/readme.go.md
new file mode 100644
index 000000000000..9b13a619e871
--- /dev/null
+++ b/specification/customer-insights/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: customerinsights
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-04
+  - tag: package-2017-01
+```
+
+### Tag: package-2017-04 and go
+
+These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-04-26/$(namespace)
+```
+
+### Tag: package-2017-01 and go
+
+These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-01-01/$(namespace)
+```
diff --git a/specification/customer-insights/resource-manager/readme.md b/specification/customer-insights/resource-manager/readme.md
index 8cc231b53c5d..f3c27bbae17e 100644
--- a/specification/customer-insights/resource-manager/readme.md
+++ b/specification/customer-insights/resource-manager/readme.md
@@ -62,6 +62,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -83,91 +84,56 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
+See configuration in [readme.go.md](./readme.go.md)
 
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: customerinsights
-  clear-output-folder: true
+## Java
+
+These settings apply only when `--java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
+
+``` yaml $(java)
+azure-arm: true
+fluent: true
+namespace: com.microsoft.azure.management.customerinsights
+license-header: MICROSOFT_MIT_NO_CODEGEN
+payload-flattening-threshold: 1
+output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-customerinsights
 ```
 
-### Go multi-api
+### Java multi-api
 
-``` yaml $(go) && $(multiapi)
+``` yaml $(java) && $(multiapi)
 batch:
-  - tag: package-2017-04
   - tag: package-2017-01
+  - tag: package-2017-04
 ```
 
-### Tag: package-2017-04 and go
+### Tag: package-2017-01 and java
 
-These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2017-01 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2017-04' && $(go)
-output-folder: $(go-sdk-folder)/services/customerinsights/mgmt/2017-04-26/customerinsights
+``` yaml $(tag) == 'package-2017-01' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.customerinsights.v2017_01_01
+  output-folder: $(azure-libraries-for-java-folder)/customerinsights/resource-manager/v2017_01_01
+regenerate-manager: true
+generate-interface: true
 ```
 
-### Tag: package-2017-01 and go
+### Tag: package-2017-04 and java
 
-These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2017-04 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2017-01' && $(go)
-output-folder: $(go-sdk-folder)/services/customerinsights/mgmt/2017-01-01/customerinsights
+``` yaml $(tag) == 'package-2017-04' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.customerinsights.v2017_04_26
+  output-folder: $(azure-libraries-for-java-folder)/customerinsights/resource-manager/v2017_04_26
+regenerate-manager: true
+generate-interface: true
 ```
 
 
-## Java
-
-These settings apply only when `--java` is specified on the command line.
-Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
-
-``` yaml $(java)
-azure-arm: true
-fluent: true
-namespace: com.microsoft.azure.management.customerinsights
-license-header: MICROSOFT_MIT_NO_CODEGEN
-payload-flattening-threshold: 1
-output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-customerinsights
-```
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-2017-01
-  - tag: package-2017-04
-```
-
-### Tag: package-2017-01 and java
-
-These settings apply only when `--tag=package-2017-01 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2017-01' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.customerinsights.v2017_01_01
-  output-folder: $(azure-libraries-for-java-folder)/customerinsights/resource-manager/v2017_01_01
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-2017-04 and java
-
-These settings apply only when `--tag=package-2017-04 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2017-04' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.customerinsights.v2017_04_26
-  output-folder: $(azure-libraries-for-java-folder)/customerinsights/resource-manager/v2017_04_26
-regenerate-manager: true
-generate-interface: true
-```
-
-
diff --git a/specification/customer-insights/resource-manager/readme.typescript.md b/specification/customer-insights/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..f44a643b65d7
--- /dev/null
+++ b/specification/customer-insights/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-customerinsights"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-customerinsights"
+  generate-metadata: true
+```
diff --git a/specification/databox/resource-manager/readme.go.md b/specification/databox/resource-manager/readme.go.md
new file mode 100644
index 000000000000..9ac2aa4b2111
--- /dev/null
+++ b/specification/databox/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: databox
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-01
+```
+
+### Tag: package-2018-01 and go
+
+These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-01-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/databox/resource-manager/readme.md b/specification/databox/resource-manager/readme.md
index f809fa3409d9..c19f5106c848 100644
--- a/specification/databox/resource-manager/readme.md
+++ b/specification/databox/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # DataBox
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for DataBox.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for DataBox.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for DataBox, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the DataBox API.
 
 ``` yaml
@@ -50,6 +50,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-ruby
@@ -58,7 +59,7 @@ swagger-to-sdk:
       - bundle install && rake arm:regen_all_profiles['azure_mgmt_databox']
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -102,33 +103,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-databox
 ```
 
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: databox
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-01
-```
-
-### Tag: package-2018-01 and go
-
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/databox/mgmt/2018-01-01/databox
-```
-
 ## Ruby
 
 These settings apply only when `--ruby` is specified on the command line.
@@ -156,6 +130,10 @@ namespace: "Azure::Compute::Mgmt::V2018_01_01"
 output-folder: $(ruby-sdks-folder)/management/azure_mgmt_databox/lib
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/databox/resource-manager/readme.typescript.md b/specification/databox/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..076a31c5f6e5
--- /dev/null
+++ b/specification/databox/resource-manager/readme.typescript.md
@@ -0,0 +1,14 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  payload-flattening-threshold: 2
+  package-name: "@azure/arm-databox"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-databox"
+  generate-metadata: true
+```
diff --git a/specification/databricks/resource-manager/readme.go.md b/specification/databricks/resource-manager/readme.go.md
new file mode 100644
index 000000000000..9dbacacbe15e
--- /dev/null
+++ b/specification/databricks/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: databricks
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-04-01
+```
+
+### Tag: package-2018-04-01 and go
+
+These settings apply only when `--tag=package-2018-04-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-04-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-04-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/databricks/resource-manager/readme.md b/specification/databricks/resource-manager/readme.md
index afd1f9ec3282..2955728e0c8c 100644
--- a/specification/databricks/resource-manager/readme.md
+++ b/specification/databricks/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # Databricks
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Databricks.
@@ -7,29 +7,29 @@ This is the AutoRest configuration file for Databricks.
 
 
 ---
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-2018-04-01
-```
-
-### Tag: package-2018-04-01 and java
-
-These settings apply only when `--tag=package-2018-04-01 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2018-04-01' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.databricks.v2018_04_01
-  output-folder: $(azure-libraries-for-java-folder)/databricks/resource-manager/v2018_04_01
-regenerate-manager: true
-generate-interface: true
-```
-
-
-## Getting Started 
+
+### Java multi-api
+
+``` yaml $(java) && $(multiapi)
+batch:
+  - tag: package-2018-04-01
+```
+
+### Tag: package-2018-04-01 and java
+
+These settings apply only when `--tag=package-2018-04-01 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
+
+``` yaml $(tag) == 'package-2018-04-01' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.databricks.v2018_04_01
+  output-folder: $(azure-libraries-for-java-folder)/databricks/resource-manager/v2018_04_01
+regenerate-manager: true
+generate-interface: true
+```
+
+
+## Getting Started
 To build the SDK for Databricks, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -43,7 +43,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the Databricks API.
 
 ``` yaml
@@ -71,31 +71,10 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: databricks
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-04-01
-```
-
-### Tag: package-2018-04-01 and go
-
-These settings apply only when `--tag=package-2018-04-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-04-01' && $(go)
-output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-04-01/$(namespace)
-```
+See configuration in [readme.go.md](./readme.go.md)
\ No newline at end of file
diff --git a/specification/databricks/resource-manager/readme.typescript.md b/specification/databricks/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..c04eff734111
--- /dev/null
+++ b/specification/databricks/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-databricks"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-databricks"
+  generate-metadata: true
+```
diff --git a/specification/datacatalog/resource-manager/readme.go.md b/specification/datacatalog/resource-manager/readme.go.md
new file mode 100644
index 000000000000..58a9273bbec4
--- /dev/null
+++ b/specification/datacatalog/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: datacatalog
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-03-30
+```
+
+### Tag: package-2016-03-30 and go
+
+These settings apply only when `--tag=package-2016-03-30 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2016-03-30' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-03-30/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/datacatalog/resource-manager/readme.md b/specification/datacatalog/resource-manager/readme.md
index d3404517387e..1d1e58a97db7 100644
--- a/specification/datacatalog/resource-manager/readme.md
+++ b/specification/datacatalog/resource-manager/readme.md
@@ -51,6 +51,8 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 ## C#
@@ -74,18 +76,18 @@ csharp:
 ``` yaml
 directive:
   - suppress: R3018  # EnumInsteadOfBoolean
-    where: 
+    where:
       - $.definitions.ADCCatalogProperties.properties.successfullyProvisioned
       - $.definitions.ADCCatalogProperties.properties.enableAutomaticUnitAdjustment
     from: datacatalog.json
     reason: Booleans are used to indicate binary states of the property, enum is not appropriate.
   - suppress: R3027  # TrackedResourceListByResourceGroup
-    where: 
+    where:
       - $.definitions.ADCCatalog
     from: datacatalog.json
     reason: Catalog is per tenant level resources.
   - suppress: R3028  # TrackedResourceListBySubscription
-    where: 
+    where:
       - $.definitions.ADCCatalog
     from: datacatalog.json
     reason: Catalog can only be listed by resource group.
@@ -93,31 +95,7 @@ directive:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: datacatalog
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-03-30
-```
-
-### Tag: package-2016-03-30 and go
-
-These settings apply only when `--tag=package-2016-03-30 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2016-03-30' && $(go)
-output-folder: $(go-sdk-folder)/services/datacatalog/mgmt/2016-03-30/datacatalog
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/datacatalog/resource-manager/readme.typescript.md b/specification/datacatalog/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..889229d00a1a
--- /dev/null
+++ b/specification/datacatalog/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-datacatalog"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-datacatalog"
+  generate-metadata: true
+```
diff --git a/specification/datafactory/resource-manager/readme.go.md b/specification/datafactory/resource-manager/readme.go.md
new file mode 100644
index 000000000000..91ee03e48573
--- /dev/null
+++ b/specification/datafactory/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: datafactory
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-09-preview
+  - tag: package-2018-06
+```
+
+### Tag: package-2017-09-preview and go
+
+These settings apply only when `--tag=package-2017-09-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-09-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-09-01-preview/$(namespace)
+```
+
+### Tag: package-2018-06 and go
+
+These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-06-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/datafactory/resource-manager/readme.md b/specification/datafactory/resource-manager/readme.md
index 9369892e1d55..98be8b907c64 100644
--- a/specification/datafactory/resource-manager/readme.md
+++ b/specification/datafactory/resource-manager/readme.md
@@ -62,6 +62,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -108,43 +109,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-datafactory
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: datafactory
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-09-preview
-  - tag: package-2018-06
-```
-
-### Tag: package-2017-09-preview and go
-
-These settings apply only when `--tag=package-2017-09-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-09-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/datafactory/mgmt/2017-09-01-preview/datafactory
-```
-
-### Tag: package-2018-06 and go
-
-These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-06' && $(go)
-output-folder: $(go-sdk-folder)/services/datafactory/mgmt/2018-06-01/datafactory
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/datafactory/resource-manager/readme.typescript.md b/specification/datafactory/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..48009c60cd77
--- /dev/null
+++ b/specification/datafactory/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-datafactory"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-datafactory"
+  generate-metadata: true
+```
diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json
index c40b8f92d7c5..2985663554f7 100644
--- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json
+++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json
@@ -733,7 +733,9 @@
             "Scheduling",
             "Starting",
             "Paused",
-            "WaitingForCapacity"
+            "WaitingForCapacity",
+            "Yielded",
+            "Finalizing"
           ],
           "x-ms-enum": {
             "name": "JobState",
diff --git a/specification/datalake-analytics/data-plane/readme.go.md b/specification/datalake-analytics/data-plane/readme.go.md
new file mode 100644
index 000000000000..73aa2dca184c
--- /dev/null
+++ b/specification/datalake-analytics/data-plane/readme.go.md
@@ -0,0 +1,81 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+```yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+```yaml $(go) && $(multiapi)
+batch:
+  - tag: package-job-2017-09-preview
+  - tag: package-catalog-2016-11
+  - tag: package-job-2016-11
+  - tag: package-job-2016-03-preview
+  - tag: package-job-2015-11-preview
+  - tag: package-catalog-2015-10-preview
+```
+
+### Tag: package-job-2017-09-preview and go
+
+These settings apply only when `--tag=package-job-2017-09-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-job-2017-09-preview' && $(go)
+namespace: job
+output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/2017-09-01-preview/$(namespace)
+```
+
+### Tag: package-catalog-2016-11 and go
+
+These settings apply only when `--tag=package-catalog-2015-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-catalog-2016-11' && $(go)
+namespace: catalog
+output-folder: $(go-sdk-folder)/services/datalake/analytics/2016-11-01-preview/$(namespace)
+```
+
+### Tag: package-job-2016-11 and go
+
+These settings apply only when `--tag=package-job-2016-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-job-2016-11' && $(go)
+namespace: job
+output-folder: $(go-sdk-folder)/services/datalake/analytics/2016-11-01/$(namespace)
+```
+
+### Tag: package-job-2016-03-preview and go
+
+These settings apply only when `--tag=package-job-2016-03-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-job-2016-03-preview' && $(go)
+namespace: job
+output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/2016-03-20-preview/$(namespace)
+```
+
+### Tag: package-job-2015-11-preview and go
+
+These settings apply only when `--tag=package-job-2015-11-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-job-2015-11-preview' && $(go)
+namespace: job
+output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/2015-11-01-preview/$(namespace)
+```
+
+### Tag: package-catalog-2015-10-preview and go
+
+These settings apply only when `--tag=package-catalog-2015-10-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-catalog-2015-10-preview' && $(go)
+namespace: catalog
+output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/2015-10-01-preview/$(namespace)
+```
diff --git a/specification/datalake-analytics/data-plane/readme.md b/specification/datalake-analytics/data-plane/readme.md
index cd45e1b0db51..52dac03831e4 100644
--- a/specification/datalake-analytics/data-plane/readme.md
+++ b/specification/datalake-analytics/data-plane/readme.md
@@ -161,89 +161,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/catalog
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-job-2017-09-preview
-  - tag: package-catalog-2016-11
-  - tag: package-job-2016-11
-  - tag: package-job-2016-03-preview
-  - tag: package-job-2015-11-preview
-  - tag: package-catalog-2015-10-preview
-```
-
-### Tag: package-job-2017-09-preview and go
-
-These settings apply only when `--tag=package-job-2017-09-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-job-2017-09-preview' && $(go)
-namespace: job
-output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/2017-09-01-preview/job
-```
-
-### Tag: package-catalog-2016-11 and go
-
-These settings apply only when `--tag=package-catalog-2015-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-catalog-2016-11' && $(go)
-namespace: catalog
-output-folder: $(go-sdk-folder)/services/datalake/analytics/2016-11-01-preview/catalog
-```
-
-### Tag: package-job-2016-11 and go
-
-These settings apply only when `--tag=package-job-2016-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-job-2016-11' && $(go)
-namespace: job
-output-folder: $(go-sdk-folder)/services/datalake/analytics/2016-11-01/job
-```
-
-### Tag: package-job-2016-03-preview and go
-
-These settings apply only when `--tag=package-job-2016-03-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-job-2016-03-preview' && $(go)
-namespace: job
-output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/2016-03-20-preview/job
-```
-
-### Tag: package-job-2015-11-preview and go
-
-These settings apply only when `--tag=package-job-2015-11-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-job-2015-11-preview' && $(go)
-namespace: job
-output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/2015-11-01-preview/job
-```
-
-### Tag: package-catalog-2015-10-preview and go
-
-These settings apply only when `--tag=package-catalog-2015-10-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-catalog-2015-10-preview' && $(go)
-namespace: catalog
-output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/2015-10-01-preview/catalog
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/datalake-analytics/resource-manager/readme.go.md b/specification/datalake-analytics/resource-manager/readme.go.md
new file mode 100644
index 000000000000..3fe5176fc732
--- /dev/null
+++ b/specification/datalake-analytics/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: account
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-11
+  - tag: package-2015-10-preview
+```
+
+### Tag: package-2016-11 and go
+
+These settings apply only when `--tag=package-2016-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-11' && $(go)
+output-folder: $(go-sdk-folder)/services/datalake/analytics/mgmt/2016-11-01/$(namespace)
+```
+
+### Tag: package-2015-10-preview and go
+
+These settings apply only when `--tag=package-2015-10-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-10-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/mgmt/2015-10-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/datalake-analytics/resource-manager/readme.md b/specification/datalake-analytics/resource-manager/readme.md
index d7976a7dd397..52298f2e6b9f 100644
--- a/specification/datalake-analytics/resource-manager/readme.md
+++ b/specification/datalake-analytics/resource-manager/readme.md
@@ -114,44 +114,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: account
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-11
-  - tag: package-2015-10-preview
-```
-
-### Tag: package-2016-11 and go
-
-These settings apply only when `--tag=package-2016-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-11' && $(go)
-output-folder: $(go-sdk-folder)/services/datalake/analytics/mgmt/2016-11-01/account
-```
-
-### Tag: package-2015-10-preview and go
-
-These settings apply only when `--tag=package-2015-10-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-10-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/datalake/analytics/mgmt/2015-10-01-preview/account
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/datalake-store/data-plane/readme.go.md b/specification/datalake-store/data-plane/readme.go.md
new file mode 100644
index 000000000000..1e8647facc97
--- /dev/null
+++ b/specification/datalake-store/data-plane/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: filesystem
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-11
+  - tag: package-2015-10-preview
+```
+
+### Tag: package-2016-11 and go
+
+These settings apply only when `--tag=package-2016-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-11' && $(go)
+output-folder: $(go-sdk-folder)/services/datalake/store/2016-11-01/$(namespace)
+```
+
+### Tag: package-2015-10-preview and go
+
+These settings apply only when `--tag=package-2015-10-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-10-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/datalake/store/2015-10-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/datalake-store/data-plane/readme.md b/specification/datalake-store/data-plane/readme.md
index fd7048489cf1..27b4ea9cb201 100644
--- a/specification/datalake-store/data-plane/readme.md
+++ b/specification/datalake-store/data-plane/readme.md
@@ -77,44 +77,9 @@ csharp:
   output-folder: $(csharp-sdks-folder)/DataLake.Store/Management.DataLake.Store/Generated
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: filesystem
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-11
-  - tag: package-2015-10-preview
-```
-
-### Tag: package-2016-11 and go
-
-These settings apply only when `--tag=package-2016-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-11' && $(go)
-output-folder: $(go-sdk-folder)/services/datalake/store/2016-11-01/filesystem
-```
-
-### Tag: package-2015-10-preview and go
-
-These settings apply only when `--tag=package-2015-10-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-10-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/datalake/store/2015-10-01-preview/filesystem
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/datalake-store/resource-manager/readme.go.md b/specification/datalake-store/resource-manager/readme.go.md
new file mode 100644
index 000000000000..a24ac00912c7
--- /dev/null
+++ b/specification/datalake-store/resource-manager/readme.go.md
@@ -0,0 +1,37 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: account
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-11
+  - tag: package-2015-10-preview
+```
+
+### Tag: package-2016-11 and go
+
+These settings apply only when `--tag=package-2016-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-11' && $(go)
+output-folder: $(go-sdk-folder)/services/datalake/store/mgmt/2016-11-01/$(namespace)
+```
+
+### Tag: package-2015-10-preview and go
+
+These settings apply only when `--tag=package-2015-10-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-10-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/datalake/store/mgmt/2015-10-01-preview/$(namespace)
+```
+
diff --git a/specification/datalake-store/resource-manager/readme.md b/specification/datalake-store/resource-manager/readme.md
index 13f59d596055..fec1f3db43bc 100644
--- a/specification/datalake-store/resource-manager/readme.md
+++ b/specification/datalake-store/resource-manager/readme.md
@@ -126,44 +126,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-datalake-store
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: account
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-11
-  - tag: package-2015-10-preview
-```
-
-### Tag: package-2016-11 and go
-
-These settings apply only when `--tag=package-2016-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-11' && $(go)
-output-folder: $(go-sdk-folder)/services/datalake/store/mgmt/2016-11-01/account
-```
-
-### Tag: package-2015-10-preview and go
-
-These settings apply only when `--tag=package-2015-10-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-10-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/datalake/store/mgmt/2015-10-01-preview/account
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/datamigration/resource-manager/readme.go.md b/specification/datamigration/resource-manager/readme.go.md
new file mode 100644
index 000000000000..91483d023c19
--- /dev/null
+++ b/specification/datamigration/resource-manager/readme.go.md
@@ -0,0 +1,37 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: datamigration
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-11-15-preview
+  - tag: package-2018-03-31-preview
+```
+
+
+### Tag: package-2017-11-15-preview and go
+
+These settings apply only when `--tag=package-2017-11-15-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-11-15-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-11-15-preview/$(namespace)
+```
+
+### Tag: package-2018-03-31-preview and go
+
+These settings apply only when `--tag=package-2018-03-31-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-03-31-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-03-31-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/datamigration/resource-manager/readme.md b/specification/datamigration/resource-manager/readme.md
index e49cb5aeb082..4b8ab5ac8c3f 100644
--- a/specification/datamigration/resource-manager/readme.md
+++ b/specification/datamigration/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # Azure Database Migration Service
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Azure Database Migration Service.
@@ -8,7 +8,7 @@ The Data Migration RP comprises of APIs that enable a customer to manage the ser
 
 ---
 
-## Getting Started 
+## Getting Started
 To build the SDK for Compute, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 ## Configuration
 
-### Basic Information 
+### Basic Information
 These are the global settings for the Database Migration Service API.
 
 ``` yaml
@@ -160,6 +160,8 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 ## C#
@@ -206,41 +208,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: datamigration
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-11-15-preview
-  - tag: package-2018-03-31-preview
-```
-
-
-### Tag: package-2017-11-15-preview and go
-
-These settings apply only when `--tag=package-2017-11-15-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-11-15-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/datamigration/mgmt/2017-11-15-preview/datamigration
-```
-
-### Tag: package-2018-03-31-preview and go
-
-These settings apply only when `--tag=package-2018-03-31-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-03-31-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-03-31-preview/$(namespace)
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/datamigration/resource-manager/readme.typescript.md b/specification/datamigration/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..86dcd424b9c7
--- /dev/null
+++ b/specification/datamigration/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-datamigration"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-datamigration"
+  generate-metadata: true
+```
diff --git a/specification/deploymentmanager/resource-manager/readme.go.md b/specification/deploymentmanager/resource-manager/readme.go.md
new file mode 100644
index 000000000000..0c0a2b3093e2
--- /dev/null
+++ b/specification/deploymentmanager/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: deploymentmanager
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-09-01-preview
+```
+
+### Tag: package-2018-09-01-preview and go
+
+These settings apply only when `--tag=package-2018-09-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-09-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-09-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/deploymentmanager/resource-manager/readme.md b/specification/deploymentmanager/resource-manager/readme.md
index 0e882cb25ada..70bf3df6b7f7 100644
--- a/specification/deploymentmanager/resource-manager/readme.md
+++ b/specification/deploymentmanager/resource-manager/readme.md
@@ -38,13 +38,13 @@ directive:
     reason: Not available during preview.
   - suppress: TrackedResourcePatchOperation
     reason: Not available at this time.
-    from: deploymentmanager.json     
+    from: deploymentmanager.json
   - suppress: TrackedResourceListBySubscription
     reason: Not available at this time.
-    from: deploymentmanager.json 
+    from: deploymentmanager.json
   - suppress: TrackedResourceListByResourceGroup
     reason: Not available at this time.
-    from: deploymentmanager.json 
+    from: deploymentmanager.json
   - suppress: TrackedResourceGetOperation
     reason: The rollout resource has a get operation. The request and response types are separated for clarity.
     where: $.definitions.RolloutRequest
@@ -78,6 +78,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -95,8 +96,8 @@ csharp:
   namespace: Microsoft.Azure.Management.DeploymentManager
   payload-flattening-threshold: 2
   output-folder: $(csharp-sdks-folder)/DeploymentManager/Management/Generated
-  clear-output-folder: true  
-``` 
+  clear-output-folder: true
+```
 
 
 ## Python
@@ -127,34 +128,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-deploymentmanager
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: deploymentmanager
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-09-01-preview
-```
-
-### Tag: package-2018-09-01-preview and go
-
-These settings apply only when `--tag=package-2018-09-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-09-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/deploymentmanager/mgmt/2018-09-01-preview/deploymentmanager
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/deploymentmanager/resource-manager/readme.typescript.md b/specification/deploymentmanager/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..9b4156921069
--- /dev/null
+++ b/specification/deploymentmanager/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-deploymentmanager"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-deploymentmanager"
+  generate-metadata: true
+```
diff --git a/specification/deviceprovisioningservices/resource-manager/readme.go.md b/specification/deviceprovisioningservices/resource-manager/readme.go.md
new file mode 100644
index 000000000000..4d49e8def6ef
--- /dev/null
+++ b/specification/deviceprovisioningservices/resource-manager/readme.go.md
@@ -0,0 +1,47 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: iothub
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-11
+  - tag: package-2017-08
+  - tag: package-2018-01
+```
+
+
+### Tag: package-2018-01 and go
+
+These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-01' && $(go)
+output-folder: $(go-sdk-folder)/services/provisioningservices/mgmt/2018-01-22/$(namespace)
+```
+
+### Tag: package-2017-11 and go
+
+These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-11' && $(go)
+output-folder: $(go-sdk-folder)/services/provisioningservices/mgmt/2017-11-15/$(namespace)
+```
+
+### Tag: package-2017-08 and go
+
+These settings apply only when `--tag=package-2017-08 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-08' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/provisioningservices/mgmt/2017-08-21-preview/$(namespace)
+```
diff --git a/specification/deviceprovisioningservices/resource-manager/readme.md b/specification/deviceprovisioningservices/resource-manager/readme.md
index d1bc9143a85a..1b024740e070 100644
--- a/specification/deviceprovisioningservices/resource-manager/readme.md
+++ b/specification/deviceprovisioningservices/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # Device Provisioning Services
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Device Provisioning Services.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for Device Provisioning Services.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for DeviceProvisioningServices, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -19,7 +19,7 @@ To see additional help and options, run:
 
 ## Configuration
 
-### Basic Information 
+### Basic Information
 These are the global settings for the API.
 
 ``` yaml
@@ -68,10 +68,12 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -114,51 +116,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: iothub
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-11
-  - tag: package-2017-08
-  - tag: package-2018-01
-```
-
-
-### Tag: package-2018-01 and go
-
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/provisioningservices/mgmt/2018-01-22/iothub
-```
-
-### Tag: package-2017-11 and go
-
-These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-11' && $(go)
-output-folder: $(go-sdk-folder)/services/provisioningservices/mgmt/2017-11-15/iothub
-```
-
-### Tag: package-2017-08 and go
-
-These settings apply only when `--tag=package-2017-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-08' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/provisioningservices/preview/mgmt/2017-08-21-preview/iothub
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/deviceprovisioningservices/resource-manager/readme.typescript.md b/specification/deviceprovisioningservices/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..3d161b41964d
--- /dev/null
+++ b/specification/deviceprovisioningservices/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-deviceprovisioningservices"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-deviceprovisioningservices"
+  generate-metadata: true
+```
diff --git a/specification/devspaces/resource-manager/readme.go.md b/specification/devspaces/resource-manager/readme.go.md
new file mode 100644
index 000000000000..38d4496042d2
--- /dev/null
+++ b/specification/devspaces/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: devspaces
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-06-01-preview
+```
+
+### Tag: package-2018-06-01-preview and go
+
+These settings apply only when `--tag=package-2018-06-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-06-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/devspaces/resource-manager/readme.md b/specification/devspaces/resource-manager/readme.md
index 934055b60ac8..2e956c19fa8f 100644
--- a/specification/devspaces/resource-manager/readme.md
+++ b/specification/devspaces/resource-manager/readme.md
@@ -52,6 +52,8 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 ## C#
@@ -72,30 +74,7 @@ csharp:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: devspaces
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-06-01-preview
-```
-
-### Tag: package-2018-06-01-preview and go
-
-These settings apply only when `--tag=package-2018-06-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-06-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-06-01-preview/$(namespace)
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/devspaces/resource-manager/readme.typescript.md b/specification/devspaces/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..967dd28b32d9
--- /dev/null
+++ b/specification/devspaces/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-devspaces"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-devspaces"
+  generate-metadata: true
+```
diff --git a/specification/devtestlabs/resource-manager/readme.go.md b/specification/devtestlabs/resource-manager/readme.go.md
new file mode 100644
index 000000000000..2aaa918a3746
--- /dev/null
+++ b/specification/devtestlabs/resource-manager/readme.go.md
@@ -0,0 +1,37 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: dtl
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-05
+  - tag: package-2015-05-preview
+```
+
+
+### Tag: package-2016-05 and go
+
+These settings apply only when `--tag=package-2016-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-05' && $(go)
+output-folder: $(go-sdk-folder)/services/devtestlabs/mgmt/2016-05-15/$(namespace)
+```
+
+### Tag: package-2015-05-preview and go
+
+These settings apply only when `--tag=package-2015-05-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-05-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/devtestlabs/mgmt/2015-05-21-preview/$(namespace)
+```
diff --git a/specification/devtestlabs/resource-manager/readme.md b/specification/devtestlabs/resource-manager/readme.md
index 9f28a653a8ab..3edfb48da9d4 100644
--- a/specification/devtestlabs/resource-manager/readme.md
+++ b/specification/devtestlabs/resource-manager/readme.md
@@ -63,6 +63,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -111,45 +112,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-devtestlabs
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: dtl
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-05
-  - tag: package-2015-05-preview
-```
-
-
-### Tag: package-2016-05 and go
-
-These settings apply only when `--tag=package-2016-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-05' && $(go)
-output-folder: $(go-sdk-folder)/services/devtestlabs/mgmt/2016-05-15/dtl
-```
-
-### Tag: package-2015-05-preview and go
-
-These settings apply only when `--tag=package-2015-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/devtestlabs/mgmt/2015-05-21-preview/dtl
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/devtestlabs/resource-manager/readme.typescript.md b/specification/devtestlabs/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..2f78e61476af
--- /dev/null
+++ b/specification/devtestlabs/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-devtestlabs"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-devtestlabs"
+  generate-metadata: true
+```
diff --git a/specification/dns/resource-manager/readme.go.md b/specification/dns/resource-manager/readme.go.md
index e207ea3904ca..cd7085f06a11 100644
--- a/specification/dns/resource-manager/readme.go.md
+++ b/specification/dns/resource-manager/readme.go.md
@@ -26,7 +26,7 @@ These settings apply only when `--tag=package-2018-03-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-03-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/dns/mgmt/2018-03-01-preview/dns
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-03-01-preview/$(namespace)
 ```
 
 ### Tag: package-2017-10 and go
@@ -35,7 +35,7 @@ These settings apply only when `--tag=package-2017-10 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-10' && $(go)
-output-folder: $(go-sdk-folder)/services/dns/mgmt/2017-10-01/dns
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-10-01/$(namespace)
 ```
 
 ### Tag: package-2017-09 and go
@@ -44,7 +44,7 @@ These settings apply only when `--tag=package-2017-09 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-09' && $(go)
-output-folder: $(go-sdk-folder)/services/dns/mgmt/2017-09-01/dns
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-09-01/$(namespace)
 ```
 
 ### Tag: package-2016-04 and go
@@ -53,7 +53,7 @@ These settings apply only when `--tag=package-2016-04 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-04' && $(go)
-output-folder: $(go-sdk-folder)/services/dns/mgmt/2016-04-01/dns
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-04-01/$(namespace)
 ```
 
 ### Tag: package-2015-05-preview and go
@@ -62,5 +62,5 @@ These settings apply only when `--tag=package-2015-05-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2015-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/dns/mgmt/2015-05-04-preview/dns
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-05-04-preview/$(namespace)
 ```
diff --git a/specification/dns/resource-manager/readme.typescript.md b/specification/dns/resource-manager/readme.typescript.md
index 3cf4625de8f9..bb632956c7be 100644
--- a/specification/dns/resource-manager/readme.typescript.md
+++ b/specification/dns/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-dns"
-  output-folder: $(typescript-sdks-folder)/packages/arm-dns
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-dns"
   generate-metadata: true
 ```
diff --git a/specification/domainservices/resource-manager/readme.go.md b/specification/domainservices/resource-manager/readme.go.md
new file mode 100644
index 000000000000..810a7ccaac4d
--- /dev/null
+++ b/specification/domainservices/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: aad
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-01
+  - tag: package-2017-06
+```
+
+### Tag: package-2017-01 and go
+
+These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-01' && $(go)
+output-folder: $(go-sdk-folder)/services/domainservices/mgmt/2017-01-01/$(namespace)
+```
+
+### Tag: package-2017-06 and go
+
+These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-06' && $(go)
+output-folder: $(go-sdk-folder)/services/domainservices/mgmt/2017-06-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/domainservices/resource-manager/readme.md b/specification/domainservices/resource-manager/readme.md
index a8ab06845828..0a169d44c0c7 100644
--- a/specification/domainservices/resource-manager/readme.md
+++ b/specification/domainservices/resource-manager/readme.md
@@ -59,6 +59,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -77,43 +78,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: aad
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-01
-  - tag: package-2017-06
-```
-
-### Tag: package-2017-01 and go
-
-These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-01' && $(go)
-output-folder: $(go-sdk-folder)/services/domainservices/mgmt/2017-01-01/aad
-```
-
-### Tag: package-2017-06 and go
-
-These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-06' && $(go)
-output-folder: $(go-sdk-folder)/services/domainservices/mgmt/2017-06-01/aad
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/domainservices/resource-manager/readme.typescript.md b/specification/domainservices/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..259abd54adc6
--- /dev/null
+++ b/specification/domainservices/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-domainservices"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-domainservices"
+  override-client-name: DomainservicesManagementClient
+  generate-metadata: true
+```
diff --git a/specification/eventgrid/data-plane/readme.go.md b/specification/eventgrid/data-plane/readme.go.md
new file mode 100644
index 000000000000..7db2747103ef
--- /dev/null
+++ b/specification/eventgrid/data-plane/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: eventgrid
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-01
+```
+
+### Tag: package-2018-01 and go
+
+These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2018-01-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/eventgrid/data-plane/readme.md b/specification/eventgrid/data-plane/readme.md
index f506f4e8d7ae..557799c08222 100644
--- a/specification/eventgrid/data-plane/readme.md
+++ b/specification/eventgrid/data-plane/readme.md
@@ -67,6 +67,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -119,31 +120,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: eventgrid
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-01
-```
-
-### Tag: package-2018-01 and go
-
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/eventgrid/2018-01-01/eventgrid
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/eventgrid/data-plane/readme.typescript.md b/specification/eventgrid/data-plane/readme.typescript.md
new file mode 100644
index 000000000000..b1efcf49e82b
--- /dev/null
+++ b/specification/eventgrid/data-plane/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/eventgrid"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/eventgrid"
+  generate-metadata: true
+```
diff --git a/specification/eventgrid/resource-manager/readme.go.md b/specification/eventgrid/resource-manager/readme.go.md
new file mode 100644
index 000000000000..6508061bc189
--- /dev/null
+++ b/specification/eventgrid/resource-manager/readme.go.md
@@ -0,0 +1,56 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: eventgrid
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-05-preview
+  - tag: package-2018-01
+  - tag: package-2017-09-preview
+  - tag: package-2017-06-preview
+```
+
+### Tag: package-2018-05-preview and go
+
+These settings apply only when `--tag=package-2018-05-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-05-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-05-01-preview/$(namespace)
+```
+
+### Tag: package-2018-01 and go
+
+These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-01-01/$(namespace)
+```
+
+### Tag: package-2017-09-preview and go
+
+These settings apply only when `--tag=package-2017-09-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-09-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-09-15-preview/$(namespace)
+```
+
+### Tag: package-2017-06-preview and go
+
+These settings apply only when `--tag=package-2017-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-06-15-preview/$(namespace)
+```
diff --git a/specification/eventgrid/resource-manager/readme.md b/specification/eventgrid/resource-manager/readme.md
index 7063fd8e81bd..814def808d4f 100644
--- a/specification/eventgrid/resource-manager/readme.md
+++ b/specification/eventgrid/resource-manager/readme.md
@@ -94,6 +94,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -146,61 +147,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: eventgrid
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-05-preview
-  - tag: package-2018-01
-  - tag: package-2017-09-preview
-  - tag: package-2017-06-preview
-```
-
-### Tag: package-2018-05-preview and go
-
-These settings apply only when `--tag=package-2018-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/eventgrid/mgmt/2018-05-01-preview/eventgrid
-```
-
-### Tag: package-2018-01 and go
-
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/eventgrid/mgmt/2018-01-01/eventgrid
-```
-
-### Tag: package-2017-09-preview and go
-
-These settings apply only when `--tag=package-2017-09-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-09-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/eventgrid/mgmt/2017-09-15-preview/eventgrid
-```
-
-### Tag: package-2017-06-preview and go
-
-These settings apply only when `--tag=package-2017-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/eventgrid/mgmt/2017-06-15-preview/eventgrid
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/eventgrid/resource-manager/readme.typescript.md b/specification/eventgrid/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..40cd1dd4e887
--- /dev/null
+++ b/specification/eventgrid/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-eventgrid"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-eventgrid"
+  generate-metadata: true
+```
diff --git a/specification/eventhub/resource-manager/readme.go.md b/specification/eventhub/resource-manager/readme.go.md
new file mode 100644
index 000000000000..87168a449546
--- /dev/null
+++ b/specification/eventhub/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: eventhub
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-04
+  - tag: package-2015-08
+  - tag: package-2018-01-preview
+```
+
+### Tag: package-2017-04 and go
+
+These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-04-01/$(namespace)
+```
+
+### Tag: package-2018-01-preview and go
+
+These settings apply only when `--tag=package-2018-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-01-01-preview/$(namespace)
+```
+
+### Tag: package-2015-08 and go
+
+These settings apply only when `--tag=package-2015-08 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-08' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-08-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/eventhub/resource-manager/readme.md b/specification/eventhub/resource-manager/readme.md
index 65f0235a7309..a14a19c9acba 100644
--- a/specification/eventhub/resource-manager/readme.md
+++ b/specification/eventhub/resource-manager/readme.md
@@ -84,6 +84,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -133,54 +134,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-eventhub
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: eventhub
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-04
-  - tag: package-2015-08
-  - tag: package-2018-01-preview
-```
-
-### Tag: package-2017-04 and go
-
-These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04' && $(go)
-output-folder: $(go-sdk-folder)/services/eventhub/mgmt/2017-04-01/eventhub
-```
-
-### Tag: package-2018-01-preview and go
-
-These settings apply only when `--tag=package-2018-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/eventhub/mgmt/2018-01-01-preview/eventhub
-```
-
-### Tag: package-2015-08 and go
-
-These settings apply only when `--tag=package-2015-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-08' && $(go)
-output-folder: $(go-sdk-folder)/services/eventhub/mgmt/2015-08-01/eventhub
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/eventhub/resource-manager/readme.typescript.md b/specification/eventhub/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..8336f2dcda0b
--- /dev/null
+++ b/specification/eventhub/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-eventhub"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-eventhub"
+  generate-metadata: true
+```
diff --git a/specification/frontdoor/resource-manager/readme.go.md b/specification/frontdoor/resource-manager/readme.go.md
new file mode 100644
index 000000000000..97b1480b311b
--- /dev/null
+++ b/specification/frontdoor/resource-manager/readme.go.md
@@ -0,0 +1,27 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: frontdoor
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-08-preview
+```
+
+
+### Tag: package-2018-08-preview and go
+
+These settings apply only when `--tag=package-2018-08-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-08-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-08-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/frontdoor/resource-manager/readme.md b/specification/frontdoor/resource-manager/readme.md
index 8742b239359e..1df43c336033 100644
--- a/specification/frontdoor/resource-manager/readme.md
+++ b/specification/frontdoor/resource-manager/readme.md
@@ -61,6 +61,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-libraries-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -79,35 +80,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: frontdoor
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-08-preview
-```
-
-
-### Tag: package-2018-08-preview and go
-
-These settings apply only when `--tag=package-2018-08-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-08-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/frontdoor/mgmt/2018-08-01-preview/frontdoor
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/frontdoor/resource-manager/readme.typescript.md b/specification/frontdoor/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..c20aff2ea590
--- /dev/null
+++ b/specification/frontdoor/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-frontdoor"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-frontdoor"
+  generate-metadata: true
+```
diff --git a/specification/graphrbac/data-plane/readme.go.md b/specification/graphrbac/data-plane/readme.go.md
new file mode 100644
index 000000000000..c2f8ba1997ab
--- /dev/null
+++ b/specification/graphrbac/data-plane/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: graphrbac
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: "1.6"
+```
+
+### Tag: 1.6 and go
+
+These settings apply only when `--tag=1.6 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == '1.6' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/1.6/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/graphrbac/data-plane/readme.md b/specification/graphrbac/data-plane/readme.md
index 51b73c704bf7..b92980494b79 100644
--- a/specification/graphrbac/data-plane/readme.md
+++ b/specification/graphrbac/data-plane/readme.md
@@ -53,6 +53,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -89,6 +90,7 @@ python:
   payload-flattening-threshold: 2
   namespace: azure.graphrbac
   package-name: azure-graphrbac
+  package-version: 0.50.0
   clear-output-folder: true
 ```
 ``` yaml $(python) && $(python-mode) == 'update'
@@ -102,34 +104,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-graphrbac
 ```
 
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: graphrbac
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: "1.6"
-```
-
-### Tag: 1.6 and go
-
-These settings apply only when `--tag=1.6 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == '1.6' && $(go)
-output-folder: $(go-sdk-folder)/services/graphrbac/1.6/graphrbac
-```
-
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
@@ -143,6 +117,9 @@ python:
   namespace: azure.graphrbac
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/graphrbac/data-plane/readme.typescript.md b/specification/graphrbac/data-plane/readme.typescript.md
new file mode 100644
index 000000000000..41bb54a38dae
--- /dev/null
+++ b/specification/graphrbac/data-plane/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/graph"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/graph"
+  payload-flattening-threshold: 1
+  generate-metadata: true
+```
diff --git a/specification/graphrbac/data-plane/stable/1.6/graphrbac.json b/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
index 5ac828d19e2e..96cb6761dcf6 100644
--- a/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
+++ b/specification/graphrbac/data-plane/stable/1.6/graphrbac.json
@@ -39,9 +39,9 @@
     "/{tenantID}/me": {
       "get": {
         "tags": [
-          "Objects"
+          "SignedInUser"
         ],
-        "operationId": "Objects_GetCurrentUser",
+        "operationId": "SignedInUser_Get",
         "description": "Gets the details for the currently logged-in user.",
         "parameters": [
           {
@@ -55,7 +55,7 @@
           "200": {
             "description": "OK. The operation was successful.",
             "schema": {
-              "$ref": "#/definitions/AADObject"
+              "$ref": "#/definitions/User"
             }
           },
           "default": {
@@ -67,6 +67,41 @@
         }
       }
     },
+    "/{tenantID}/me/ownedObjects": {
+      "get": {
+        "tags": [
+          "SignedInUser"
+        ],
+        "operationId": "SignedInUser_ListOwnedObjects",
+        "description": "Get the list of directory objects that are owned by the user.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The operation was successful.",
+            "schema": {
+              "$ref": "#/definitions/DirectoryObjectListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "odata.nextLink",
+          "operationName": "SignedInUser_ListOwnedObjectsNext"
+        }
+      }
+    },
     "/{tenantID}/applications": {
       "post": {
         "tags": [
@@ -148,6 +183,121 @@
         }
       }
     },
+    "/{tenantID}/deletedApplications/{objectId}/restore": {
+      "post": {
+        "tags": [
+          "deletedApplications"
+        ],
+        "operationId": "DeletedApplications_Restore",
+        "description": "Restores the deleted application in the directory.",
+        "parameters": [
+    	  {
+            "name": "objectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "Application object ID."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The application was restored successfully.",
+            "schema": {
+              "$ref": "#/definitions/Application"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        }
+      }
+    },
+    "/{tenantID}/deletedApplications": {
+      "get": {
+        "tags": [
+          "deletedApplications"
+        ],
+        "operationId": "DeletedApplications_List",
+        "description": "Gets a list of deleted applications in the directory.",
+        "parameters": [
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The filter to apply to the operation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The applications were retrieved successfully.",
+            "schema": {
+              "$ref": "#/definitions/ApplicationListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "odata.nextLink",
+          "operationName": "DeletedApplications_ListNext"
+        }
+      }
+    },
+    "/{tenantID}/deletedApplications/{applicationObjectId}": {
+      "delete": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "DeletedApplications_HardDelete",
+        "description": "Hard-delete an application.",
+        "parameters": [
+          {
+            "name": "applicationObjectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "Application object ID."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        }
+      }
+    },
     "/{tenantID}/applications/{applicationObjectId}": {
       "delete": {
         "tags": [
@@ -299,7 +449,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "odata.nextLink"
         }
       }
     },
@@ -323,7 +473,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/ApplicationAddOwnerParameters"
+              "$ref": "#/definitions/AddOwnerParameters"
             },
             "description": "The URL of the owner object, such as https://graph.windows.net/0b1f9851-1bf0-433f-aec3-cb9272f093dc/directoryObjects/f260bbc4-c254-447b-94cf-293b5ec434dd."
           },
@@ -347,6 +497,48 @@
         }
       }
     },
+    "/{tenantID}/applications/{applicationObjectId}/$links/owners/{ownerObjectId}": {
+      "delete": {
+        "tags": [
+          "ApplicationOwners"
+        ],
+        "operationId": "Applications_RemoveOwner",
+        "description": "Remove a member from owners.",
+        "parameters": [
+          {
+            "name": "applicationObjectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The object ID of the application from which to remove the owner."
+          },
+          {
+            "name": "ownerObjectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "Owner object id"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content. Indicates success. No response body is returned."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        }
+      }
+    },
     "/{tenantID}/applications/{applicationObjectId}/keyCredentials": {
       "get": {
         "tags": [
@@ -746,7 +938,7 @@
           "200": {
             "description": "OK. The operation was successful.",
             "schema": {
-              "$ref": "#/definitions/GetObjectsResult"
+              "$ref": "#/definitions/DirectoryObjectListResult"
             }
           },
           "default": {
@@ -883,6 +1075,134 @@
         }
       }
     },
+    "/{tenantID}/groups/{objectId}/owners": {
+      "get": {
+        "tags": [
+          "GroupOwners"
+        ],
+        "operationId": "Groups_ListOwners",
+        "summary": "Directory objects that are owners of the group.",
+        "description": "The owners are a set of non-admin users who are allowed to modify this object.",
+        "parameters": [
+          {
+            "name": "objectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The object ID of the group for which to get owners."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The operation was successful.",
+            "schema": {
+              "$ref": "#/definitions/DirectoryObjectListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "odata.nextLink"
+        }
+      }
+    },
+    "/{tenantID}/groups/{objectId}/$links/owners": {
+      "post": {
+        "tags": [
+          "GroupsOwners"
+        ],
+        "operationId": "Groups_AddOwner",
+        "description": "Add an owner to a group.",
+        "parameters": [
+          {
+            "name": "objectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The object ID of the application to which to add the owner."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/AddOwnerParameters"
+            },
+            "description": "The URL of the owner object, such as https://graph.windows.net/0b1f9851-1bf0-433f-aec3-cb9272f093dc/directoryObjects/f260bbc4-c254-447b-94cf-293b5ec434dd."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content. Indicates success. No response body is returned."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        }
+      }
+    },
+    "/{tenantID}/groups/{objectId}/$links/owners/{ownerObjectId}": {
+      "delete": {
+        "tags": [
+          "GroupsOwners"
+        ],
+        "operationId": "Groups_RemoveOwner",
+        "description": "Remove a member from owners.",
+        "parameters": [
+          {
+            "name": "objectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The object ID of the group from which to remove the owner."
+          },
+          {
+            "name": "ownerObjectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "Owner object id"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content. Indicates success. No response body is returned."
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        }
+      }
+    },
     "/{tenantID}/servicePrincipals": {
       "post": {
         "tags": [
@@ -965,6 +1285,48 @@
       }
     },
     "/{tenantID}/servicePrincipals/{objectId}": {
+      "patch": {
+        "tags": [
+          "ServicePrincipal"
+        ],
+        "operationId": "ServicePrincipals_Update",
+        "description": "Updates a service principal in the directory.",
+        "parameters": [
+          {
+            "name": "objectId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The object ID of the service principal to delete."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ServicePrincipalUpdateParameters"
+            },
+            "description": "Parameters to update a service principal."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        }
+      },
       "delete": {
         "tags": [
           "ServicePrincipal"
@@ -1073,7 +1435,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "odata.nextLink"
         }
       }
     },
@@ -1493,7 +1855,7 @@
           "Objects"
         ],
         "operationId": "Objects_GetObjectsByObjectIds",
-        "description": "Gets AD group membership for the specified AD object IDs.",
+        "description": "Gets the directory objects specified in a list of object IDs. You can also specify which resource collections (users, groups, etc.) should be searched by specifying the optional types parameter.",
         "parameters": [
           {
             "name": "parameters",
@@ -1515,7 +1877,7 @@
           "200": {
             "description": "OK. The operation was successful.",
             "schema": {
-              "$ref": "#/definitions/GetObjectsResult"
+              "$ref": "#/definitions/DirectoryObjectListResult"
             }
           }
         },
@@ -1631,7 +1993,7 @@
          "OAuth2Permissions_Grant"
        ],
         "consumes" : [ "application/json" ],
-        "operationId": "OAuth2_Post",
+        "operationId": "OAuth2_Grant",
         "description": "Grants OAuth2 permissions for the relevant resource Ids of an app.",
         "produces" : [ "application/json" ],
         "parameters" : [
@@ -1667,6 +2029,49 @@
     }
   },
   "x-ms-paths": {
+    "/{tenantID}/{nextLink}?SignedInUser_ListOwnedObjectsNext": {
+      "get": {
+        "tags": [
+          "SignedInUser"
+        ],
+        "operationId": "SignedInUser_ListOwnedObjectsNext",
+        "description": "Get the list of directory objects that are owned by the user.",
+        "parameters": [
+          {
+            "name": "nextLink",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "Next link for the list operation.",
+            "x-ms-skip-url-encoding": true
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The operation was successful.",
+            "schema": {
+              "$ref": "#/definitions/DirectoryObjectListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "odata.nextLink",
+          "operationName": "SignedInUser_ListOwnedObjectsNext"
+        }
+      }
+    },
     "/{tenantID}/{nextLink}?Groups_ListNext": {
       "get": {
         "tags": [
@@ -1706,17 +2111,60 @@
         },
         "x-ms-pageable": {
           "nextLinkName": "odata.nextLink",
-          "operationName": "Groups_ListNext"
+          "operationName": "Groups_ListNext"
+        }
+      }
+    },
+    "/{tenantID}/{nextLink}?Groups_GetGroupMembersNext": {
+      "get": {
+        "tags": [
+          "Group"
+        ],
+        "operationId": "Groups_GetGroupMembersNext",
+        "description": "Gets the members of a group.",
+        "parameters": [
+          {
+            "name": "nextLink",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "Next link for the list operation.",
+            "x-ms-skip-url-encoding": true
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/tenantIDInPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK. The operation was successful.",
+            "schema": {
+              "$ref": "#/definitions/DirectoryObjectListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/GraphError"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "odata.nextLink",
+          "operationName": "Groups_GetGroupMembersNext"
         }
       }
     },
-    "/{tenantID}/{nextLink}?Groups_GetGroupMembersNext": {
+    "/{tenantID}/{nextLink}?Applications_ListNext": {
       "get": {
         "tags": [
-          "Group"
+          "Applications"
         ],
-        "operationId": "Groups_GetGroupMembersNext",
-        "description": "Gets the members of a group.",
+        "operationId": "Applications_ListNext",
+        "description": "Gets a list of applications from the current tenant.",
         "parameters": [
           {
             "name": "nextLink",
@@ -1737,7 +2185,7 @@
           "200": {
             "description": "OK. The operation was successful.",
             "schema": {
-              "$ref": "#/definitions/GetObjectsResult"
+              "$ref": "#/definitions/ApplicationListResult"
             }
           },
           "default": {
@@ -1749,17 +2197,17 @@
         },
         "x-ms-pageable": {
           "nextLinkName": "odata.nextLink",
-          "operationName": "Groups_GetGroupMembersNext"
+          "operationName": "Applications_ListNext"
         }
       }
     },
-    "/{tenantID}/{nextLink}?Applications_ListNext": {
+    "/{tenantID}/{nextLink}?DeletedApplications_ListNext": {
       "get": {
         "tags": [
-          "Applications"
+          "deletedApplications"
         ],
-        "operationId": "Applications_ListNext",
-        "description": "Gets a list of applications from the current tenant.",
+        "operationId": "DeletedApplications_ListNext",
+        "description": "Gets a list of deleted applications in the directory.",
         "parameters": [
           {
             "name": "nextLink",
@@ -1792,7 +2240,7 @@
         },
         "x-ms-pageable": {
           "nextLinkName": "odata.nextLink",
-          "operationName": "Applications_ListNext"
+          "operationName": "DeletedApplications_ListNext"
         }
       }
     },
@@ -1909,7 +2357,7 @@
           "200": {
             "description": "OK. The operation was successful.",
             "schema": {
-              "$ref": "#/definitions/GetObjectsResult"
+              "$ref": "#/definitions/DirectoryObjectListResult"
             }
           }
         },
@@ -2099,6 +2547,13 @@
     "ApplicationCreateParameters": {
       "type": "object",
       "properties": {
+        "appRoles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AppRole"
+          },
+          "description": "The collection of application roles that an application may declare. These roles can be assigned to users, groups or service principals."
+        },
         "availableToOtherTenants": {
           "type": "boolean",
           "description": "Whether the application is available to other tenants."
@@ -2164,6 +2619,13 @@
     "ApplicationUpdateParameters": {
       "type": "object",
       "properties": {
+        "appRoles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AppRole"
+          },
+          "description": "The collection of application roles that an application may declare. These roles can be assigned to users, groups or service principals."
+        },
         "availableToOtherTenants": {
           "type": "boolean",
           "description": "Whether the application is available to other tenants"
@@ -2233,6 +2695,13 @@
           "type": "string",
           "description": "The application ID."
         },
+        "appRoles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AppRole"
+          },
+          "description": "The collection of application roles that an application may declare. These roles can be assigned to users, groups or service principals."
+        },
         "appPermissions": {
           "type": "array",
           "items": {
@@ -2290,7 +2759,39 @@
       },
       "description": "Application list operation result."
     },
-    "ApplicationAddOwnerParameters": {
+    "AppRole": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Unique role identifier inside the appRoles collection."
+        },
+        "allowedMemberTypes":{
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Specifies whether this app role definition can be assigned to users and groups by setting to 'User', or to other applications (that are accessing this application in daemon service scenarios) by setting to 'Application', or to both. "
+        },
+        "description" : {
+          "type": "string",
+          "description": "Permission help text that appears in the admin app assignment and consent experiences."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Display name for the permission that appears in the admin consent and app assignment experiences."
+        },
+        "isEnabled": {
+          "type": "boolean",
+          "description": "When creating or updating a role definition, this must be set to true (which is the default). To delete a role, this must first be set to false. At that point, in a subsequent call, this role may be removed."
+        },
+        "value": {
+          "type": "string",
+          "description": "Specifies the value of the roles claim that the application should expect in the authentication and access tokens."
+        }
+      }
+    },
+    "AddOwnerParameters": {
       "type": "object",
       "properties": {
         "url": {
@@ -2328,6 +2829,10 @@
             "$ref": "#/definitions/DirectoryObject"
           },
           "description": "A collection of DirectoryObject."
+        },
+        "odata.nextLink": {
+          "type": "string",
+          "description": "The URL to get the next set of results."
         }
       },
       "description": "DirectoryObject list operation result."
@@ -2377,124 +2882,6 @@
       ],
       "description": "Request parameters for a PasswordCredentials update operation."
     },
-    "AADObject": {
-      "type": "object",
-      "properties": {
-        "objectId": {
-          "type": "string",
-          "description": "The ID of the object."
-        },
-        "objectType": {
-          "type": "string",
-          "description": "The type of AAD object."
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The display name of the object."
-        },
-        "userPrincipalName": {
-          "type": "string",
-          "description": "The principal name of the object."
-        },
-        "mail": {
-          "type": "string",
-          "description": "The primary email address of the object."
-        },
-        "mailEnabled": {
-          "type": "boolean",
-          "description": "Whether the AAD object is mail-enabled."
-        },
-        "mailNickname": {
-          "type": "string",
-          "description": "The mail alias for the user.",
-          "readOnly": true
-        },
-        "securityEnabled": {
-          "type": "boolean",
-          "description": "Whether the AAD object is security-enabled."
-        },
-        "signInName": {
-          "type": "string",
-          "description": "The sign-in name of the object."
-        },
-        "servicePrincipalNames": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "A collection of service principal names associated with the object."
-        },
-        "userType": {
-          "type": "string",
-          "description": "The user type of the object."
-        },
-        "usageLocation": {
-          "type": "string",
-          "description": "A two letter country code (ISO standard 3166). Required for users that will be assigned licenses due to legal requirement to check for availability of services in countries. Examples include: \"US\", \"JP\", and \"GB\".",
-          "readOnly": true
-        },
-        "appId": {
-          "type": "string",
-          "description": "The application ID.",
-          "readOnly": true
-        },
-        "appPermissions": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "The application permissions.",
-          "readOnly": true
-        },
-        "availableToOtherTenants": {
-          "type": "boolean",
-          "description": "Whether the application is be available to other tenants.",
-          "readOnly": true
-        },
-        "identifierUris": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "A collection of URIs for the application.",
-          "readOnly": true
-        },
-        "replyUrls": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "A collection of reply URLs for the application.",
-          "readOnly": true
-        },
-        "homepage": {
-          "type": "string",
-          "description": "The home page of the application.",
-          "readOnly": true
-        }
-      },
-      "additionalProperties": {
-        "type": "object"
-      },
-      "description": "The properties of an Active Directory object."
-    },
-    "GetObjectsResult": {
-      "type": "object",
-      "properties": {
-        "value": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/AADObject"
-          },
-          "description": "A collection of Active Directory objects."
-        },
-        "odata.nextLink": {
-          "type": "string",
-          "description": "The URL to get the next set of results."
-        }
-      },
-      "description": "The response to an Active Directory object inquiry API request."
-    },
     "GroupAddMemberParameters": {
       "type": "object",
       "properties": {
@@ -2556,6 +2943,14 @@
           "type": "string",
           "description": "The display name of the group."
         },
+        "mailEnabled": {
+          "type": "boolean",
+          "description": "Whether the group is mail-enabled. Must be false. This is because only pure security groups can be created using the Graph API."
+        },
+        "mailNickname": {
+          "type": "string",
+          "description": "The mail alias for the group. "
+        },
         "securityEnabled": {
           "type": "boolean",
           "description": "Whether the group is security-enable."
@@ -2651,13 +3046,28 @@
     "ServicePrincipalCreateParameters": {
       "type": "object",
       "properties": {
+        "accountEnabled": {
+          "type": "boolean",
+          "description": "Whether the account is enabled"
+        },
         "appId": {
           "type": "string",
           "description": "application Id"
         },
-        "accountEnabled": {
+        "appRoleAssignmentRequired": {
           "type": "boolean",
-          "description": "Whether the account is enabled"
+          "description": "Specifies whether an AppRoleAssignment to a user or group is required before Azure AD will issue a user or access token to the application."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The display name for the service principal."
+        },
+        "errorUrl": {
+          "type": "string"
+        },
+        "homepage": {
+          "type": "string",
+          "description": "The URL to the homepage of the associated application."
         },
         "keyCredentials": {
           "type": "array",
@@ -2672,17 +3082,116 @@
             "$ref": "#/definitions/PasswordCredential"
           },
           "description": "A collection of PasswordCredential objects"
+        },
+        "publisherName": {
+          "type": "string",
+          "description": "The display name of the tenant in which the associated application is specified."
+        },
+        "replyUrls": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A collection of reply URLs for the service principal."
+        },
+        "samlMetadataUrl": {
+          "type": "string"
+        },
+        "servicePrincipalNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A collection of service principal names."
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       },
       "additionalProperties": {
         "type": "object"
       },
       "required": [
-        "appId",
-        "accountEnabled"
+        "appId"
       ],
       "description": "Request parameters for creating a new service principal."
     },
+    "ServicePrincipalUpdateParameters": {
+      "type": "object",
+      "properties": {
+        "accountEnabled": {
+          "type": "boolean",
+          "description": "Whether the account is enabled"
+        },
+        "appId": {
+          "type": "string",
+          "description": "application Id"
+        },
+        "appRoleAssignmentRequired": {
+          "type": "boolean",
+          "description": "Specifies whether an AppRoleAssignment to a user or group is required before Azure AD will issue a user or access token to the application."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The display name for the service principal."
+        },
+        "errorUrl": {
+          "type": "string"
+        },
+        "homepage": {
+          "type": "string",
+          "description": "The URL to the homepage of the associated application."
+        },
+        "keyCredentials": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/KeyCredential"
+          },
+          "description": "A collection of KeyCredential objects."
+        },
+        "passwordCredentials": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PasswordCredential"
+          },
+          "description": "A collection of PasswordCredential objects"
+        },
+        "publisherName": {
+          "type": "string",
+          "description": "The display name of the tenant in which the associated application is specified."
+        },
+        "replyUrls": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A collection of reply URLs for the service principal."
+        },
+        "samlMetadataUrl": {
+          "type": "string"
+        },
+        "servicePrincipalNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A collection of service principal names."
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "additionalProperties": {
+        "type": "object"
+      },
+      "description": "Request parameters for creating a new service principal."
+    },
     "ServicePrincipal": {
       "allOf": [
         {
@@ -2699,6 +3208,13 @@
           "type": "string",
           "description": "The application ID."
         },
+        "appRoles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AppRole"
+          },
+          "description": "The collection of application roles that an application may declare. These roles can be assigned to users, groups or service principals."
+        },
         "servicePrincipalNames": {
           "type": "array",
           "items": {
@@ -3009,9 +3525,6 @@
       "additionalProperties": {
         "type": "object"
       },
-      "required": [
-        "includeDirectoryObjectReferences"
-      ],
       "description": "Request parameters for the GetObjectsByObjectIds API."
     },
     "Domain": {
diff --git a/specification/hanaonazure/resource-manager/readme.go.md b/specification/hanaonazure/resource-manager/readme.go.md
new file mode 100644
index 000000000000..05cc71e25015
--- /dev/null
+++ b/specification/hanaonazure/resource-manager/readme.go.md
@@ -0,0 +1,25 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: hanaonazure
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-11
+```
+
+### Tag: package-2017-11
+
+These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-11' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-11-03-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/hanaonazure/resource-manager/readme.md b/specification/hanaonazure/resource-manager/readme.md
index 713838b0cace..d882b14e5b77 100644
--- a/specification/hanaonazure/resource-manager/readme.md
+++ b/specification/hanaonazure/resource-manager/readme.md
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for HanaOnAzure.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for HanaOnAzure, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -55,6 +55,8 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 ## Python
@@ -85,32 +87,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-hanaonazure
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: hanaonazure
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-11
-```
-
-### Tag: package-2017-11
-
-These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-11' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/hanaonazure/mgmt/2017-11-03-preview/hanaonazure
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/hanaonazure/resource-manager/readme.typescript.md b/specification/hanaonazure/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..c3649ad57a05
--- /dev/null
+++ b/specification/hanaonazure/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-hanaonazure"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-hanaonazure"
+  generate-metadata: true
+```
diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json
index 18f23878f0c4..5ae64d94394c 100644
--- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json
+++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json
@@ -705,6 +705,10 @@
                 "properties": {
                     "$ref": "#/definitions/ClusterCreateProperties",
                     "description": "The cluster create parameters."
+                },
+                "identity": {
+                  "$ref": "#/definitions/ClusterIdentity",
+                  "description": "The identity of the cluster, if configured."
                 }
             },
             "description": "The CreateCluster request parameters."
@@ -868,6 +872,10 @@
                 "properties": {
                     "$ref": "#/definitions/ClusterGetProperties",
                     "description": "The properties of the cluster."
+                },
+                "identity": {
+                  "$ref": "#/definitions/ClusterIdentity",
+                  "description": "The identity of the cluster, if configured."
                 }
             },
             "description": "The HDInsight cluster."
@@ -1026,6 +1034,54 @@
             },
             "description": "The list runtime script action detail response."
         },
+        "ClusterIdentity": {
+            "properties": {
+              "principalId": {
+                "readOnly": true,
+                "type": "string",
+                "description": "The principal id of cluster identity. This property will only be provided for a system assigned identity."
+              },
+              "tenantId": {
+                "readOnly": true,
+                "type": "string",
+                "description": "The tenant id associated with the cluster. This property will only be provided for a system assigned identity."
+              },
+              "type": {
+                "type": "string",
+                "description": "The type of identity used for the cluster. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities.",
+                "enum": [
+                  "SystemAssigned",
+                  "UserAssigned",
+                  "SystemAssigned, UserAssigned",
+                  "None"
+                ],
+                "x-ms-enum": {
+                  "name": "ResourceIdentityType",
+                  "modelAsString": false
+                }
+              },
+              "userAssignedIdentities": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "object",
+                  "properties": {
+                    "principalId": {
+                      "readOnly": true,
+                      "type": "string",
+                      "description": "The principal id of user assigned identity."
+                    },
+                    "clientId": {
+                      "readOnly": true,
+                      "type": "string",
+                      "description": "The client id of user assigned identity."
+                    }
+                  }
+                },
+                "description": "The list of user identities associated with the cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
+              }
+            },
+            "description": "Identity for the cluster."
+          },
         "ClusterListResult": {
             "properties": {
                 "value": {
diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json
index d049e1e2c30f..937f746ec649 100644
--- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json
+++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json
@@ -705,6 +705,10 @@
                 "properties": {
                     "$ref": "#/definitions/ClusterCreateProperties",
                     "description": "The cluster create parameters."
+                },
+                "identity": {
+                  "$ref": "#/definitions/ClusterIdentity",
+                  "description": "The identity of the cluster, if configured."
                 }
             },
             "description": "The CreateCluster request parameters."
@@ -868,6 +872,10 @@
                 "properties": {
                     "$ref": "#/definitions/ClusterGetProperties",
                     "description": "The properties of the cluster."
+                },
+                "identity": {
+                  "$ref": "#/definitions/ClusterIdentity",
+                  "description": "The identity of the cluster, if configured."
                 }
             },
             "description": "The HDInsight cluster."
@@ -1026,6 +1034,54 @@
             },
             "description": "The list runtime script action detail response."
         },
+        "ClusterIdentity": {
+          "properties": {
+            "principalId": {
+              "readOnly": true,
+              "type": "string",
+              "description": "The principal id of cluster identity. This property will only be provided for a system assigned identity."
+            },
+            "tenantId": {
+              "readOnly": true,
+              "type": "string",
+              "description": "The tenant id associated with the cluster. This property will only be provided for a system assigned identity."
+            },
+            "type": {
+              "type": "string",
+              "description": "The type of identity used for the cluster. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities.",
+              "enum": [
+                "SystemAssigned",
+                "UserAssigned",
+                "SystemAssigned, UserAssigned",
+                "None"
+              ],
+              "x-ms-enum": {
+                "name": "ResourceIdentityType",
+                "modelAsString": false
+              }
+            },
+            "userAssignedIdentities": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "object",
+                "properties": {
+                  "principalId": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The principal id of user assigned identity."
+                  },
+                  "clientId": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The client id of user assigned identity."
+                  }
+                }
+              },
+              "description": "The list of user identities associated with the cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
+            }
+          },
+          "description": "Identity for the cluster."
+        },
         "ClusterListResult": {
             "properties": {
                 "value": {
diff --git a/specification/hdinsight/resource-manager/readme.go.md b/specification/hdinsight/resource-manager/readme.go.md
new file mode 100644
index 000000000000..f9fad03fe39e
--- /dev/null
+++ b/specification/hdinsight/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: hdinsight
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-06-preview
+  - tag: package-2015-03-preview
+```
+
+### Tag: package-2018-06-preview and go
+
+These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-06-01-preview/$(namespace)
+```
+
+### Tag: package-2015-03-preview and go
+
+These settings apply only when `--tag=package-2015-03-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-03-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-03-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/hdinsight/resource-manager/readme.md b/specification/hdinsight/resource-manager/readme.md
index fb7120669a8a..017b0d44bdde 100644
--- a/specification/hdinsight/resource-manager/readme.md
+++ b/specification/hdinsight/resource-manager/readme.md
@@ -96,6 +96,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -105,41 +106,7 @@ See configuration in [readme.python.md](./readme.python.md)
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: hdinsight
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-06-preview
-  - tag: package-2015-03-preview
-```
-
-### Tag: package-2018-06-preview and go
-
-These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/hdinsight/mgmt/2018-06-01-preview/hdinsight
-```
-
-### Tag: package-2015-03-preview and go
-
-These settings apply only when `--tag=package-2015-03-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-03-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/hdinsight/mgmt/2015-03-01-preview/hdinsight
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## C#
 
diff --git a/specification/hdinsight/resource-manager/readme.typescript.md b/specification/hdinsight/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..5297cebc3219
--- /dev/null
+++ b/specification/hdinsight/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-hdinsight"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-hdinsight"
+  generate-metadata: true
+```
diff --git a/specification/iotcentral/resource-manager/readme.md b/specification/iotcentral/resource-manager/readme.md
index 8baaf800b310..4cf5eb9fbfb8 100644
--- a/specification/iotcentral/resource-manager/readme.md
+++ b/specification/iotcentral/resource-manager/readme.md
@@ -56,6 +56,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -77,6 +78,10 @@ csharp:
   clear-output-folder: true
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/iotcentral/resource-manager/readme.typescript.md b/specification/iotcentral/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..2452e412170d
--- /dev/null
+++ b/specification/iotcentral/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-iotcentral"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-iotcentral"
+  payload-flattening-threshold: 1
+  generate-metadata: true
+```
diff --git a/specification/iothub/resource-manager/readme.go.md b/specification/iothub/resource-manager/readme.go.md
new file mode 100644
index 000000000000..843e1a155609
--- /dev/null
+++ b/specification/iothub/resource-manager/readme.go.md
@@ -0,0 +1,65 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: devices
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-04
+  - tag: package-2018-01
+  - tag: package-2017-07
+  - tag: package-2017-01
+  - tag: package-2016-02
+```
+### Tag: package-2018-04 and go
+
+These settings apply only when `--tag=package-2018-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-04' && $(go)
+output-folder: $(go-sdk-folder)/services/iothub/mgmt/2018-04-01/$(namespace)
+```
+
+### Tag: package-2018-01 and go
+
+These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-01' && $(go)
+output-folder: $(go-sdk-folder)/services/iothub/mgmt/2018-01-22/$(namespace)
+```
+
+### Tag: package-2017-07 and go
+
+These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-07' && $(go)
+output-folder: $(go-sdk-folder)/services/iothub/mgmt/2017-07-01/$(namespace)
+```
+
+### Tag: package-2017-01 and go
+
+These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-01' && $(go)
+output-folder: $(go-sdk-folder)/services/iothub/mgmt/2017-01-19/$(namespace)
+```
+
+### Tag: package-2016-02 and go
+
+These settings apply only when `--tag=package-2016-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-02' && $(go)
+output-folder: $(go-sdk-folder)/services/iothub/mgmt/2016-02-03/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/iothub/resource-manager/readme.md b/specification/iothub/resource-manager/readme.md
index 196fe2baaef4..50314ea060fe 100644
--- a/specification/iothub/resource-manager/readme.md
+++ b/specification/iothub/resource-manager/readme.md
@@ -88,6 +88,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -109,73 +110,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: devices
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-04
-  - tag: package-2018-01
-  - tag: package-2017-07
-  - tag: package-2017-01
-  - tag: package-2016-02
-```
-### Tag: package-2018-04 and go
-
-These settings apply only when `--tag=package-2018-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-04' && $(go)
-output-folder: $(go-sdk-folder)/services/iothub/mgmt/2018-04-01/devices
-```
-
-### Tag: package-2018-01 and go
-
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/iothub/mgmt/2018-01-22/devices
-```
-
-### Tag: package-2017-07 and go
-
-These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-07' && $(go)
-output-folder: $(go-sdk-folder)/services/iothub/mgmt/2017-07-01/devices
-```
-
-### Tag: package-2017-01 and go
-
-These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-01' && $(go)
-output-folder: $(go-sdk-folder)/services/iothub/mgmt/2017-01-19/devices
-```
-
-### Tag: package-2016-02 and go
-
-These settings apply only when `--tag=package-2016-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-02' && $(go)
-output-folder: $(go-sdk-folder)/services/iothub/mgmt/2016-02-03/devices
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/iothub/resource-manager/readme.typescript.md b/specification/iothub/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..d2f0133a669b
--- /dev/null
+++ b/specification/iothub/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-iothub"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-iothub"
+  payload-flattening-threshold: 1
+  generate-metadata: true
+```
diff --git a/specification/iotspaces/resource-manager/readme.go.md b/specification/iotspaces/resource-manager/readme.go.md
new file mode 100644
index 000000000000..012dc608367f
--- /dev/null
+++ b/specification/iotspaces/resource-manager/readme.go.md
@@ -0,0 +1,27 @@
+## Go
+
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: iotspaces
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-10-preview
+```
+
+### Tag: package-2017-10-preview and go
+
+These settings apply only when `--tag=package-2017-10-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-10-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-10-01-preview/$(namespace)
+```
diff --git a/specification/iotspaces/resource-manager/readme.md b/specification/iotspaces/resource-manager/readme.md
index efbb91da2023..bbb54cb3b16a 100644
--- a/specification/iotspaces/resource-manager/readme.md
+++ b/specification/iotspaces/resource-manager/readme.md
@@ -55,7 +55,7 @@ tag: package-2017-10-preview
 These settings apply only when `--tag=package-2017-10-preview` is specified on the command line.
 
 ``` yaml $(tag) == 'package-2017-10-preview'
-input-file: 
+input-file:
 - Microsoft.IoTSpaces/preview/2017-10-01-preview/iotspaces.json
 ```
 
@@ -70,6 +70,8 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 ## CSharp Settings
@@ -89,27 +91,4 @@ csharp:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: iotspaces
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-10-preview
-```
-
-### Tag: package-2017-10-preview and go
-
-These settings apply only when `--tag=package-2017-10-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-10-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-10-01-preview/$(namespace)
-```
+See configuration in [readme.go.md](./readme.go.md)
\ No newline at end of file
diff --git a/specification/iotspaces/resource-manager/readme.typescript.md b/specification/iotspaces/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..938f16e4be90
--- /dev/null
+++ b/specification/iotspaces/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-iotspaces"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-iotspaces"
+  generate-metadata: true
+```
diff --git a/specification/keyvault/data-plane/readme.go.md b/specification/keyvault/data-plane/readme.go.md
new file mode 100644
index 000000000000..e043e63f2f6f
--- /dev/null
+++ b/specification/keyvault/data-plane/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: keyvault
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-7.0
+  - tag: package-2016-10
+  - tag: package-2015-06
+```
+
+### Tag: package-7.0 and go
+
+These settings apply only when `--tag=package-7.0 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-7.0' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/v7.0/$(namespace)
+```
+
+### Tag: package-2016-10 and go
+
+These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-10' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2016-10-01/$(namespace)
+```
+
+### Tag: package-2015-06 and go
+
+These settings apply only when `--tag=package-2015-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-06' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/2015-06-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/keyvault/data-plane/readme.md b/specification/keyvault/data-plane/readme.md
index ef7c2619a661..5795338b2b97 100644
--- a/specification/keyvault/data-plane/readme.md
+++ b/specification/keyvault/data-plane/readme.md
@@ -93,51 +93,7 @@ csharp:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: keyvault
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-7.0
-  - tag: package-2016-10
-  - tag: package-2015-06
-```
-
-### Tag: package-7.0 and go
-
-These settings apply only when `--tag=package-7.0 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-7.0' && $(go)
-output-folder: $(go-sdk-folder)/services/keyvault/v7.0/keyvault
-```
-
-### Tag: package-2016-10 and go
-
-These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-10' && $(go)
-output-folder: $(go-sdk-folder)/services/keyvault/2016-10-01/keyvault
-```
-
-### Tag: package-2015-06 and go
-
-These settings apply only when `--tag=package-2015-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-06' && $(go)
-output-folder: $(go-sdk-folder)/services/keyvault/2015-06-01/keyvault
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/keyvault/resource-manager/readme.go.md b/specification/keyvault/resource-manager/readme.go.md
new file mode 100644
index 000000000000..cd3e71257c40
--- /dev/null
+++ b/specification/keyvault/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: keyvault
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-02
+  - tag: package-2016-10
+  - tag: package-2015-06
+```
+
+### Tag: package-2018-02 and go
+
+These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-02' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-02-14/$(namespace)
+```
+
+### Tag: package-2016-10 and go
+
+These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-10' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-10-01/$(namespace)
+```
+
+### Tag: package-2015-06 and go
+
+These settings apply only when `--tag=package-2015-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-06' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-06-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md
index cf64670f0600..20bab62a7b4a 100644
--- a/specification/keyvault/resource-manager/readme.md
+++ b/specification/keyvault/resource-manager/readme.md
@@ -86,54 +86,9 @@ swagger-to-sdk:
       - bundle install && rake arm:regen_all_profiles['azure_mgmt_key_vault']
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: keyvault
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-02
-  - tag: package-2016-10
-  - tag: package-2015-06
-```
-
-### Tag: package-2018-02 and go
-
-These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-02' && $(go)
-output-folder: $(go-sdk-folder)/services/keyvault/mgmt/2018-02-14/keyvault
-```
-
-### Tag: package-2016-10 and go
-
-These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-10' && $(go)
-output-folder: $(go-sdk-folder)/services/keyvault/mgmt/2016-10-01/keyvault
-```
-
-### Tag: package-2015-06 and go
-
-These settings apply only when `--tag=package-2015-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-06' && $(go)
-output-folder: $(go-sdk-folder)/services/keyvault/mgmt/2015-06-01/keyvault
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/keyvault/resource-manager/readme.typescript.md b/specification/keyvault/resource-manager/readme.typescript.md
index bb7dc672ef35..0901e4b7bd5e 100644
--- a/specification/keyvault/resource-manager/readme.typescript.md
+++ b/specification/keyvault/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-keyvault"
-  output-folder: $(typescript-sdks-folder)/packages/arm-keyvault
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-keyvault"
   generate-metadata: true
   generate-readme-md: false
 ```
diff --git a/specification/logic/resource-manager/readme.go.md b/specification/logic/resource-manager/readme.go.md
index d7890291868b..d87c46ba2ec1 100644
--- a/specification/logic/resource-manager/readme.go.md
+++ b/specification/logic/resource-manager/readme.go.md
@@ -25,7 +25,7 @@ These settings apply only when `--tag=package-2018-07-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-07-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/logic/mgmt/2018-07-01-preview/logic
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-07-01-preview/$(namespace)
 ```
 
 ### Tag: package-2016-06 and go
@@ -34,7 +34,7 @@ These settings apply only when `--tag=package-2016-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-06' && $(go)
-output-folder: $(go-sdk-folder)/services/logic/mgmt/2016-06-01/logic
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-06-01/$(namespace)
 ```
 
 ### Tag: package-2015-08-preview and go
@@ -43,7 +43,7 @@ These settings apply only when `--tag=package-2015-08-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2015-08-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/logic/mgmt/2015-08-01-preview/logic
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-08-01-preview/$(namespace)
 ```
 
 ### Tag: package-2015-02-preview and go
@@ -52,5 +52,5 @@ These settings apply only when `--tag=package-2015-02-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2015-02-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/logic/mgmt/2015-02-01-preview/logic
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-02-01-preview/$(namespace)
 ```
diff --git a/specification/logic/resource-manager/readme.md b/specification/logic/resource-manager/readme.md
index 196a16f22d9f..996d46b4c37d 100644
--- a/specification/logic/resource-manager/readme.md
+++ b/specification/logic/resource-manager/readme.md
@@ -92,6 +92,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -140,6 +141,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-logic
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/logic/resource-manager/readme.typescript.md b/specification/logic/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..e25bdceea831
--- /dev/null
+++ b/specification/logic/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-logic"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-logic"
+  generate-metadata: true
+```
diff --git a/specification/machinelearning/resource-manager/readme.go.md b/specification/machinelearning/resource-manager/readme.go.md
new file mode 100644
index 000000000000..3c623e0b8bd6
--- /dev/null
+++ b/specification/machinelearning/resource-manager/readme.go.md
@@ -0,0 +1,59 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-webservices-2017-01
+  - tag: package-webservices-2016-05-preview
+  - tag: package-workspaces-2016-04
+  - tag: package-commitmentPlans-2016-05-preview
+```
+
+### Tag: package-webservices-2017-01 and go
+
+These settings apply only when `--tag=package-webservices-2017-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-webservices-2017-01' && $(go)
+namespace: webservices
+output-folder: $(go-sdk-folder)/services/machinelearning/mgmt/2017-01-01/$(namespace)
+```
+
+### Tag: package-webservices-2016-05-preview and go
+
+These settings apply only when `--tag=package-webservices-2016-05-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-webservices-2016-05-preview' && $(go)
+namespace: webservices
+output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2016-05-01-preview/$(namespace)
+```
+
+### Tag: package-workspaces-2016-04 and go
+
+These settings apply only when `--tag=package-workspaces-2016-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-workspaces-2016-04' && $(go)
+namespace: workspaces
+output-folder: $(go-sdk-folder)/services/machinelearning/mgmt/2016-04-01/workspaces
+```
+
+### Tag: package-commitmentPlans-2016-05-preview and go
+
+These settings apply only when `--tag=package-commitmentPlans-2016-05-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-commitmentPlans-2016-05-preview' && $(go)
+namespace: commitmentplans
+output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2016-05-01-preview/commitmentplans
+```
\ No newline at end of file
diff --git a/specification/machinelearning/resource-manager/readme.md b/specification/machinelearning/resource-manager/readme.md
index 9035176ae8d8..4db6a6f71130 100644
--- a/specification/machinelearning/resource-manager/readme.md
+++ b/specification/machinelearning/resource-manager/readme.md
@@ -89,6 +89,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -119,153 +120,95 @@ batch:
     output-folder: $(csharp-sdks-folder)/MachineLearning/Management.MachineLearning/Generated/Workspaces
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
+See configuration in [readme.go.md](./readme.go.md)
 
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-```
+## Java
 
-### Go multi-api
+These settings apply only when `--java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
 
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-webservices-2017-01
-  - tag: package-webservices-2016-05-preview
-  - tag: package-workspaces-2016-04
-  - tag: package-commitmentPlans-2016-05-preview
+``` yaml $(java)
+azure-arm: true
+fluent: true
+namespace: com.microsoft.azure.management.machinelearning
+license-header: MICROSOFT_MIT_NO_CODEGEN
+payload-flattening-threshold: 1
+output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-machinelearning
 ```
 
-### Tag: package-webservices-2017-01 and go
+# Validation
 
-These settings apply only when `--tag=package-webservices-2017-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+Since this RP has no unique default package, iterate over all of them for validation:
 
-``` yaml $(tag) == 'package-webservices-2017-01' && $(go)
-namespace: webservices
-output-folder: $(go-sdk-folder)/services/machinelearning/mgmt/2017-01-01/webservices
+``` yaml $(validation)
+batch:
+  - package-webservices: true
+  - package-commitmentPlans: true
+  - package-workspaces: true
 ```
 
-### Tag: package-webservices-2016-05-preview and go
-
-These settings apply only when `--tag=package-webservices-2016-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+### Java multi-api
 
-``` yaml $(tag) == 'package-webservices-2016-05-preview' && $(go)
-namespace: webservices
-output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2016-05-01-preview/webservices
+``` yaml $(java) && $(multiapi)
+batch:
+  - tag: package-webservices-2017-01
+  - tag: package-commitmentPlans-2016-05-preview
+  - tag: package-webservices-2016-05-preview
+  - tag: package-workspaces-2016-04
 ```
 
-### Tag: package-workspaces-2016-04 and go
+### Tag: package-webservices-2017-01 and java
 
-These settings apply only when `--tag=package-workspaces-2016-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-webservices-2017-01 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-workspaces-2016-04' && $(go)
-namespace: workspaces
-output-folder: $(go-sdk-folder)/services/machinelearning/mgmt/2016-04-01/workspaces
+``` yaml $(tag) == 'package-webservices-2017-01' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.machinelearning.v2017_01_01
+  output-folder: $(azure-libraries-for-java-folder)/machinelearning/resource-manager/v2017_01_01
+regenerate-manager: true
+generate-interface: true
 ```
 
-### Tag: package-commitmentPlans-2016-05-preview and go
+### Tag: package-commitmentPlans-2016-05-preview and java
 
-These settings apply only when `--tag=package-commitmentPlans-2016-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-commitmentPlans-2016-05-preview --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-commitmentPlans-2016-05-preview' && $(go)
-namespace: commitmentplans
-output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2016-05-01-preview/commitmentplans
+``` yaml $(tag) == 'package-commitmentPlans-2016-05-preview' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.machinelearning.v2016_05_01_preview
+  output-folder: $(azure-libraries-for-java-folder)/machinelearning/resource-manager/v2016_05_01_preview
+regenerate-manager: true
+generate-interface: true
 ```
 
+### Tag: package-webservices-2016-05-preview and java
 
-## Java
+These settings apply only when `--tag=package-webservices-2016-05-preview --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-These settings apply only when `--java` is specified on the command line.
-Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
-
-``` yaml $(java)
-azure-arm: true
-fluent: true
-namespace: com.microsoft.azure.management.machinelearning
-license-header: MICROSOFT_MIT_NO_CODEGEN
-payload-flattening-threshold: 1
-output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-machinelearning
+``` yaml $(tag) == 'package-webservices-2016-05-preview' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.machinelearning.v2016_05_01_preview
+  output-folder: $(azure-libraries-for-java-folder)/machinelearning/resource-manager/v2016_05_01_preview
+regenerate-manager: true
+generate-interface: true
 ```
 
-# Validation
+### Tag: package-workspaces-2016-04 and java
 
-Since this RP has no unique default package, iterate over all of them for validation:
+These settings apply only when `--tag=package-workspaces-2016-04 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(validation)
-batch:
-  - package-webservices: true
-  - package-commitmentPlans: true
-  - package-workspaces: true
+``` yaml $(tag) == 'package-workspaces-2016-04' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.machinelearning.v2016_04_01
+  output-folder: $(azure-libraries-for-java-folder)/machinelearning/resource-manager/v2016_04_01
+regenerate-manager: true
+generate-interface: true
 ```
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-webservices-2017-01
-  - tag: package-commitmentPlans-2016-05-preview
-  - tag: package-webservices-2016-05-preview
-  - tag: package-workspaces-2016-04
-```
-
-### Tag: package-webservices-2017-01 and java
-
-These settings apply only when `--tag=package-webservices-2017-01 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-webservices-2017-01' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.machinelearning.v2017_01_01
-  output-folder: $(azure-libraries-for-java-folder)/machinelearning/resource-manager/v2017_01_01
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-commitmentPlans-2016-05-preview and java
-
-These settings apply only when `--tag=package-commitmentPlans-2016-05-preview --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-commitmentPlans-2016-05-preview' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.machinelearning.v2016_05_01_preview
-  output-folder: $(azure-libraries-for-java-folder)/machinelearning/resource-manager/v2016_05_01_preview
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-webservices-2016-05-preview and java
-
-These settings apply only when `--tag=package-webservices-2016-05-preview --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-webservices-2016-05-preview' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.machinelearning.v2016_05_01_preview
-  output-folder: $(azure-libraries-for-java-folder)/machinelearning/resource-manager/v2016_05_01_preview
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-workspaces-2016-04 and java
-
-These settings apply only when `--tag=package-workspaces-2016-04 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-workspaces-2016-04' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.machinelearning.v2016_04_01
-  output-folder: $(azure-libraries-for-java-folder)/machinelearning/resource-manager/v2016_04_01
-regenerate-manager: true
-generate-interface: true
-```
-
-
+
+
diff --git a/specification/machinelearning/resource-manager/readme.typescript.md b/specification/machinelearning/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..c801055fc7b5
--- /dev/null
+++ b/specification/machinelearning/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-machinelearning"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-machinelearning"
+  generate-metadata: true
+```
diff --git a/specification/machinelearningcompute/resource-manager/readme.go.md b/specification/machinelearningcompute/resource-manager/readme.go.md
new file mode 100644
index 000000000000..321517e1a1ce
--- /dev/null
+++ b/specification/machinelearningcompute/resource-manager/readme.go.md
@@ -0,0 +1,35 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: compute
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-08-preview
+```
+
+### Tag: package-2017-08-preview and go
+
+These settings apply only when `--tag=package-2017-08-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-08-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2017-08-01-preview/$(namespace)
+```
+
+### Tag: package-2017-06-preview and go
+
+These settings apply only when `--tag=package-package-2017-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2017-06-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/machinelearningcompute/resource-manager/readme.md b/specification/machinelearningcompute/resource-manager/readme.md
index 573f91990c05..002485680e84 100644
--- a/specification/machinelearningcompute/resource-manager/readme.md
+++ b/specification/machinelearningcompute/resource-manager/readme.md
@@ -64,6 +64,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -111,40 +112,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: compute
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-08-preview
-```
-
-### Tag: package-2017-08-preview and go
-
-These settings apply only when `--tag=package-2017-08-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-08-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2017-08-01-preview/compute
-```
-
-### Tag: package-2017-06-preview and go
-
-These settings apply only when `--tag=package-package-2017-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2017-06-01-preview/compute
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/machinelearningcompute/resource-manager/readme.typescript.md b/specification/machinelearningcompute/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..846e535e66a9
--- /dev/null
+++ b/specification/machinelearningcompute/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-machinelearningcompute"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-machinelearningcompute"
+  generate-metadata: true
+```
diff --git a/specification/machinelearningexperimentation/resource-manager/readme.go.md b/specification/machinelearningexperimentation/resource-manager/readme.go.md
new file mode 100644
index 000000000000..5385b2049af8
--- /dev/null
+++ b/specification/machinelearningexperimentation/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: experimentation
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-05-preview
+```
+
+### Tag: package-2017-05-preview and go
+
+These settings apply only when `--tag=package-2017-05-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-05-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2017-05-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/machinelearningexperimentation/resource-manager/readme.md b/specification/machinelearningexperimentation/resource-manager/readme.md
index 2db43935130b..f3c9d80b3aef 100644
--- a/specification/machinelearningexperimentation/resource-manager/readme.md
+++ b/specification/machinelearningexperimentation/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # MachineLearningExperimentation
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Machine Learning Experimentation.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for Machine Learning Experimentation.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for EventHub, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the Machine Learning Experimentation API.
 
 ``` yaml
@@ -51,10 +51,12 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -67,33 +69,10 @@ csharp:
   output-folder: $(csharp-sdks-folder)/MachineLearningExperimentation/Management.MachineLearningExperimentation/Generated
   clear-output-folder: true
 ```
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: experimentation
-```
 
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-05-preview
-```
-
-### Tag: package-2017-05-preview and go
-
-These settings apply only when `--tag=package-2017-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2017-05-01-preview/experimentation
-```
+## Go
 
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/machinelearningexperimentation/resource-manager/readme.typescript.md b/specification/machinelearningexperimentation/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..5ef95136a657
--- /dev/null
+++ b/specification/machinelearningexperimentation/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-machinelearningexperimentation"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-machinelearningexperimentation"
+  generate-metadata: true
+```
diff --git a/specification/machinelearningservices/resource-manager/readme.go.md b/specification/machinelearningservices/resource-manager/readme.go.md
new file mode 100644
index 000000000000..d28844d890f9
--- /dev/null
+++ b/specification/machinelearningservices/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+```yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: services
+```
+
+### Go multi-api
+
+```yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-03-preview
+```
+
+### Tag: package-2018-03-preview and go
+
+These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag)=='package-2018-03-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2018-03-01-preview/$(namespace)
+```
diff --git a/specification/machinelearningservices/resource-manager/readme.md b/specification/machinelearningservices/resource-manager/readme.md
index a916d4644c31..ddf600ebad0a 100644
--- a/specification/machinelearningservices/resource-manager/readme.md
+++ b/specification/machinelearningservices/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # MachineLearningServices
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Machine Learning Services.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for Machine Learning Services.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for EventHub, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the Machine Learning Services API.
 
 ``` yaml
@@ -52,10 +52,12 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -99,31 +101,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: services
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-03-preview
-```
-
-### Tag: package-2018-03-preview and go
-
-These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-03-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/machinelearning/mgmt/2018-03-01-preview/services
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/machinelearningservices/resource-manager/readme.typescript.md b/specification/machinelearningservices/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..5d8d3591f7cb
--- /dev/null
+++ b/specification/machinelearningservices/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-machinelearningservices"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-machinelearningservices"
+  generate-metadata: true
+```
diff --git a/specification/managementgroups/resource-manager/readme.md b/specification/managementgroups/resource-manager/readme.md
index 9ccb7e28993e..9bbcc7e0113c 100644
--- a/specification/managementgroups/resource-manager/readme.md
+++ b/specification/managementgroups/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # Management Groups
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Management Groups.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for Management Groups.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for Management Groups, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -19,7 +19,7 @@ To see additional help and options, run:
 
 ## Configuration
 
-### Basic Information 
+### Basic Information
 These are the global settings for the API.
 
 ``` yaml
@@ -72,9 +72,11 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -115,6 +117,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-managementgroups
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/managementgroups/resource-manager/readme.typescript.md b/specification/managementgroups/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..77654977c7a7
--- /dev/null
+++ b/specification/managementgroups/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-managementgroups"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-managementgroups"
+  generate-metadata: true
+```
diff --git a/specification/managementpartner/resource-manager/readme.go.md b/specification/managementpartner/resource-manager/readme.go.md
new file mode 100644
index 000000000000..6ef8799909e6
--- /dev/null
+++ b/specification/managementpartner/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: managementpartner
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-02
+```
+
+### Tag: package-2018-02 and go
+
+These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-02' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-02-01/$(namespace)
+```
diff --git a/specification/managementpartner/resource-manager/readme.md b/specification/managementpartner/resource-manager/readme.md
index 942cfb72fcca..8b6f585d600f 100644
--- a/specification/managementpartner/resource-manager/readme.md
+++ b/specification/managementpartner/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # ManagementPartner
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for ManagementPartner RP.
@@ -29,7 +29,7 @@ generate-interface: true
 ```
 
 
-## Getting Started 
+## Getting Started
 To build the SDK for ManagementPartner, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -43,7 +43,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the ManagementPartner API.
 
 ``` yaml
@@ -73,9 +73,11 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -89,33 +91,6 @@ csharp:
   clear-output-folder: true
 ```
 
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: managementpartner
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-02
-```
-
-### Tag: package-2018-02 and go
-
-These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-02' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/managementpartner/mgmt/2018-02-01/managementpartner
-```
-
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
@@ -143,3 +118,7 @@ python:
   basic-setup-py: true
   output-folder: $(python-sdks-folder)/azure-mgmt-managementpartner
 ```
+
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
\ No newline at end of file
diff --git a/specification/managementpartner/resource-manager/readme.typescript.md b/specification/managementpartner/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..0c8504d13dc8
--- /dev/null
+++ b/specification/managementpartner/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-managementpartner"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-managementpartner"
+  generate-metadata: true
+```
diff --git a/specification/maps/resource-manager/readme.go.md b/specification/maps/resource-manager/readme.go.md
new file mode 100644
index 000000000000..4920d9c3b794
--- /dev/null
+++ b/specification/maps/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: maps
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-05
+  - tag: package-2017-01
+```
+
+### Tag: package-2018-05 and go
+
+These settings apply only when `--tag=package-2018-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-05' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-05-01/$(namespace)
+```
+
+### Tag: package-2017-01 and go
+
+These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-01-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/maps/resource-manager/readme.md b/specification/maps/resource-manager/readme.md
index a57263546a2f..1eaf56982188 100644
--- a/specification/maps/resource-manager/readme.md
+++ b/specification/maps/resource-manager/readme.md
@@ -1,11 +1,11 @@
 # Maps
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Maps.
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for Maps, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -19,7 +19,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the Maps API.
 
 ``` yaml
@@ -59,10 +59,12 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -82,41 +84,7 @@ See configuration in [readme.python.md](./readme.python.md)
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: maps
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-05
-  - tag: package-2017-01
-```
-
-### Tag: package-2018-05 and go
-
-These settings apply only when `--tag=package-2018-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-05' && $(go)
-output-folder: $(go-sdk-folder)/services/maps/mgmt/2018-05-01/maps
-```
-
-### Tag: package-2017-01 and go
-
-These settings apply only when `--tag=package-2017-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-01' && $(go)
-output-folder: $(go-sdk-folder)/services/maps/mgmt/2017-01-01-preview/maps
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/maps/resource-manager/readme.typescript.md b/specification/maps/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..788bcddb03b0
--- /dev/null
+++ b/specification/maps/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-maps"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-maps"
+  generate-metadata: true
+```
diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/PerformanceTiersListByLocation.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/PerformanceTiersListByLocation.json
index 37092da7b3ed..eb15a29cb5fc 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/PerformanceTiersListByLocation.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/PerformanceTiersListByLocation.json
@@ -14,22 +14,22 @@
               {
                 "edition": "Basic",
                 "vCore": 1,
-                "hardwareGeneration": "Gen4",
+                "hardwareGeneration": "Gen5",
                 "minStorageMB": 5120,
                 "maxStorageMB": 1048576,
                 "minBackupRetentionDays": 7,
                 "maxBackupRetentionDays": 35,
-                "id": "B_Gen4_1"
+                "id": "B_Gen5_1"
               },
               {
                 "edition": "Basic",
                 "vCore": 2,
-                "hardwareGeneration": "Gen4",
+                "hardwareGeneration": "Gen5",
                 "minStorageMB": 5120,
                 "maxStorageMB": 1048576,
                 "minBackupRetentionDays": 7,
                 "maxBackupRetentionDays": 35,
-                "id": "B_Gen4_2"
+                "id": "B_Gen5_2"
               }
             ]
           },
@@ -39,52 +39,52 @@
               {
                 "edition": "GeneralPurpose",
                 "vCore": 2,
-                "hardwareGeneration": "Gen4",
+                "hardwareGeneration": "Gen5",
                 "minStorageMB": 5120,
                 "maxStorageMB": 2097152,
                 "minBackupRetentionDays": 7,
                 "maxBackupRetentionDays": 35,
-                "id": "GP_Gen4_2"
+                "id": "GP_Gen5_2"
               },
               {
                 "edition": "GeneralPurpose",
                 "vCore": 4,
-                "hardwareGeneration": "Gen4",
+                "hardwareGeneration": "Gen5",
                 "minStorageMB": 5120,
                 "maxStorageMB": 2097152,
                 "minBackupRetentionDays": 7,
                 "maxBackupRetentionDays": 35,
-                "id": "GP_Gen4_4"
+                "id": "GP_Gen5_4"
               },
               {
                 "edition": "GeneralPurpose",
                 "vCore": 8,
-                "hardwareGeneration": "Gen4",
+                "hardwareGeneration": "Gen5",
                 "minStorageMB": 5120,
                 "maxStorageMB": 2097152,
                 "minBackupRetentionDays": 7,
                 "maxBackupRetentionDays": 35,
-                "id": "GP_Gen4_8"
+                "id": "GP_Gen5_8"
               },
               {
                 "edition": "GeneralPurpose",
                 "vCore": 16,
-                "hardwareGeneration": "Gen4",
+                "hardwareGeneration": "Gen5",
                 "minStorageMB": 5120,
                 "maxStorageMB": 2097152,
                 "minBackupRetentionDays": 7,
                 "maxBackupRetentionDays": 35,
-                "id": "GP_Gen4_16"
+                "id": "GP_Gen5_16"
               },
               {
                 "edition": "GeneralPurpose",
                 "vCore": 32,
-                "hardwareGeneration": "Gen4",
+                "hardwareGeneration": "Gen5",
                 "minStorageMB": 5120,
                 "maxStorageMB": 2097152,
                 "minBackupRetentionDays": 7,
                 "maxBackupRetentionDays": 35,
-                "id": "GP_Gen4_32"
+                "id": "GP_Gen5_32"
               }
             ]
           }
diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreate.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreate.json
index 4d58650551d4..1184ddb9c90a 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreate.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreate.json
@@ -18,10 +18,10 @@
         "createMode": "Default"
       },
       "sku": {
-        "name": "GP_Gen4_2",
+        "name": "GP_Gen5_2",
         "tier": "GeneralPurpose",
         "capacity": 2,
-        "family": "Gen4"
+        "family": "Gen5"
       },
       "tags": {
         "ElasticServer": "1"
@@ -32,9 +32,9 @@
     "201": {
       "body": {
         "sku": {
-          "name": "GP_Gen4_2",
+          "name": "GP_Gen5_2",
           "tier": "GeneralPurpose",
-          "family": "Gen4",
+          "family": "Gen5",
           "capacity": 2
         },
         "properties": {
@@ -66,9 +66,9 @@
         "type": "Microsoft.DBforMariaDB/servers",
         "location": "westus",
         "sku": {
-          "name": "GP_Gen4_2",
+          "name": "GP_Gen5_2",
           "tier": "GeneralPurpose",
-          "family": "Gen4",
+          "family": "Gen5",
           "capacity": 2
         },
         "tags": {
diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreateGeoRestoreMode.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreateGeoRestoreMode.json
index eb0a3e39481c..a576d4673980 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreateGeoRestoreMode.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreateGeoRestoreMode.json
@@ -11,9 +11,9 @@
                 "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/SourceResourceGroup/providers/Microsoft.DBforMariaDB/servers/sourceserver"
             },
             "sku": {
-                "name": "GP_Gen4_2",
+                "name": "GP_Gen5_2",
                 "tier": "GeneralPurpose",
-                "family": "Gen4",
+                "family": "Gen5",
                 "capacity": 2
             },
             "tags": {
@@ -25,9 +25,9 @@
         "201": {
             "body": {
               "sku": {
-                "name": "GP_Gen4_2",
+                "name": "GP_Gen5_2",
                 "tier": "GeneralPurpose",
-                "family": "Gen4",
+                "family": "Gen5",
                 "capacity": 2
               },
               "properties": {
@@ -59,9 +59,9 @@
               "type": "Microsoft.DBforMariaDB/servers",
               "location": "westus",
               "sku": {
-                "name": "GP_Gen4_2",
+                "name": "GP_Gen5_2",
                 "tier": "GeneralPurpose",
-                "family": "Gen4",
+                "family": "Gen5",
                 "capacity": 2
               },
               "tags": {
diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreatePointInTimeRestore.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreatePointInTimeRestore.json
index c8ca65c6417e..e4222b136323 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreatePointInTimeRestore.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreatePointInTimeRestore.json
@@ -12,9 +12,9 @@
                 "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/SourceResourceGroup/providers/Microsoft.DBforMariaDB/servers/sourceserver"
             },
             "sku": {
-                "name": "GP_Gen4_2",
+                "name": "GP_Gen5_2",
                 "tier": "GeneralPurpose",
-                "family": "Gen4",
+                "family": "Gen5",
                 "capacity": 2
             },
             "tags": {
@@ -26,9 +26,9 @@
         "201": {
             "body": {
               "sku": {
-                "name": "GP_Gen4_2",
+                "name": "GP_Gen5_2",
                 "tier": "GeneralPurpose",
-                "family": "Gen4",
+                "family": "Gen5",
                 "capacity": 2
               },
               "properties": {
@@ -60,9 +60,9 @@
               "type": "Microsoft.DBforMariaDB/servers",
               "location": "brazilsouth",
               "sku": {
-                "name": "GP_Gen4_2",
+                "name": "GP_Gen5_2",
                 "tier": "GeneralPurpose",
-                "family": "Gen4",
+                "family": "Gen5",
                 "capacity": 2
               },
               "tags": {
diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerGet.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerGet.json
index 2928a17e0dfd..9f9660282197 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerGet.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerGet.json
@@ -9,9 +9,9 @@
     "200": {
       "body": {
         "sku": {
-          "name": "GP_Gen4_2",
+          "name": "GP_Gen5_2",
           "tier": "GeneralPurpose",
-          "family": "Gen4",
+          "family": "Gen5",
           "capacity": 2
         },
         "properties": {
diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerList.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerList.json
index 747dc815fcdc..109721d81ee8 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerList.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerList.json
@@ -9,9 +9,9 @@
         "value": [
           {
             "sku": {
-              "name": "B_Gen4_2",
+              "name": "B_Gen5_2",
               "tier": "Basic",
-              "family": "Gen4",
+              "family": "Gen5",
               "capacity": 2
             },
             "properties": {
@@ -34,9 +34,9 @@
           },
           {
             "sku": {
-              "name": "GP_Gen4_2",
+              "name": "GP_Gen5_2",
               "tier": "GeneralPurpose",
-              "family": "Gen4",
+              "family": "Gen5",
               "capacity": 2
             },
             "properties": {
@@ -59,9 +59,9 @@
           },
           {
             "sku": {
-              "name": "GP_Gen4_4",
+              "name": "GP_Gen5_4",
               "tier": "GeneralPurpose",
-              "family": "Gen4",
+              "family": "Gen5",
               "capacity": 4
             },
             "properties": {
diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerListByResourceGroup.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerListByResourceGroup.json
index fcb917990e36..08b101192192 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerListByResourceGroup.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerListByResourceGroup.json
@@ -10,9 +10,9 @@
         "value": [
           {
             "sku": {
-              "name": "B_Gen4_1",
+              "name": "B_Gen5_1",
               "tier": "Basic",
-              "family": "Gen4",
+              "family": "Gen5",
               "capacity": 1
             },
             "properties": {
@@ -35,9 +35,9 @@
           },
           {
             "sku": {
-              "name": "GP_Gen4_2",
+              "name": "GP_Gen5_2",
               "tier": "GeneralPurpose",
-              "family": "Gen4",
+              "family": "Gen5",
               "capacity": 2
             },
             "properties": {
diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerUpdate.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerUpdate.json
index ecc3c1a963ec..38798615afa3 100644
--- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerUpdate.json
+++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerUpdate.json
@@ -15,9 +15,9 @@
     "200": {
       "body": {
         "sku": {
-          "name": "GP_Gen4_2",
+          "name": "GP_Gen5_2",
           "tier": "GeneralPurpose",
-          "family": "Gen4",
+          "family": "Gen5",
           "capacity": 2
         },
         "properties": {
diff --git a/specification/mariadb/resource-manager/readme.go.md b/specification/mariadb/resource-manager/readme.go.md
index 282a438604c5..cffb2e5b9082 100644
--- a/specification/mariadb/resource-manager/readme.go.md
+++ b/specification/mariadb/resource-manager/readme.go.md
@@ -22,5 +22,5 @@ These settings apply only when `--tag=package-2018-06-01-preview --go` is specif
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`. 
 
 ``` yaml $(tag) == 'package-2018-06-01-preview' && $(go) 
-output-folder: $(go-sdk-folder)/services/preview/mariadb/mgmt/2018-06-01-preview/mariadb
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-06-01-preview/$(namespace)
 ```
diff --git a/specification/mariadb/resource-manager/readme.md b/specification/mariadb/resource-manager/readme.md
index eac723a7186b..e8389f597f0b 100644
--- a/specification/mariadb/resource-manager/readme.md
+++ b/specification/mariadb/resource-manager/readme.md
@@ -31,14 +31,14 @@ openapi-type: arm
 tag: package-2018-06-01-preview
 ```
 
-### Tag: package-2018-06-01-preview 
+### Tag: package-2018-06-01-preview
 
-These settings apply only when `--tag=package-2018-06-01-preview` is specified on the command line. 
+These settings apply only when `--tag=package-2018-06-01-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-2018-06-01-preview' 
-input-file: 
-- Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json 
-``` 
+``` yaml $(tag) == 'package-2018-06-01-preview'
+input-file:
+- Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json
+```
 
 
 ---
@@ -55,6 +55,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -101,6 +102,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-rdbms
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/mariadb/resource-manager/readme.typescript.md b/specification/mariadb/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..23e5021de1cb
--- /dev/null
+++ b/specification/mariadb/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-mariadb"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-mariadb"
+  generate-metadata: true
+```
diff --git a/specification/marketplaceordering/resource-manager/readme.go.md b/specification/marketplaceordering/resource-manager/readme.go.md
new file mode 100644
index 000000000000..6bbea376b25c
--- /dev/null
+++ b/specification/marketplaceordering/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: marketplaceordering
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-06-01
+```
+
+### Tag: package-2015-06-01 and go
+
+These settings apply only when `--tag=package-2015-06-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-06-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-06-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/marketplaceordering/resource-manager/readme.md b/specification/marketplaceordering/resource-manager/readme.md
index db60e8a525ba..e79b0d588483 100644
--- a/specification/marketplaceordering/resource-manager/readme.md
+++ b/specification/marketplaceordering/resource-manager/readme.md
@@ -75,6 +75,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -154,31 +155,7 @@ directive:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: marketplaceordering
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-06-01
-```
-
-### Tag: package-2015-06-01 and go
-
-These settings apply only when `--tag=package-2015-06-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-06-01' && $(go)
-output-folder: $(go-sdk-folder)/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/marketplaceordering/resource-manager/readme.typescript.md b/specification/marketplaceordering/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..aa967ea576ab
--- /dev/null
+++ b/specification/marketplaceordering/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-marketplaceordering"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-marketplaceordering"
+  generate-metadata: true
+```
diff --git a/specification/mediaservices/resource-manager/readme.go.md b/specification/mediaservices/resource-manager/readme.go.md
new file mode 100644
index 000000000000..f6fdb0a730e7
--- /dev/null
+++ b/specification/mediaservices/resource-manager/readme.go.md
@@ -0,0 +1,56 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+```yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: media
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+```yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-10
+  - tag: package-2018-03-preview
+  - tag: package-2018-06-preview
+  - tag: package-2018-07
+```
+
+### Tag: package-2015-10 and go
+
+These settings apply only when `--tag=package-2015-10 --go` is specified on the command line.
+Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-2015-10' && $(go)
+output-folder: $(go-sdk-folder)/services/mediaservices/mgmt/2015-10-01/$(namespace)
+```
+
+### Tag: package-2018-03-preview and go
+
+These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
+Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-2018-03-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/mediaservices/mgmt/2018-03-30-preview/$(namespace)
+```
+
+### Tag: package-2018-06-preview and go
+
+These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
+Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-2018-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/mediaservices/mgmt/2018-06-01-preview/$(namespace)
+```
+
+### Tag: package-2018-07 and go
+
+These settings apply only when `--tag=package-2018-07 --go` is specified on the command line.
+Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-2018-07' && $(go)
+output-folder: $(go-sdk-folder)/services/mediaservices/mgmt/2018-07-01/$(namespace)
+```
diff --git a/specification/mediaservices/resource-manager/readme.md b/specification/mediaservices/resource-manager/readme.md
index 818f9ec21bd0..d82feeb7b6d7 100644
--- a/specification/mediaservices/resource-manager/readme.md
+++ b/specification/mediaservices/resource-manager/readme.md
@@ -96,6 +96,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -149,60 +150,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: media
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-10
-  - tag: package-2018-03-preview
-  - tag: package-2018-06-preview
-  - tag: package-2018-07
-```
-
-### Tag: package-2015-10 and go
-
-These settings apply only when `--tag=package-2015-10 --go` is specified on the command line.
-Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-10' && $(go)
-output-folder: $(go-sdk-folder)/services/mediaservices/mgmt/2015-10-01/media
-```
-
-### Tag: package-2018-03-preview and go
-
-These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
-Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-03-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/mediaservices/mgmt/2018-03-30-preview/media
-```
-
-### Tag: package-2018-06-preview and go
-
-These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
-Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/mediaservices/mgmt/2018-06-01-preview/media
-```
-
-### Tag: package-2018-07 and go
-
-These settings apply only when `--tag=package-2018-07 --go` is specified on the command line.
-Please also specify the `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-07' && $(go)
-output-folder: $(go-sdk-folder)/services/mediaservices/mgmt/2018-07-01/media
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/mediaservices/resource-manager/readme.typescript.md b/specification/mediaservices/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..183c5f4b1e9c
--- /dev/null
+++ b/specification/mediaservices/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-mediaservices"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-mediaservices"
+  generate-metadata: true
+```
diff --git a/specification/migrate/resource-manager/readme.go.md b/specification/migrate/resource-manager/readme.go.md
new file mode 100644
index 000000000000..636e72175e29
--- /dev/null
+++ b/specification/migrate/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: migrate
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-02
+```
+
+### Tag: package-2018-02 and go
+
+These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-02' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-02-02/$(namespace)
+```
diff --git a/specification/migrate/resource-manager/readme.md b/specification/migrate/resource-manager/readme.md
index 1f8e8fbb65b6..eccc29721b72 100644
--- a/specification/migrate/resource-manager/readme.md
+++ b/specification/migrate/resource-manager/readme.md
@@ -1,5 +1,5 @@
-# Azure Migrate 
-    
+# Azure Migrate
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Azure Migrate.
@@ -27,7 +27,7 @@ generate-interface: true
 ```
 
 
-## Getting Started 
+## Getting Started
 To build the SDK for Migrate, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -41,7 +41,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the API.
 
 ``` yaml
@@ -56,7 +56,7 @@ These settings apply only when `--tag=package-2018-02` is specified on the comma
 
 ``` yaml $(tag) == 'package-2018-02'
 input-file:
-- Microsoft.Migrate/stable/2018-02-02/migrate.json 
+- Microsoft.Migrate/stable/2018-02-02/migrate.json
 ```
 
 # Code Generation
@@ -69,31 +69,10 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: migrate
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-02
-```
-
-### Tag: package-2018-02 and go
-
-These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-02' && $(go)
-output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-02-02/$(namespace)
-```
+See configuration in [readme.go.md](./readme.go.md)
\ No newline at end of file
diff --git a/specification/migrate/resource-manager/readme.typescript.md b/specification/migrate/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..22e1cbc6ed79
--- /dev/null
+++ b/specification/migrate/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-migrate"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-migrate"
+  generate-metadata: true
+```
diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json b/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json
index c22fd5e8c4aa..473922885b01 100644
--- a/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json
+++ b/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json
@@ -5,9 +5,9 @@
     "ruleName": "logalertfoo",
     "api-version": "2018-04-16",
     "parameters": {
-      "location": "West US",
+      "location": "eastus",
       "tags": {
-        "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI": "Resource"
+        "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace": "Resource"
       },
       "properties": {
         "description": "log alert description",
@@ -15,8 +15,8 @@
         "lastUpdatedTime": "2017-06-23T21:23:52.0221265Z",
         "provisioningState": "Succeeded",
         "source": {
-          "query": "requests",
-          "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI",
+          "query": "Heartbeat | count",
+          "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace",
           "queryType": "ResultCount"
         },
         "schedule": {
@@ -52,9 +52,9 @@
         "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/scheduledQueryRules/logalertfoo",
         "name": "logalertfoo",
         "type": "Microsoft.Insights/scheduledQueryRules",
-        "location": "West US",
+        "location": "eastus",
         "tags": {
-          "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI": "Resource"
+          "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace": "Resource"
         },
         "properties": {
           "description": "log alert description",
@@ -62,8 +62,8 @@
           "lastUpdatedTime": "2017-06-23T21:23:52.0221265Z",
           "provisioningState": "Succeeded",
           "source": {
-            "query": "requests",
-            "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI",
+            "query": "Heartbeat | count",
+            "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace",
             "queryType": "ResultCount"
           },
           "schedule": {
@@ -98,9 +98,9 @@
         "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/scheduledQueryRules/logalertfoo",
         "name": "logalertfoo",
         "type": "Microsoft.Insights/scheduledQueryRules",
-        "location": "West US",
+        "location": "eastus",
         "tags": {
-          "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI": "Resource"
+          "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace": "Resource"
         },
         "properties": {
           "description": "log alert description",
@@ -108,9 +108,9 @@
           "lastUpdatedTime": "2017-06-23T21:23:52.0221265Z",
           "provisioningState": "Succeeded",
           "source": {
-            "query": "requests",
+            "query": "Heartbeat",
             "queryType": "ResultCount",
-            "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI"
+            "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace"
           },
           "schedule": {
             "frequencyInMinutes": 15,
diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRuleswithCrossResource.json b/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRuleswithCrossResource.json
new file mode 100644
index 000000000000..1f5f3929cc15
--- /dev/null
+++ b/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRuleswithCrossResource.json
@@ -0,0 +1,131 @@
+{
+  "parameters": {
+    "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3",
+    "resourceGroupName": "Rac46PostSwapRG",
+    "ruleName": "SampleCrossResourceAlert",
+    "api-version": "2018-04-16",
+    "parameters": {
+      "location": "eastus",
+      "tags": {
+        "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI": "Resource"
+      },
+      "properties": {
+        "description": "Sample Cross Resource alert",
+        "enabled": "true",
+        "source": {
+          "query": "union requests, workspace(\"sampleWorkspace\").Update",
+          "authorizedResources": [
+            "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace",
+            "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI"
+          ],
+          "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI",
+          "queryType": "ResultCount"
+        },
+        "schedule": {
+          "frequencyInMinutes": 60,
+          "timeWindowInMinutes": 60
+        },
+        "action": {
+          "severity": "3",
+          "aznsAction": {
+            "actionGroup": [ "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/actiongroups/test-ag" ],
+            "emailSubject": "Cross Resource Mail!!"
+          },
+          "trigger": {
+            "thresholdOperator": "GreaterThan",
+            "threshold": 5000
+          },
+          "odata.type": "Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.Microsoft.AppInsights.Nexus.DataContracts.Resources.ScheduledQueryRules.AlertingAction"
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/scheduledQueryRules/SampleCrossResourceAlert",
+        "name": "SampleCrossResourceAlert",
+        "type": "Microsoft.Insights/scheduledQueryRules",
+        "location": "eastus",
+        "tags": {
+          "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI": "Resource"
+        },
+        "properties": {
+          "description": "Sample Cross Resource alert",
+          "enabled": "true",
+          "lastUpdatedTime": "2018-09-04T06:27:58.3892575Z",
+          "provisioningState": "Succeeded",
+          "source": {
+            "query": "union requests, workspace(\"sampleWorkspace\").Update",
+            "authorizedResources": [
+              "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace",
+              "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI"
+            ],
+            "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI",
+            "queryType": "ResultCount"
+          },
+          "schedule": {
+            "frequencyInMinutes": 60,
+            "timeWindowInMinutes": 60
+          },
+          "action": {
+            "severity": "3",
+            "aznsAction": {
+              "actionGroup": [ "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/actiongroups/test-ag" ],
+              "emailSubject": "Cross Resource Mail!!"
+            },
+            "trigger": {
+              "thresholdOperator": "GreaterThan",
+              "threshold": 5000
+            },
+            "odata.type": "Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.Microsoft.AppInsights.Nexus.DataContracts.Resources.ScheduledQueryRules.AlertingAction"
+          }
+        }
+      }
+    },
+    "201": {
+      "headers": {},
+      "body": {
+        "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/scheduledQueryRules/SampleCrossResourceAlert",
+        "name": "SampleCrossResourceAlert",
+        "type": "Microsoft.Insights/scheduledQueryRules",
+        "location": "eastus",
+        "tags": {
+          "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI": "Resource"
+        },
+        "properties": {
+          "description": "Sample Cross Resource alert",
+          "enabled": "true",
+          "lastUpdatedTime": "2018-09-04T06:27:58.3892575Z",
+          "provisioningState": "Succeeded",
+          "source": {
+            "query": "union requests, workspace(\"sampleWorkspace\").Update",
+            "authorizedResources": [
+              "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace",
+              "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI"
+            ],
+            "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/components/sampleAI",
+            "queryType": "ResultCount"
+          },
+          "schedule": {
+            "frequencyInMinutes": 60,
+            "timeWindowInMinutes": 60
+          },
+          "action": {
+            "severity": "3",
+            "aznsAction": {
+              "actionGroup": [ "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/actiongroups/test-ag" ],
+              "emailSubject": "Cross Resource Mail!!"
+            },
+            "trigger": {
+              "thresholdOperator": "GreaterThan",
+              "threshold": 5000
+            },
+            "odata.type": "Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.Microsoft.AppInsights.Nexus.DataContracts.Resources.ScheduledQueryRules.AlertingAction"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/scheduledQueryRule_API.json
index 5d3fe723ca8b..6993a69f06d9 100644
--- a/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/scheduledQueryRule_API.json
+++ b/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/scheduledQueryRule_API.json
@@ -85,7 +85,8 @@
           }
         },
         "x-ms-examples": {
-          "Create or Update rule - AletringAction": { "$ref": "./examples/createOrUpdateScheduledQueryRules.json" },
+          "Create or Update rule - AlertingAction": { "$ref": "./examples/createOrUpdateScheduledQueryRules.json" },
+          "Create or Update rule - AlertingAction with Cross-Resource": { "$ref": "./examples/createOrUpdateScheduledQueryRuleswithCrossResource.json" },
           "Create or Update rule - LogToMetricAction": { "$ref": "./examples/createOrUpdateScheduledQueryRule-LogToMetricAction.json" }
         }
       },
diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md
index 9b080a52cef3..3a89f7851da6 100644
--- a/specification/monitor/resource-manager/readme.go.md
+++ b/specification/monitor/resource-manager/readme.go.md
@@ -25,7 +25,7 @@ These settings apply only when `--tag=package-2017-09 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-09' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2018-03-01/insights
+output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2018-03-01/$(namespace)
 ```
 
 ### Tag: package-2017-08 and go
@@ -34,7 +34,7 @@ These settings apply only when `--tag=package-2017-08 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-08' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2017-05-01-preview/insights
+output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2017-05-01-preview/$(namespace)
 ```
 
 ### Tag: package-2018-03 and go
@@ -43,7 +43,7 @@ These settings apply only when `--tag=package-2018-03 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-03' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2018-03-01/insights
+output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2018-03-01/$(namespace)
 ```
 
 ### Tag: package-2018-09 and go
@@ -52,5 +52,5 @@ These settings apply only when `--tag=package-2018-09 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-09' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2018-09-01/insights
+output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2018-09-01/$(namespace)
 ```
diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md
index 70c315b1f802..606b438cfd24 100644
--- a/specification/monitor/resource-manager/readme.md
+++ b/specification/monitor/resource-manager/readme.md
@@ -286,6 +286,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -312,6 +313,10 @@ csharp:
 
 See configuration in [readme.python.md](./readme.python.md)
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/monitor/resource-manager/readme.typescript.md b/specification/monitor/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..922f82750f65
--- /dev/null
+++ b/specification/monitor/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-monitor"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-monitor"
+  payload-flattening-threshold: 1
+  generate-metadata: true
+```
diff --git a/specification/msi/resource-manager/readme.go.md b/specification/msi/resource-manager/readme.go.md
new file mode 100644
index 000000000000..ed9418e0b291
--- /dev/null
+++ b/specification/msi/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: msi
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-08-31-preview
+```
+
+### Tag: package-2015-08-31-preview and go
+
+These settings apply only when `--tag=package-2015-08-31-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-08-31-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-08-31-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/msi/resource-manager/readme.md b/specification/msi/resource-manager/readme.md
index 71d08c613f60..e05ba279f00d 100644
--- a/specification/msi/resource-manager/readme.md
+++ b/specification/msi/resource-manager/readme.md
@@ -52,6 +52,8 @@ swagger-to-sdk:
   - repo: azure-sdk-for-ruby
     after_scripts:
       - bundle install && rake arm:regen_all_profiles['azure_mgmt_msi']
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 
@@ -98,31 +100,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: msi
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-08-31-preview
-```
-
-### Tag: package-2015-08-31-preview and go
-
-These settings apply only when `--tag=package-2015-08-31-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-08-31-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/msi/mgmt/2015-08-31-preview/msi
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/msi/resource-manager/readme.typescript.md b/specification/msi/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..cab59f1638a3
--- /dev/null
+++ b/specification/msi/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-msi"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-msi"
+  generate-metadata: true
+```
diff --git a/specification/mysql/resource-manager/readme.go.md b/specification/mysql/resource-manager/readme.go.md
new file mode 100644
index 000000000000..b332b6bd153e
--- /dev/null
+++ b/specification/mysql/resource-manager/readme.go.md
@@ -0,0 +1,44 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: mysql
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-12-01
+```
+
+### Tag: package-2017-04-preview and go
+
+These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-04-30-preview/$(namespace)
+```
+
+### Tag: package-2017-12-01-preview and go
+
+These settings apply only when `--tag=package-2017-12-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-12-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-12-01-preview/$(namespace)
+```
+
+### Tag: package-2017-12-01 and go
+
+These settings apply only when `--tag=package-2017-12-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-12-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-12-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md
index b217c7331710..9595ab03be01 100644
--- a/specification/mysql/resource-manager/readme.md
+++ b/specification/mysql/resource-manager/readme.md
@@ -50,14 +50,14 @@ input-file:
 ```
 
 
-### Tag: package-2017-12-01 
+### Tag: package-2017-12-01
 
-These settings apply only when `--tag=package-2017-12-01` is specified on the command line. 
+These settings apply only when `--tag=package-2017-12-01` is specified on the command line.
 
-``` yaml $(tag) == 'package-2017-12-01' 
-input-file: 
-- Microsoft.DBforMySQL/stable/2017-12-01/mysql.json 
-``` 
+``` yaml $(tag) == 'package-2017-12-01'
+input-file:
+- Microsoft.DBforMySQL/stable/2017-12-01/mysql.json
+```
 
 
 ---
@@ -74,6 +74,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -120,51 +121,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-rdbms
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: mysql
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-12-01
-```
-
-### Tag: package-2017-04-preview and go
-
-These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/mysql/mgmt/2017-04-30-preview/mysql
-```
-
-### Tag: package-2017-12-01-preview and go
-
-These settings apply only when `--tag=package-2017-12-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-12-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/mysql/mgmt/2017-12-01-preview/mysql
-```
-
-### Tag: package-2017-12-01 and go 
-
-These settings apply only when `--tag=package-2017-12-01 --go` is specified on the command line. 
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`. 
-
-``` yaml $(tag) == 'package-2017-12-01' && $(go) 
-output-folder: $(go-sdk-folder)/services/mysql/mgmt/2017-12-01/mysql
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/mysql/resource-manager/readme.typescript.md b/specification/mysql/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..01a40275e9cb
--- /dev/null
+++ b/specification/mysql/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-mysql"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-mysql"
+  generate-metadata: true
+```
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json
index 1abd9d31ca2e..a6baf5083f12 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json
@@ -11,7 +11,11 @@
         "peerASN": 200,
         "primaryPeerAddressPrefix": "192.168.16.252/30",
         "secondaryPeerAddressPrefix": "192.168.18.252/30",
-        "vlanId": 200    
+        "vlanId": 200,
+        "ipv6PeeringConfig": {
+          "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+          "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126"
+        }    
       }
     }
   },
@@ -34,6 +38,11 @@
           "vlanId": 200,
           "gatewayManagerEtag": "",
           "lastModifiedBy": "Customer",
+          "ipv6PeeringConfig": {
+            "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+            "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
+            "state": "Enabled"
+          },
           "expressRouteConnection": {
             "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName"
           }
@@ -57,7 +66,12 @@
           "state": "Enabled",
           "vlanId": 200,
           "gatewayManagerEtag": "",
-          "lastModifiedBy": "Customer",
+          "lastModifiedBy": "Customer",          
+          "ipv6PeeringConfig": {
+            "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+            "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
+            "state": "Enabled"
+          },
           "expressRouteConnection": ""
         }
       }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json
index ffaab9b7395f..e5f2ebb8ced8 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json
@@ -70,6 +70,11 @@
                   "vlanId": 200,
                   "gatewayManagerEtag": "103",
                   "lastModifiedBy": "Customer",
+                  "ipv6PeeringConfig": {
+                    "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+                    "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
+                    "state": "Enabled"
+                  },
                   "expressRouteConnection": {
                     "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName"
                   }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json
index f09b381a4358..9e54c4977070 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json
@@ -11,7 +11,11 @@
         "peerASN": 200,
         "primaryPeerAddressPrefix": "192.168.16.252/30",
         "secondaryPeerAddressPrefix": "192.168.18.252/30",
-        "vlanId": 200    
+        "vlanId": 200,
+        "ipv6PeeringConfig": {
+          "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+          "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126"
+        } 
       }
     }
   },
@@ -33,7 +37,12 @@
           "state": "Enabled",
           "vlanId": 200,
           "gatewayManagerEtag": "",
-          "lastModifiedBy": "Customer"
+          "lastModifiedBy": "Customer",
+          "ipv6PeeringConfig": {
+            "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+            "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
+            "state": "Enabled"
+          }
         }
       }
     },
@@ -54,7 +63,12 @@
           "state": "Enabled",
           "vlanId": 200,
           "gatewayManagerEtag": "",
-          "lastModifiedBy": "Customer"
+          "lastModifiedBy": "Customer",
+          "ipv6PeeringConfig": {
+            "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+            "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
+            "state": "Enabled"
+          }
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json
index a043bc9f1363..db8c8d4b443b 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json
@@ -24,7 +24,12 @@
           "state": "Enabled",
           "vlanId": 200,
           "gatewayManagerEtag": "",
-          "lastModifiedBy": "Customer"
+          "lastModifiedBy": "Customer",
+          "ipv6PeeringConfig": {
+            "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+            "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
+            "state": "Enabled"
+          }
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json
index 1c3b137cb1a5..7e0297c1a40f 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json
@@ -25,7 +25,12 @@
               "state": "Enabled",
               "vlanId": 200,
               "gatewayManagerEtag": "",
-              "lastModifiedBy": "Customer"
+              "lastModifiedBy": "Customer",
+              "ipv6PeeringConfig": {
+                "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+                "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
+                "state": "Enabled"
+              }
             }
           }
         ]
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json
index 8d212cbfb166..29e1ed248e2d 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json
@@ -199,9 +199,6 @@
                         "schema": {
                             "$ref": "#/definitions/ExpressRouteGateway"
                         }
-                    },
-                    "404": {
-                        "description": "Not found. The specified resource does not exist."
                     }
                 }
             },
diff --git a/specification/network/resource-manager/readme.go.md b/specification/network/resource-manager/readme.go.md
index 4edc65b25256..e40398aefe7f 100644
--- a/specification/network/resource-manager/readme.go.md
+++ b/specification/network/resource-manager/readme.go.md
@@ -39,7 +39,7 @@ These settings apply only when `--tag=package-2018-08 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-08' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2018-08-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-08-01/$(namespace)
 ```
 
 ### Tag: package-2018-07 and go
@@ -48,7 +48,7 @@ These settings apply only when `--tag=package-2018-07 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-07' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2018-07-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-07-01/$(namespace)
 ```
 
 ### Tag: package-2018-06 and go
@@ -57,7 +57,7 @@ These settings apply only when `--tag=package-2018-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-06' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2018-06-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-06-01/$(namespace)
 ```
 
 ### Tag: package-2018-04 and go
@@ -66,7 +66,7 @@ These settings apply only when `--tag=package-2018-04 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-04' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2018-04-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-04-01/$(namespace)
 ```
 
 ### Tag: package-2018-02 and go
@@ -75,7 +75,7 @@ These settings apply only when `--tag=package-2018-02 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-02' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2018-02-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-02-01/$(namespace)
 ```
 
 ### Tag: package-2018-01 and go
@@ -84,7 +84,7 @@ These settings apply only when `--tag=package-2018-01 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2018-01-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-01-01/$(namespace)
 ```
 
 ### Tag: package-2017-11 and go
@@ -93,7 +93,7 @@ These settings apply only when `--tag=package-2017-11 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-11' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-11-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-11-01/$(namespace)
 ```
 
 ### Tag: package-2017-10 and go
@@ -102,7 +102,7 @@ These settings apply only when `--tag=package-2017-10 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-10' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-10-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-10-01/$(namespace)
 ```
 
 ### Tag: package-2017-09 and go
@@ -111,7 +111,7 @@ These settings apply only when `--tag=package-2017-09 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-09' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-09-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-09-01/$(namespace)
 ```
 
 ### Tag: package-2017-08 and go
@@ -120,7 +120,7 @@ These settings apply only when `--tag=package-2017-08 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-08' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-08-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-08-01/$(namespace)
 ```
 
 ### Tag: package-2017-06 and go
@@ -129,7 +129,7 @@ These settings apply only when `--tag=package-2017-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-06' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-06-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-06-01/$(namespace)
 ```
 
 ### Tag: package-2017-03 and go
@@ -138,7 +138,7 @@ These settings apply only when `--tag=package-2017-03 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-03' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-03-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-03-01/$(namespace)
 ```
 
 ### Tag: package-2016-12 and go
@@ -147,7 +147,7 @@ These settings apply only when `--tag=package-2016-12 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-12' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2016-12-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-12-01/$(namespace)
 ```
 
 ### Tag: package-2016-09 and go
@@ -156,7 +156,7 @@ These settings apply only when `--tag=package-2016-09 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-09' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2016-09-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-09-01/$(namespace)
 ```
 
 ### Tag: package-2016-06 and go
@@ -165,7 +165,7 @@ These settings apply only when `--tag=package-2016-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-06' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2016-06-01/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-06-01/$(namespace)
 ```
 
 ### Tag: package-2016-03 and go
@@ -174,7 +174,7 @@ These settings apply only when `--tag=package-2016-03 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-03' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2016-03-30/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-03-30/$(namespace)
 ```
 
 ### Tag: package-2015-06split and go
@@ -183,7 +183,7 @@ These settings apply only when `--tag=package-2015-06split --go` is specified on
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2015-06split' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2015-06-15/network
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-06-15/$(namespace)
 ```
 
 ### Tag: package-2015-05-preview and go
@@ -192,5 +192,5 @@ These settings apply only when `--tag=package-2015-05-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2015-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/network/mgmt/2015-05-01-preview/network
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-05-01-preview/$(namespace)
 ```
diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md
index 5a40523ec00f..c23bf2ccdf3f 100644
--- a/specification/network/resource-manager/readme.md
+++ b/specification/network/resource-manager/readme.md
@@ -677,7 +677,7 @@ directive:
     reason: name, id and type properties are inherited from the upper level
   - suppress: RequiredPropertiesMissingInResourceModel
     from: publicIpPrefix.json
-    reason: name, id and type properties are inherited from the upper level    
+    reason: name, id and type properties are inherited from the upper level
   - suppress: RequiredPropertiesMissingInResourceModel
     from: routeFilter.json
     reason: name, id and type properties are inherited from the upper level
@@ -787,122 +787,9 @@ directive:
     reason: Accidentally shipped with wrong casing - however fixing the casing is introducing a breaking change which is worse than living with the naming violation
 ```
 
-### Tag: package-2018-01 and go
-
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2018-01-01/network
-```
-
-### Tag: package-2017-11 and go
-
-These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-11' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-11-01/network
-```
-
-### Tag: package-2017-10 and go
-
-These settings apply only when `--tag=package-2017-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-10' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-10-01/network
-```
-
-### Tag: package-2017-09 and go
-
-These settings apply only when `--tag=package-2017-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-09' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-09-01/network
-```
-
-### Tag: package-2017-08 and go
-
-These settings apply only when `--tag=package-2017-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-08' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-08-01/network
-```
-
-### Tag: package-2017-06 and go
-
-These settings apply only when `--tag=package-2017-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-06' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-06-01/network
-```
-
-### Tag: package-2017-03 and go
-
-These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+## Go
 
-``` yaml $(tag) == 'package-2017-03' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2017-03-01/network
-```
-
-### Tag: package-2016-12 and go
-
-These settings apply only when `--tag=package-2016-12 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-12' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2016-12-01/network
-```
-
-### Tag: package-2016-09 and go
-
-These settings apply only when `--tag=package-2016-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-09' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2016-09-01/network
-```
-
-### Tag: package-2016-06 and go
-
-These settings apply only when `--tag=package-2016-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-06' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2016-06-01/network
-```
-
-### Tag: package-2016-03 and go
-
-These settings apply only when `--tag=package-2016-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-03' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2016-03-30/network
-```
-
-### Tag: package-2015-06split and go
-
-These settings apply only when `--tag=package-2015-06split --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-06split' && $(go)
-output-folder: $(go-sdk-folder)/services/network/mgmt/2015-06-15/network
-```
-
-### Tag: package-2015-05-preview and go
-
-These settings apply only when `--tag=package-2015-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/network/mgmt/2015-05-01-preview/network
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/network/resource-manager/readme.typescript.md b/specification/network/resource-manager/readme.typescript.md
index ea8048770043..d957e3918245 100644
--- a/specification/network/resource-manager/readme.typescript.md
+++ b/specification/network/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-network"
-  output-folder: $(typescript-sdks-folder)/packages/arm-network
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-network"
   generate-metadata: true
   generate-readme-md: false
 ```
diff --git a/specification/notificationhubs/resource-manager/readme.go.md b/specification/notificationhubs/resource-manager/readme.go.md
new file mode 100644
index 000000000000..337363ef3ed9
--- /dev/null
+++ b/specification/notificationhubs/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: notificationhubs
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-04
+  - tag: package-2016-03
+  - tag: package-2014-09
+```
+
+### Tag: package-2017-04 and go
+
+These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-04-01/$(namespace)
+```
+
+### Tag: package-2016-03 and go
+
+These settings apply only when `--tag=package-2016-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-03-01/$(namespace)
+```
+
+### Tag: package-2014-09 and go
+
+These settings apply only when `--tag=package-2014-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2014-09' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2014-09-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/notificationhubs/resource-manager/readme.md b/specification/notificationhubs/resource-manager/readme.md
index 77bcf3aefbc2..e899ead10e8f 100644
--- a/specification/notificationhubs/resource-manager/readme.md
+++ b/specification/notificationhubs/resource-manager/readme.md
@@ -87,6 +87,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -136,54 +137,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-notificationhubs
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: notificationhubs
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-04
-  - tag: package-2016-03
-  - tag: package-2014-09
-```
-
-### Tag: package-2017-04 and go
-
-These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04' && $(go)
-output-folder: $(go-sdk-folder)/services/notificationhubs/mgmt/2017-04-01/notificationhubs
-```
-
-### Tag: package-2016-03 and go
-
-These settings apply only when `--tag=package-2016-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-03' && $(go)
-output-folder: $(go-sdk-folder)/services/notificationhubs/mgmt/2016-03-01/notificationhubs
-```
-
-### Tag: package-2014-09 and go
-
-These settings apply only when `--tag=package-2014-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2014-09' && $(go)
-output-folder: $(go-sdk-folder)/services/notificationhubs/mgmt/2014-09-01/notificationhubs
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/notificationhubs/resource-manager/readme.typescript.md b/specification/notificationhubs/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..ae957a1aae4d
--- /dev/null
+++ b/specification/notificationhubs/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-notificationhubs"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-notificationhubs"
+  generate-metadata: true
+```
diff --git a/specification/operationalinsights/data-plane/readme.go.md b/specification/operationalinsights/data-plane/readme.go.md
new file mode 100644
index 000000000000..c683948ad931
--- /dev/null
+++ b/specification/operationalinsights/data-plane/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: operationalinsights
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: v1
+```
+
+### Tag: v1 and go
+
+These settings apply only when `--tag=v1 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='v1' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/v1/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/operationalinsights/data-plane/readme.md b/specification/operationalinsights/data-plane/readme.md
index e04d2aec9922..555704f6c8d9 100644
--- a/specification/operationalinsights/data-plane/readme.md
+++ b/specification/operationalinsights/data-plane/readme.md
@@ -66,6 +66,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -114,31 +115,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: operationalinsights
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: v1
-```
-
-### Tag: v1 and go
-
-These settings apply only when `--tag=v1 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='v1' && $(go)
-output-folder: $(go-sdk-folder)/services/operationalinsights/v1/operationalinsights
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/operationalinsights/data-plane/readme.typescript.md b/specification/operationalinsights/data-plane/readme.typescript.md
new file mode 100644
index 000000000000..dab6ebf95825
--- /dev/null
+++ b/specification/operationalinsights/data-plane/readme.typescript.md
@@ -0,0 +1,12 @@
+
+## TypeScriptJS
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to the root directory of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  package-name: "@azure/loganalytics"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/loganalytics"
+  override-client-name: LogAnalyticsClient
+  generate-metadata: true
+```
\ No newline at end of file
diff --git a/specification/operationalinsights/resource-manager/readme.go.md b/specification/operationalinsights/resource-manager/readme.go.md
new file mode 100644
index 000000000000..10b7867a8fc2
--- /dev/null
+++ b/specification/operationalinsights/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: operationalinsights
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-03
+  - tag: package-2015-11-preview
+```
+
+### Tag: package-2015-03 and go
+
+These settings apply only when `--tag=package-2015-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-03-20/$(namespace)
+```
+
+### Tag: package-2015-11-preview and go
+
+These settings apply only when `--tag=package-2015-11-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-11-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-11-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/operationalinsights/resource-manager/readme.md b/specification/operationalinsights/resource-manager/readme.md
index 9f787300d0c9..fb8e55278e7c 100644
--- a/specification/operationalinsights/resource-manager/readme.md
+++ b/specification/operationalinsights/resource-manager/readme.md
@@ -63,6 +63,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -115,95 +116,61 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-loganalytics
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
+See configuration in [readme.go.md](./readme.go.md)
 
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: operationalinsights
-  clear-output-folder: true
-```
+## Java
 
-### Go multi-api
+These settings apply only when `--java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
 
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-03
-  - tag: package-2015-11-preview
+``` yaml $(java)
+azure-arm: true
+fluent: true
+namespace: com.microsoft.azure.management.operationalinsights
+license-header: MICROSOFT_MIT_NO_CODEGEN
+payload-flattening-threshold: 1
+output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-operationalinsights
 ```
 
-### Tag: package-2015-03 and go
 
-These settings apply only when `--tag=package-2015-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag) == 'package-2015-03' && $(go)
-output-folder: $(go-sdk-folder)/services/operationalinsights/mgmt/2015-03-20/operationalinsights
+### Java multi-api
+
+``` yaml $(java) && $(multiapi)
+batch:
+  - tag: package-2015-03
+  - tag: package-2015-11-preview
 ```
 
-### Tag: package-2015-11-preview and go
+### Tag: package-2015-03 and java
 
-These settings apply only when `--tag=package-2015-11-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2015-03 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2015-11-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights
+``` yaml $(tag) == 'package-2015-03' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.operationalinsights.v2015_03_20
+  output-folder: $(azure-libraries-for-java-folder)/operationalinsights/resource-manager/v2015_03_20
+regenerate-manager: true
+generate-interface: true
 ```
 
-## Java
+### Tag: package-2015-11-preview and java
 
-These settings apply only when `--java` is specified on the command line.
-Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
+These settings apply only when `--tag=package-2015-11-preview --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(java)
-azure-arm: true
-fluent: true
-namespace: com.microsoft.azure.management.operationalinsights
-license-header: MICROSOFT_MIT_NO_CODEGEN
-payload-flattening-threshold: 1
-output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-operationalinsights
+``` yaml $(tag) == 'package-2015-11-preview' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.operationalinsights.v2015_11_01_preview
+  output-folder: $(azure-libraries-for-java-folder)/operationalinsights/resource-manager/v2015_11_01_preview
+regenerate-manager: true
+generate-interface: true
 ```
 
 
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-2015-03
-  - tag: package-2015-11-preview
-```
-
-### Tag: package-2015-03 and java
-
-These settings apply only when `--tag=package-2015-03 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2015-03' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.operationalinsights.v2015_03_20
-  output-folder: $(azure-libraries-for-java-folder)/operationalinsights/resource-manager/v2015_03_20
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-2015-11-preview and java
-
-These settings apply only when `--tag=package-2015-11-preview --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2015-11-preview' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.operationalinsights.v2015_11_01_preview
-  output-folder: $(azure-libraries-for-java-folder)/operationalinsights/resource-manager/v2015_11_01_preview
-regenerate-manager: true
-generate-interface: true
-```
-
-
 ## Suppression
 
 ``` yaml
diff --git a/specification/operationalinsights/resource-manager/readme.typescript.md b/specification/operationalinsights/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..abd999df6845
--- /dev/null
+++ b/specification/operationalinsights/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-operationalinsights"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-operationalinsights"
+  override-client-name: OperationalInsightsManagementClient
+  generate-metadata: true
+```
diff --git a/specification/operationsmanagement/resource-manager/readme.go.md b/specification/operationsmanagement/resource-manager/readme.go.md
new file mode 100644
index 000000000000..b88e9cf57303
--- /dev/null
+++ b/specification/operationsmanagement/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: operationsmanagement
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-11-preview
+```
+
+### Tag: package-2015-11-preview and go
+
+These settings apply only when `--tag=package-2015-11-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-11-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-11-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/operationsmanagement/resource-manager/readme.md b/specification/operationsmanagement/resource-manager/readme.md
index 8117bace92e6..a37250ab8fba 100644
--- a/specification/operationsmanagement/resource-manager/readme.md
+++ b/specification/operationsmanagement/resource-manager/readme.md
@@ -54,6 +54,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -74,34 +75,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: operationsmanagement
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-11-preview
-```
-
-### Tag: package-2015-11-preview and go
-
-These settings apply only when `--tag=package-2015-11-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-11-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/operationsmanagement/resource-manager/readme.typescript.md b/specification/operationsmanagement/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..63e12a6dded2
--- /dev/null
+++ b/specification/operationsmanagement/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-operations"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-operations"
+  generate-metadata: true
+```
diff --git a/specification/policyinsights/resource-manager/readme.go.md b/specification/policyinsights/resource-manager/readme.go.md
index 058cc2e7a41b..88dfac2f0091 100644
--- a/specification/policyinsights/resource-manager/readme.go.md
+++ b/specification/policyinsights/resource-manager/readme.go.md
@@ -25,7 +25,7 @@ These settings apply only when `--tag=package-2018-07 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-07' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/policyinsights/mgmt/2018-07-01-preview/policyinsights
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-07-01-preview/$(namespace)
 ```
 
 ### Tag: package-2018-04 and go
@@ -34,7 +34,7 @@ These settings apply only when `--tag=package-2018-04 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-04' && $(go)
-output-folder: $(go-sdk-folder)/services/policyinsights/mgmt/2018-04-04/policyinsights
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-04-04/$(namespace)
 ```
 
 ### Tag: package-2017-12 and go
@@ -43,7 +43,7 @@ These settings apply only when `--tag=package-2017-12 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-12' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/policyinsights/mgmt/2017-12-12-preview/policyinsights
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-12-12-preview/$(namespace)
 ```
 
 ### Tag: package-2017-10 and go
@@ -52,7 +52,7 @@ These settings apply only when `--tag=package-2017-10 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-10' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/policyinsights/mgmt/2017-10-17-preview/policyinsights
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-10-17-preview/$(namespace)
 ```
 
 ### Tag: package-2017-08 and go
@@ -61,5 +61,5 @@ These settings apply only when `--tag=package-2017-08 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-08' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/policyinsights/mgmt/2017-08-09-preview/policyinsights
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-08-09-preview/$(namespace)
 ```
diff --git a/specification/policyinsights/resource-manager/readme.md b/specification/policyinsights/resource-manager/readme.md
index 73a3531d80ad..f57d8b086041 100644
--- a/specification/policyinsights/resource-manager/readme.md
+++ b/specification/policyinsights/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # PolicyInsights
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for PolicyInsights.
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the PolicyInsights API.
 
 ``` yaml
@@ -128,10 +128,12 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -172,6 +174,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-policyinsights
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/policyinsights/resource-manager/readme.typescript.md b/specification/policyinsights/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..3909776c7920
--- /dev/null
+++ b/specification/policyinsights/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-policyinsights"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-policyinsights"
+  generate-metadata: true
+```
diff --git a/specification/postgresql/resource-manager/readme.go.md b/specification/postgresql/resource-manager/readme.go.md
new file mode 100644
index 000000000000..8e195f52a918
--- /dev/null
+++ b/specification/postgresql/resource-manager/readme.go.md
@@ -0,0 +1,44 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: postgresql
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-12-01
+```
+
+### Tag: package-2017-04-preview and go
+
+These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-04-30-preview/$(namespace)
+```
+
+### Tag: package-2017-12-01-preview and go
+
+These settings apply only when `--tag=package-2017-12-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-12-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-12-01-preview/$(namespace)
+```
+
+### Tag: package-2017-12-01 and go
+
+These settings apply only when `--tag=package-2017-12-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-12-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-12-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md
index f5c3d789670e..f65192cb23dc 100644
--- a/specification/postgresql/resource-manager/readme.md
+++ b/specification/postgresql/resource-manager/readme.md
@@ -50,15 +50,15 @@ input-file:
 - Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/postgresql.json
 ```
 
-### Tag: package-2017-12-01 
+### Tag: package-2017-12-01
 
-These settings apply only when `--tag=package-2017-12-01` is specified on the command line. 
+These settings apply only when `--tag=package-2017-12-01` is specified on the command line.
 
 
-``` yaml $(tag) == 'package-2017-12-01' 
-input-file: 
+``` yaml $(tag) == 'package-2017-12-01'
+input-file:
 - Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json
-``` 
+```
 
 
 ---
@@ -75,6 +75,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -120,51 +121,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-rdbms
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: postgresql
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-12-01
-```
-
-### Tag: package-2017-04-preview and go
-
-These settings apply only when `--tag=package-2017-04-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/postgresql/mgmt/2017-04-30-preview/postgresql
-```
-
-### Tag: package-2017-12-01-preview and go
-
-These settings apply only when `--tag=package-2017-12-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-12-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/postgresql/mgmt/2017-12-01-preview/postgresql
-```
-
-### Tag: package-2017-12-01 and go 
-
-These settings apply only when `--tag=package-2017-12-01 --go` is specified on the command line. 
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`. 
-
-``` yaml $(tag) == 'package-2017-12-01' && $(go) 
-output-folder: $(go-sdk-folder)/services/postgresql/mgmt/2017-12-01/postgresql 
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/postgresql/resource-manager/readme.typescript.md b/specification/postgresql/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..e71b129c15a0
--- /dev/null
+++ b/specification/postgresql/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-postgresql"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-postgresql"
+  generate-metadata: true
+```
diff --git a/specification/powerbidedicated/resource-manager/readme.go.md b/specification/powerbidedicated/resource-manager/readme.go.md
new file mode 100644
index 000000000000..84b614cf8a5d
--- /dev/null
+++ b/specification/powerbidedicated/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: powerbidedicated
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-10-01
+```
+
+### Tag: package-2017-10-01 and go
+
+These settings apply only when `--tag=package-2017-10-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-10-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-10-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/powerbidedicated/resource-manager/readme.md b/specification/powerbidedicated/resource-manager/readme.md
index 4571aaeeef56..3899449c89bb 100644
--- a/specification/powerbidedicated/resource-manager/readme.md
+++ b/specification/powerbidedicated/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # PowerBIDedicated
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for PowerBIDedicated.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for PowerBIDedicated.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for PowerBIDedicated, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the PowerBIDedicated API.
 
 ``` yaml
@@ -51,9 +51,11 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -69,31 +71,7 @@ csharp:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: powerbidedicated
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-10-01
-```
-
-### Tag: package-2017-10-01 and go
-
-These settings apply only when `--tag=package-2017-10-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-10-01' && $(go)
-output-folder: $(go-sdk-folder)/services/powerbidedicated/mgmt/2017-10-01/powerbidedicated
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/powerbidedicated/resource-manager/readme.typescript.md b/specification/powerbidedicated/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..17d3f46c644c
--- /dev/null
+++ b/specification/powerbidedicated/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-powerbidedicated"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-powerbidedicated"
+  generate-metadata: true
+```
diff --git a/specification/powerbiembedded/resource-manager/readme.go.md b/specification/powerbiembedded/resource-manager/readme.go.md
new file mode 100644
index 000000000000..8d88acd2f8e3
--- /dev/null
+++ b/specification/powerbiembedded/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: powerbiembedded
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-01
+```
+
+### Tag: package-2016-01 and go
+
+These settings apply only when `--tag=package-2016-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-01-29/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/powerbiembedded/resource-manager/readme.md b/specification/powerbiembedded/resource-manager/readme.md
index 18c73dbe54b0..b0288b2b8454 100644
--- a/specification/powerbiembedded/resource-manager/readme.md
+++ b/specification/powerbiembedded/resource-manager/readme.md
@@ -54,6 +54,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -103,34 +104,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-powerbiembedded
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: powerbiembedded
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-01
-```
-
-### Tag: package-2016-01 and go
-
-These settings apply only when `--tag=package-2016-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-01' && $(go)
-output-folder: $(go-sdk-folder)/services/powerbiembedded/mgmt/2016-01-29/powerbiembedded
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/powerbiembedded/resource-manager/readme.typescript.md b/specification/powerbiembedded/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..3d2dc5d835f5
--- /dev/null
+++ b/specification/powerbiembedded/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-powerbiembedded"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-powerbiembedded"
+  generate-metadata: true
+```
diff --git a/specification/recoveryservices/resource-manager/readme.go.md b/specification/recoveryservices/resource-manager/readme.go.md
new file mode 100644
index 000000000000..535a6a395f66
--- /dev/null
+++ b/specification/recoveryservices/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: recoveryservices
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-06
+```
+
+### Tag: package-2016-06 and go
+
+These settings apply only when `--tag=package-2016-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2016-06' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-06-01/$(namespace)
+```
diff --git a/specification/recoveryservices/resource-manager/readme.md b/specification/recoveryservices/resource-manager/readme.md
index db306432a8fd..204d82352b5e 100644
--- a/specification/recoveryservices/resource-manager/readme.md
+++ b/specification/recoveryservices/resource-manager/readme.md
@@ -58,6 +58,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -109,31 +110,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: recoveryservices
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-06
-```
-
-### Tag: package-2016-06 and go
-
-These settings apply only when `--tag=package-2016-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2016-06' && $(go)
-output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2016-06-01/recoveryservices
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/recoveryservices/resource-manager/readme.typescript.md b/specification/recoveryservices/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..3cbc0fe7b523
--- /dev/null
+++ b/specification/recoveryservices/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-recoveryservices"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-recoveryservices"
+  generate-metadata: true
+```
diff --git a/specification/recoveryservicesbackup/resource-manager/readme.go.md b/specification/recoveryservicesbackup/resource-manager/readme.go.md
index eeaa6270b20f..87d31c0fe980 100644
--- a/specification/recoveryservicesbackup/resource-manager/readme.go.md
+++ b/specification/recoveryservicesbackup/resource-manager/readme.go.md
@@ -24,7 +24,7 @@ These settings apply only when `--tag=package-2017-07 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag)=='package-2017-07' && $(go)
-output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2017-07-01/backup
+output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2017-07-01/$(namespace)
 ```
 
 ### Tag: package-2016-12 and go
@@ -33,7 +33,7 @@ These settings apply only when `--tag=package-2016-12 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag)=='package-2016-12' && $(go)
-output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2016-12-01/backup
+output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2016-12-01/$(namespace)
 ```
 
 ### Tag: package-2016-06 and go
@@ -42,5 +42,5 @@ These settings apply only when `--tag=package-2016-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag)=='package-2016-06' && $(go)
-output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2016-06-01/backup
+output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2016-06-01/$(namespace)
 ```
diff --git a/specification/recoveryservicesbackup/resource-manager/readme.md b/specification/recoveryservicesbackup/resource-manager/readme.md
index d0c28babaa2f..d410c097801a 100644
--- a/specification/recoveryservicesbackup/resource-manager/readme.md
+++ b/specification/recoveryservicesbackup/resource-manager/readme.md
@@ -108,6 +108,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -157,6 +158,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-recoveryservicesbackup
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/recoveryservicesbackup/resource-manager/readme.typescript.md b/specification/recoveryservicesbackup/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..50e8f0e0bba7
--- /dev/null
+++ b/specification/recoveryservicesbackup/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-recoveryservicesbackup"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-recoveryservicesbackup"
+  generate-metadata: true
+```
diff --git a/specification/recoveryservicessiterecovery/resource-manager/readme.go.md b/specification/recoveryservicessiterecovery/resource-manager/readme.go.md
new file mode 100644
index 000000000000..32270646b026
--- /dev/null
+++ b/specification/recoveryservicessiterecovery/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: siterecovery
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-01
+  - tag: package-2016-08
+```
+
+### Tag: package-2018-01 and go
+
+These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-01' && $(go)
+output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2018-01-10/$(namespace)
+```
+
+### Tag: package-2016-08 and go
+
+These settings apply only when `--tag=package-2016-08 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2016-08' && $(go)
+output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2016-08-10/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/recoveryservicessiterecovery/resource-manager/readme.md b/specification/recoveryservicessiterecovery/resource-manager/readme.md
index c4ba9710f9ef..f2cb49c66304 100644
--- a/specification/recoveryservicessiterecovery/resource-manager/readme.md
+++ b/specification/recoveryservicessiterecovery/resource-manager/readme.md
@@ -61,6 +61,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -85,41 +86,7 @@ csharp:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: siterecovery
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-01
-  - tag: package-2016-08
-```
-
-### Tag: package-2018-01 and go
-
-These settings apply only when `--tag=package-2018-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-01' && $(go)
-output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2018-01-10/siterecovery
-```
-
-### Tag: package-2016-08 and go
-
-These settings apply only when `--tag=package-2016-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2016-08' && $(go)
-output-folder: $(go-sdk-folder)/services/recoveryservices/mgmt/2016-08-10/siterecovery
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/recoveryservicessiterecovery/resource-manager/readme.typescript.md b/specification/recoveryservicessiterecovery/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..74b2ba7c42fc
--- /dev/null
+++ b/specification/recoveryservicessiterecovery/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-recoveryservices-siterecovery"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-recoveryservices-siterecovery"
+  generate-metadata: true
+```
diff --git a/specification/redis/resource-manager/readme.go.md b/specification/redis/resource-manager/readme.go.md
new file mode 100644
index 000000000000..52c5e1bfa423
--- /dev/null
+++ b/specification/redis/resource-manager/readme.go.md
@@ -0,0 +1,68 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: redis
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-03
+  - tag: package-2017-10
+  - tag: package-2017-02
+  - tag: package-2016-04
+  - tag: package-2015-08
+```
+
+### Tag: package-2018-03 and go
+
+These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-03-01/$(namespace)
+```
+
+
+### Tag: package-2017-10 and go
+
+These settings apply only when `--tag=package-2017-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-10' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-10-01/$(namespace)
+```
+
+
+### Tag: package-2017-02 and go
+
+These settings apply only when `--tag=package-2017-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-02' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-02-01/$(namespace)
+```
+
+### Tag: package-2016-04 and go
+
+These settings apply only when `--tag=package-2016-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-04-01/$(namespace)
+```
+
+### Tag: package-2015-08 and go
+
+These settings apply only when `--tag=package-2015-08 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-08' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-08-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/redis/resource-manager/readme.md b/specification/redis/resource-manager/readme.md
index 2dd0fc43e918..f56cd48ec558 100644
--- a/specification/redis/resource-manager/readme.md
+++ b/specification/redis/resource-manager/readme.md
@@ -92,6 +92,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -142,76 +143,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-redis
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: redis
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-03
-  - tag: package-2017-10
-  - tag: package-2017-02
-  - tag: package-2016-04
-  - tag: package-2015-08
-```
-
-### Tag: package-2018-03 and go
-
-These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-03' && $(go)
-output-folder: $(go-sdk-folder)/services/redis/mgmt/2018-03-01/redis
-```
-
-
-### Tag: package-2017-10 and go
-
-These settings apply only when `--tag=package-2017-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-10' && $(go)
-output-folder: $(go-sdk-folder)/services/redis/mgmt/2017-10-01/redis
-```
-
-
-### Tag: package-2017-02 and go
-
-These settings apply only when `--tag=package-2017-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-02' && $(go)
-output-folder: $(go-sdk-folder)/services/redis/mgmt/2017-02-01/redis
-```
-
-### Tag: package-2016-04 and go
-
-These settings apply only when `--tag=package-2016-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-04' && $(go)
-output-folder: $(go-sdk-folder)/services/redis/mgmt/2016-04-01/redis
-```
-
-### Tag: package-2015-08 and go
-
-These settings apply only when `--tag=package-2015-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-08' && $(go)
-output-folder: $(go-sdk-folder)/services/redis/mgmt/2015-08-01/redis
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/redis/resource-manager/readme.typescript.md b/specification/redis/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..7f43003c7a05
--- /dev/null
+++ b/specification/redis/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-rediscache"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-rediscache"
+  payload-flattening-threshold: 1
+  generate-metadata: true
+```
diff --git a/specification/relay/resource-manager/readme.go.md b/specification/relay/resource-manager/readme.go.md
new file mode 100644
index 000000000000..cb49f04963bb
--- /dev/null
+++ b/specification/relay/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: relay
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-04
+  - tag: package-2016-07
+```
+
+### Tag: package-2017-04 and go
+
+These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-04-01/$(namespace)
+```
+
+### Tag: package-2016-07 and go
+
+These settings apply only when `--tag=package-2016-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-07' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-07-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/relay/resource-manager/readme.md b/specification/relay/resource-manager/readme.md
index 389b4c7fad25..83a265cf8d45 100644
--- a/specification/relay/resource-manager/readme.md
+++ b/specification/relay/resource-manager/readme.md
@@ -64,6 +64,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -112,44 +113,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-relay
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: relay
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-04
-  - tag: package-2016-07
-```
-
-### Tag: package-2017-04 and go
-
-These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04' && $(go)
-output-folder: $(go-sdk-folder)/services/relay/mgmt/2017-04-01/relay
-```
-
-### Tag: package-2016-07 and go
-
-These settings apply only when `--tag=package-2016-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-07' && $(go)
-output-folder: $(go-sdk-folder)/services/relay/mgmt/2016-07-01/relay
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/relay/resource-manager/readme.typescript.md b/specification/relay/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..d9876a82ed68
--- /dev/null
+++ b/specification/relay/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-relay"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-relay"
+  generate-metadata: true
+```
diff --git a/specification/reservations/resource-manager/readme.go.md b/specification/reservations/resource-manager/readme.go.md
new file mode 100644
index 000000000000..777397b7e615
--- /dev/null
+++ b/specification/reservations/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: reservations
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-06
+  - tag: package-2017-11
+```
+
+### Tag: package-2018-06 and go
+
+These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-06' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-06-01/$(namespace)
+```
+
+### Tag: package-2017-11 and go
+
+These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-11' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-11-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/reservations/resource-manager/readme.md b/specification/reservations/resource-manager/readme.md
index f49f339df3cf..25304053940d 100644
--- a/specification/reservations/resource-manager/readme.md
+++ b/specification/reservations/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # Reservations
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Reservations RP.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for Reservations RP.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for Reservations, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the Reservations API.
 
 ``` yaml
@@ -60,9 +60,11 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
+  - repo: azure-sdk-for-node
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -104,40 +106,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-reservations
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: reservations
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-06
-  - tag: package-2017-11
-```
-
-### Tag: package-2018-06 and go
-
-These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-06' && $(go)
-output-folder: $(go-sdk-folder)/services/reservations/mgmt/2018-06-01/reservations
-```
-
-### Tag: package-2017-11 and go
-
-These settings apply only when `--tag=package-2017-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-11' && $(go)
-output-folder: $(go-sdk-folder)/services/reservations/mgmt/2017-11-01/reservations
-```
\ No newline at end of file
+See configuration in [readme.go.md](./readme.go.md)
diff --git a/specification/reservations/resource-manager/readme.typescript.md b/specification/reservations/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..91147366a21e
--- /dev/null
+++ b/specification/reservations/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-reservations"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-reservations"
+  generate-metadata: true
+```
diff --git a/specification/resourcehealth/resource-manager/readme.go.md b/specification/resourcehealth/resource-manager/readme.go.md
new file mode 100644
index 000000000000..73b8c080c8c8
--- /dev/null
+++ b/specification/resourcehealth/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: resourcehealth
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-07
+  - tag: package-2015-01
+```
+
+### Tag: package-2017-07 and go
+
+These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-07' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-07-01/$(namespace)
+```
+
+### Tag: package-2015-01 and go
+
+These settings apply only when `--tag=package-2015-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-01-01/$(namespace)
+```
diff --git a/specification/resourcehealth/resource-manager/readme.md b/specification/resourcehealth/resource-manager/readme.md
index 78d0b0498bca..a7d6bb09fce1 100644
--- a/specification/resourcehealth/resource-manager/readme.md
+++ b/specification/resourcehealth/resource-manager/readme.md
@@ -62,94 +62,60 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
+See configuration in [readme.go.md](./readme.go.md)
+
+## Java
 
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: resourcehealth
-  clear-output-folder: true
+These settings apply only when `--java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
+
+``` yaml $(java)
+azure-arm: true
+fluent: true
+namespace: com.microsoft.azure.management.resourcehealth
+license-header: MICROSOFT_MIT_NO_CODEGEN
+payload-flattening-threshold: 1
+output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-resourcehealth
 ```
 
-### Go multi-api
+### Java multi-api
 
-``` yaml $(go) && $(multiapi)
+``` yaml $(java) && $(multiapi)
 batch:
   - tag: package-2017-07
   - tag: package-2015-01
 ```
 
-### Tag: package-2017-07 and go
+### Tag: package-2017-07 and java
 
-These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2017-07 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2017-07' && $(go)
-output-folder: $(go-sdk-folder)/services/resourcehealth/mgmt/2017-07-01/resourcehealth
+``` yaml $(tag) == 'package-2017-07' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.resourcehealth.v2017_07_01
+  output-folder: $(azure-libraries-for-java-folder)/resourcehealth/resource-manager/v2017_07_01
+regenerate-manager: true
+generate-interface: true
 ```
 
-### Tag: package-2015-01 and go
+### Tag: package-2015-01 and java
 
-These settings apply only when `--tag=package-2015-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+These settings apply only when `--tag=package-2015-01 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
 
-``` yaml $(tag) == 'package-2015-01' && $(go)
-output-folder: $(go-sdk-folder)/services/resourcehealth/mgmt/2015-01-01/resourcehealth
+``` yaml $(tag) == 'package-2015-01' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.resourcehealth.v2015_01_01
+  output-folder: $(azure-libraries-for-java-folder)/resourcehealth/resource-manager/v2015_01_01
+regenerate-manager: true
+generate-interface: true
 ```
 
 
-## Java
-
-These settings apply only when `--java` is specified on the command line.
-Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
-
-``` yaml $(java)
-azure-arm: true
-fluent: true
-namespace: com.microsoft.azure.management.resourcehealth
-license-header: MICROSOFT_MIT_NO_CODEGEN
-payload-flattening-threshold: 1
-output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-resourcehealth
-```
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-2017-07
-  - tag: package-2015-01
-```
-
-### Tag: package-2017-07 and java
-
-These settings apply only when `--tag=package-2017-07 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2017-07' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.resourcehealth.v2017_07_01
-  output-folder: $(azure-libraries-for-java-folder)/resourcehealth/resource-manager/v2017_07_01
-regenerate-manager: true
-generate-interface: true
-```
-
-### Tag: package-2015-01 and java
-
-These settings apply only when `--tag=package-2015-01 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2015-01' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.resourcehealth.v2015_01_01
-  output-folder: $(azure-libraries-for-java-folder)/resourcehealth/resource-manager/v2015_01_01
-regenerate-manager: true
-generate-interface: true
-```
-
-
diff --git a/specification/resourcehealth/resource-manager/readme.typescript.md b/specification/resourcehealth/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..a1b352e48aa3
--- /dev/null
+++ b/specification/resourcehealth/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-resourcehealth"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-resourcehealth"
+  generate-metadata: true
+```
diff --git a/specification/resources/resource-manager/readme.go.md b/specification/resources/resource-manager/readme.go.md
new file mode 100644
index 000000000000..6a493f5fb730
--- /dev/null
+++ b/specification/resources/resource-manager/readme.go.md
@@ -0,0 +1,257 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-features-2015-12
+  - tag: package-locks-2016-09
+  - tag: package-locks-2015-01
+  - tag: package-policy-2018-05
+  - tag: package-policy-2018-03
+  - tag: package-policy-2017-06
+  - tag: package-policy-2016-12
+  - tag: package-policy-2016-04
+  - tag: package-policy-2015-10
+  - tag: package-resources-2018-05
+  - tag: package-resources-2018-02
+  - tag: package-resources-2017-05
+  - tag: package-resources-2016-09
+  - tag: package-resources-2016-07
+  - tag: package-resources-2016-02
+  - tag: package-resources-2015-11
+  - tag: package-subscriptions-2016-06
+  - tag: package-subscriptions-2015-11
+  - tag: package-links-2016-09
+  - tag: package-managedapplications-2018-06
+  - tag: package-managedapplications-2017-09
+  - tag: package-managedapplications-2016-09
+```
+
+### Tag: package-features-2015-12 and go
+
+These settings apply only when `--tag=package-features-2015-12 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-features-2015-12' && $(go)
+namespace: features
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-12-01/$(namespace)
+```
+
+### Tag: package-locks-2016-09 and go
+
+These settings apply only when `--tag=package-locks-2016-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-locks-2016-09' && $(go)
+namespace: locks
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-09-01/locks
+```
+
+### Tag: package-locks-2015-01 and go
+
+These settings apply only when `--tag=package-locks-2015-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-locks-2015-01' && $(go)
+namespace: locks
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-01-01/locks
+```
+
+### Tag: package-policy-2018-05 and go
+
+These settings apply only when `--tag=package-policy-2018-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-policy-2018-05' && $(go)
+namespace: policy
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-05-01/policy
+```
+
+### Tag: package-policy-2018-03 and go
+
+These settings apply only when `--tag=package-policy-2018-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-policy-2018-03' && $(go)
+namespace: policy
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-03-01/policy
+```
+
+### Tag: package-policy-2017-06 and go
+
+These settings apply only when `--tag=package-policy-2017-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-policy-2017-06' && $(go)
+namespace: policy
+output-folder: $(go-sdk-folder)/services/preview/resources/mgmt/2017-06-01-preview/policy
+```
+
+### Tag: package-policy-2016-12 and go
+
+These settings apply only when `--tag=package-policy-2016-12 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-policy-2016-12' && $(go)
+namespace: policy
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-12-01/policy
+```
+
+### Tag: package-policy-2016-04 and go
+
+These settings apply only when `--tag=package-policy-2016-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-policy-2016-04' && $(go)
+namespace: policy
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-04-01/policy
+```
+
+### Tag: package-policy-2015-10 and go
+
+These settings apply only when `--tag=package-policy-2015-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-policy-2015-10' && $(go)
+namespace: policy
+output-folder: $(go-sdk-folder)/services/preview/resources/mgmt/2015-10-01-preview/policy
+```
+
+### Tag: package-resources-2018-05 and go
+
+These settings apply only when `--tag=package-resources-2018-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-resources-2018-05' && $(go)
+namespace: resources
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-05-01/resources
+```
+
+### Tag: package-resources-2018-02 and go
+
+These settings apply only when `--tag=package-resources-2018-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-resources-2018-02' && $(go)
+namespace: resources
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-02-01/resources
+```
+
+### Tag: package-resources-2017-05 and go
+
+These settings apply only when `--tag=package-resources-2017-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-resources-2017-05' && $(go)
+namespace: resources
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2017-05-10/resources
+```
+
+### Tag: package-resources-2016-09 and go
+
+These settings apply only when `--tag=package-resources-2016-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-resources-2016-09' && $(go)
+namespace: resources
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-09-01/resources
+```
+
+### Tag: package-resources-2016-07 and go
+
+These settings apply only when `--tag=package-resources-2016-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-resources-2016-07' && $(go)
+namespace: resources
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-07-01/resources
+```
+
+### Tag: package-resources-2016-02 and go
+
+These settings apply only when `--tag=package-resources-2016-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-resources-2016-02' && $(go)
+namespace: resources
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-02-01/resources
+```
+
+### Tag: package-resources-2015-11 and go
+
+These settings apply only when `--tag=package-resources-2015-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-resources-2015-11' && $(go)
+namespace: resources
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-11-01/resources
+```
+
+### Tag: package-subscriptions-2016-06 and go
+
+These settings apply only when `--tag=package-subscriptions-2016-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-subscriptions-2016-06' && $(go)
+namespace: subscriptions
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-06-01/subscriptions
+```
+
+### Tag: package-subscriptions-2015-11 and go
+
+These settings apply only when `--tag=package-subscriptions-2015-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-subscriptions-2015-11' && $(go)
+namespace: subscriptions
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-11-01/subscriptions
+```
+
+### Tag: package-links-2016-09 and go
+
+These settings apply only when `--tag=package-links-2016-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-links-2016-09' && $(go)
+namespace: links
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-09-01/links
+```
+
+### Tag: package-managedapplications-2018-06 and go
+
+These settings apply only when `--tag=package-managedapplications-2018-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-managedapplications-2018-06' && $(go)
+namespace: managedapplications
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-06-01/managedapplications
+```
+
+### Tag: package-managedapplications-2017-09 and go
+
+These settings apply only when `--tag=package-managedapplications-2017-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-managedapplications-2017-09' && $(go)
+namespace: managedapplications
+output-folder: $(go-sdk-folder)/services/resources/mgmt/2017-09-01/managedapplications
+```
+
+### Tag: package-managedapplications-2016-09 and go
+
+These settings apply only when `--tag=package-managedapplications-2016-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-managedapplications-2016-09' && $(go)
+namespace: managedapplications
+output-folder: $(go-sdk-folder)/services/preview/resources/mgmt/2016-09-01-preview/managedapplications
+```
\ No newline at end of file
diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md
index 44c9511af1b0..c3d94950a567 100644
--- a/specification/resources/resource-manager/readme.md
+++ b/specification/resources/resource-manager/readme.md
@@ -347,264 +347,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-node
-```
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-features-2015-12
-  - tag: package-locks-2016-09
-  - tag: package-locks-2015-01
-  - tag: package-policy-2018-05
-  - tag: package-policy-2018-03
-  - tag: package-policy-2017-06
-  - tag: package-policy-2016-12
-  - tag: package-policy-2016-04
-  - tag: package-policy-2015-10
-  - tag: package-resources-2018-05
-  - tag: package-resources-2018-02
-  - tag: package-resources-2017-05
-  - tag: package-resources-2016-09
-  - tag: package-resources-2016-07
-  - tag: package-resources-2016-02
-  - tag: package-resources-2015-11
-  - tag: package-subscriptions-2016-06
-  - tag: package-subscriptions-2015-11
-  - tag: package-links-2016-09
-  - tag: package-managedapplications-2018-06
-  - tag: package-managedapplications-2017-09
-  - tag: package-managedapplications-2016-09
-```
-
-### Tag: package-features-2015-12 and go
-
-These settings apply only when `--tag=package-features-2015-12 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-features-2015-12' && $(go)
-namespace: features
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-12-01/features
-```
-
-### Tag: package-locks-2016-09 and go
-
-These settings apply only when `--tag=package-locks-2016-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-locks-2016-09' && $(go)
-namespace: locks
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-09-01/locks
-```
-
-### Tag: package-locks-2015-01 and go
-
-These settings apply only when `--tag=package-locks-2015-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-locks-2015-01' && $(go)
-namespace: locks
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-01-01/locks
-```
-
-### Tag: package-policy-2018-05 and go
-
-These settings apply only when `--tag=package-policy-2018-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-policy-2018-05' && $(go)
-namespace: policy
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-05-01/policy
-```
-
-### Tag: package-policy-2018-03 and go
-
-These settings apply only when `--tag=package-policy-2018-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-policy-2018-03' && $(go)
-namespace: policy
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-03-01/policy
-```
-
-### Tag: package-policy-2017-06 and go
-
-These settings apply only when `--tag=package-policy-2017-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-policy-2017-06' && $(go)
-namespace: policy
-output-folder: $(go-sdk-folder)/services/preview/resources/mgmt/2017-06-01-preview/policy
-```
-
-### Tag: package-policy-2016-12 and go
-
-These settings apply only when `--tag=package-policy-2016-12 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-policy-2016-12' && $(go)
-namespace: policy
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-12-01/policy
-```
-
-### Tag: package-policy-2016-04 and go
-
-These settings apply only when `--tag=package-policy-2016-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-policy-2016-04' && $(go)
-namespace: policy
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-04-01/policy
-```
-
-### Tag: package-policy-2015-10 and go
-
-These settings apply only when `--tag=package-policy-2015-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-policy-2015-10' && $(go)
-namespace: policy
-output-folder: $(go-sdk-folder)/services/preview/resources/mgmt/2015-10-01-preview/policy
-```
-
-### Tag: package-resources-2018-05 and go
-
-These settings apply only when `--tag=package-resources-2018-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-resources-2018-05' && $(go)
-namespace: resources
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-05-01/resources
-```
-
-### Tag: package-resources-2018-02 and go
-
-These settings apply only when `--tag=package-resources-2018-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-resources-2018-02' && $(go)
-namespace: resources
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-02-01/resources
-```
-
-### Tag: package-resources-2017-05 and go
-
-These settings apply only when `--tag=package-resources-2017-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-resources-2017-05' && $(go)
-namespace: resources
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2017-05-10/resources
-```
-
-### Tag: package-resources-2016-09 and go
-
-These settings apply only when `--tag=package-resources-2016-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-resources-2016-09' && $(go)
-namespace: resources
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-09-01/resources
-```
-
-### Tag: package-resources-2016-07 and go
-
-These settings apply only when `--tag=package-resources-2016-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-resources-2016-07' && $(go)
-namespace: resources
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-07-01/resources
-```
-
-### Tag: package-resources-2016-02 and go
-
-These settings apply only when `--tag=package-resources-2016-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-resources-2016-02' && $(go)
-namespace: resources
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-02-01/resources
-```
-
-### Tag: package-resources-2015-11 and go
-
-These settings apply only when `--tag=package-resources-2015-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-resources-2015-11' && $(go)
-namespace: resources
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-11-01/resources
-```
-
-### Tag: package-subscriptions-2016-06 and go
-
-These settings apply only when `--tag=package-subscriptions-2016-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-subscriptions-2016-06' && $(go)
-namespace: subscriptions
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-06-01/subscriptions
-```
-
-### Tag: package-subscriptions-2015-11 and go
-
-These settings apply only when `--tag=package-subscriptions-2015-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-subscriptions-2015-11' && $(go)
-namespace: subscriptions
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-11-01/subscriptions
-```
-
-### Tag: package-links-2016-09 and go
-
-These settings apply only when `--tag=package-links-2016-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-links-2016-09' && $(go)
-namespace: links
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2016-09-01/links
-```
-
-### Tag: package-managedapplications-2018-06 and go
-
-These settings apply only when `--tag=package-managedapplications-2018-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-managedapplications-2018-06' && $(go)
-namespace: managedapplications
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2018-06-01/managedapplications
-```
-
-### Tag: package-managedapplications-2017-09 and go
-
-These settings apply only when `--tag=package-managedapplications-2017-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-managedapplications-2017-09' && $(go)
-namespace: managedapplications
-output-folder: $(go-sdk-folder)/services/resources/mgmt/2017-09-01/managedapplications
-```
-
-### Tag: package-managedapplications-2016-09 and go
-
-These settings apply only when `--tag=package-managedapplications-2016-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-managedapplications-2016-09' && $(go)
-namespace: managedapplications
-output-folder: $(go-sdk-folder)/services/preview/resources/mgmt/2016-09-01-preview/managedapplications
+  - repo: azure-sdk-for-js
 ```
 
 ## Python
@@ -847,6 +590,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-resource/azure/mgmt/resource/subscriptions/v2016_06_01
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/resources/resource-manager/readme.typescript.md b/specification/resources/resource-manager/readme.typescript.md
index 261ca93adc1f..6523fd3082db 100644
--- a/specification/resources/resource-manager/readme.typescript.md
+++ b/specification/resources/resource-manager/readme.typescript.md
@@ -20,35 +20,35 @@ batch:
 ```yaml $(typescript) && $(package-features)
 typescript:
   package-name: "@azure/arm-features"
-  output-folder: $(typescript-sdks-folder)/packages/arm-features
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-features"
 ```
 
 ```yaml $(typescript) && $(package-locks)
 typescript:
   package-name: "@azure/arm-locks"
-  output-folder: $(typescript-sdks-folder)/packages/arm-locks
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-locks"
 ```
 
 ```yaml $(typescript) && $(package-policy)
 typescript:
   package-name: "@azure/arm-policy"
-  output-folder: $(typescript-sdks-folder)/packages/arm-policy
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-policy"
 ```
 
 ```yaml $(typescript) && $(package-resources)
 typescript:
   package-name: "@azure/arm-resources"
-  output-folder: $(typescript-sdks-folder)/packages/arm-resources
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-resources"
 ```
 
 ```yaml $(typescript) && $(package-links)
 typescript:
   package-name: "@azure/arm-links"
-  output-folder: $(typescript-sdks-folder)/packages/arm-links
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-links"
 ```
 
 ```yaml $(typescript) && $(package-managedapplications)
 typescript:
   package-name: "@azure/arm-managedapplications"
-  output-folder: $(typescript-sdks-folder)/packages/arm-managedapplications
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-managedapplications"
 ```
diff --git a/specification/scheduler/resource-manager/readme.go.md b/specification/scheduler/resource-manager/readme.go.md
new file mode 100644
index 000000000000..22734f446845
--- /dev/null
+++ b/specification/scheduler/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: scheduler
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-03
+  - tag: package-2016-01
+  - tag: package-2014-08-preview
+```
+
+### Tag: package-2016-03 and go
+
+These settings apply only when `--tag=package-2016-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-03-01/$(namespace)
+```
+
+### Tag: package-2016-01 and go
+
+These settings apply only when `--tag=package-2016-01 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-01' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-01-01/$(namespace)
+```
+
+### Tag: package-2014-08-preview and go
+
+These settings apply only when `--tag=package-2014-08-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2014-08-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2014-08-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/scheduler/resource-manager/readme.md b/specification/scheduler/resource-manager/readme.md
index 4d51ad0688ff..8f43142dfd3a 100644
--- a/specification/scheduler/resource-manager/readme.md
+++ b/specification/scheduler/resource-manager/readme.md
@@ -72,6 +72,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -120,55 +121,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-scheduler
 ```
 
-
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: scheduler
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-03
-  - tag: package-2016-01
-  - tag: package-2014-08-preview
-```
-
-### Tag: package-2016-03 and go
-
-These settings apply only when `--tag=package-2016-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-03' && $(go)
-output-folder: $(go-sdk-folder)/services/scheduler/mgmt/2016-03-01/scheduler
-```
-
-### Tag: package-2016-01 and go
-
-These settings apply only when `--tag=package-2016-01 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-01' && $(go)
-output-folder: $(go-sdk-folder)/services/scheduler/mgmt/2016-01-01/scheduler
-```
-
-### Tag: package-2014-08-preview and go
-
-These settings apply only when `--tag=package-2014-08-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2014-08-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/scheduler/mgmt/2014-08-01-preview/scheduler
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/scheduler/resource-manager/readme.typescript.md b/specification/scheduler/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..20d86de0fa1e
--- /dev/null
+++ b/specification/scheduler/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-scheduler"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-scheduler"
+  generate-metadata: true
+```
diff --git a/specification/search/resource-manager/readme.go.md b/specification/search/resource-manager/readme.go.md
new file mode 100644
index 000000000000..0c4e0350036e
--- /dev/null
+++ b/specification/search/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: search
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-08
+  - tag: package-2015-02
+```
+
+### Tag: package-2015-08 and go
+
+These settings apply only when `--tag=package-2015-08 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-08' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-08-19/$(namespace)
+```
+
+### Tag: package-2015-02 and go
+
+These settings apply only when `--tag=package-2015-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-02' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-02-28/$(namespace)
+```
diff --git a/specification/search/resource-manager/readme.md b/specification/search/resource-manager/readme.md
index 7400907dbc7b..22eb453fea8d 100644
--- a/specification/search/resource-manager/readme.md
+++ b/specification/search/resource-manager/readme.md
@@ -63,6 +63,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -111,44 +112,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-search
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: search
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-08
-  - tag: package-2015-02
-```
-
-### Tag: package-2015-08 and go
-
-These settings apply only when `--tag=package-2015-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-08' && $(go)
-output-folder: $(go-sdk-folder)/services/search/mgmt/2015-08-19/search
-```
-
-### Tag: package-2015-02 and go
-
-These settings apply only when `--tag=package-2015-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-02' && $(go)
-output-folder: $(go-sdk-folder)/services/search/mgmt/2015-02-28/search
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/search/resource-manager/readme.typescript.md b/specification/search/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..2d6f8e001fcb
--- /dev/null
+++ b/specification/search/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-search"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-search"
+  generate-metadata: true
+```
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopologySubscriptionLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopologySubscriptionLocation_example.json
new file mode 100644
index 000000000000..4263ef6bcd08
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopologySubscriptionLocation_example.json
@@ -0,0 +1,64 @@
+{
+    "parameters": {
+        "api-version": "2015-06-01-preview",
+        "subscriptionId": "3eeab341-f466-499c-a8be-85427e154bad",
+        "ascLocation": "centralus"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "value": [
+                    {
+                        "properties": {
+                            "calculatedDateTime": "2018-07-10T13:56:10.5755270Z",
+                            "topologyResources": [
+                                {
+                                    "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet",
+						            "severity": "Healthy",
+						            "networkZones": "Internal",
+						            "recommendationsExist": false,
+						            "topologyScore": 0,
+						            "location": "westus",
+						            "children": [
+							            {
+								            "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet"
+							            }
+						            ]
+                                }
+                            ]
+                        },
+                        "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Security/locations/centralus/topologies/vnets",
+                        "name": "vnets",
+                        "type": "Microsoft.Security/locations/topologies",
+                        "location": "westus"
+                    },
+                    {
+                        "properties": {
+                            "calculatedDateTime": "2018-07-10T13:56:10.5755270Z",
+                            "topologyResources": [
+                                {
+                                    "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet",
+						            "severity": "Healthy",
+						            "networkZones": "Internal",
+						            "recommendationsExist": false,
+						            "topologyScore": 5,
+						            "location": "westus",
+                                    "parents": [
+							            {
+								            "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet"
+							            }
+						            ]
+                                }
+                            ]
+                        },
+                        "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Security/locations/centralus/topologies/subnets",
+                        "name": "subnets",
+                        "type": "Microsoft.Security/locations/topologies",
+                        "location": "westus"
+                    }
+                ]
+            }
+            
+        }
+    }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopologySubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopologySubscription_example.json
new file mode 100644
index 000000000000..18b3e965b2a2
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopologySubscription_example.json
@@ -0,0 +1,63 @@
+{
+    "parameters": {
+        "api-version": "2015-06-01-preview",
+        "subscriptionId": "3eeab341-f466-499c-a8be-85427e154bad"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "value": [
+                    {
+                        "properties": {
+                            "calculatedDateTime": "2018-07-10T13:56:10.5755270Z",
+                            "topologyResources": [
+                                {
+                                    "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet",
+						            "severity": "Healthy",
+						            "networkZones": "Internal",
+						            "recommendationsExist": false,
+						            "topologyScore": 0,
+						            "location": "westus",
+						            "children": [
+							            {
+								            "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet"
+							            }
+						            ]
+                                }
+                            ]
+                        },
+                        "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Security/locations/centralus/topologies/vnets",
+                        "name": "vnets",
+                        "type": "Microsoft.Security/locations/topologies",
+                        "location": "westus"
+                    },
+                    {
+                        "properties": {
+                            "calculatedDateTime": "2018-07-10T13:56:10.5755270Z",
+                            "topologyResources": [
+                                {
+                                    "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet",
+						            "severity": "Healthy",
+						            "networkZones": "Internal",
+						            "recommendationsExist": false,
+						            "topologyScore": 5,
+						            "location": "westus",
+                                    "parents": [
+							            {
+								            "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet"
+							            }
+						            ]
+                                }
+                            ]
+                        },
+                        "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Security/locations/centralus/topologies/subnets",
+                        "name": "subnets",
+                        "type": "Microsoft.Security/locations/topologies",
+                        "location": "westus"
+                    }
+                ]
+            }
+            
+        }
+    }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopology_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopology_example.json
new file mode 100644
index 000000000000..175255795e5c
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Topology/GetTopology_example.json
@@ -0,0 +1,36 @@
+{
+    "parameters": {
+        "api-version": "2015-06-01-preview",
+        "subscriptionId": "3eeab341-f466-499c-a8be-85427e154bad",
+        "resourceGroupName": "myservers",
+        "ascLocation": "centralus",
+        "topologyResourceName": "vnets"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "properties": {
+                    "calculatedDateTime": "2018-07-10T13:56:10.5755270Z",
+                    "topologyResources": [
+                        {
+                            "resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet",
+						    "severity": "Healthy",
+						    "networkZones": "InternetFacing",
+                            "recommendationsExist": false,
+						    "topologyScore": 0,
+						    "location": "westus",
+						    "children": [{
+								"resourceId": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet"
+							    }
+						    ]
+                        }
+                    ]
+                },
+                "id": "/subscriptions/3eeab341-f466-499c-a8be-85427e154bad/resourceGroups/myservers/providers/Microsoft.Security/locations/centralus/topologies/vnets",
+                "name": "vnets",
+                "type": "Microsoft.Security/locations/topologies",
+                "location": "westus"
+            }
+        }
+    }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json
index 393f66b40116..a419b10aa99d 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json
@@ -1437,6 +1437,123 @@
                     }
                 }
             }
+        },
+        "/subscriptions/{subscriptionId}/providers/Microsoft.Security/topologies": {
+            "get": {
+                "x-ms-examples": {
+                    "Get topology on a subscription": {
+                        "$ref": "./examples/Topology/GetTopologySubscription_example.json"
+                    }
+                },
+                "tags": ["Topology"],
+                "description": "Gets a list that allows to build a topology view of a subscription.",
+                "operationId": "Topology_List",
+                "parameters": [{
+                        "$ref": "#/parameters/SubscriptionId"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersion"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/TopologyList"
+                        }
+                    },
+                    "default": {
+                        "description": "Error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/CloudError"
+                        }
+                    }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
+                }
+            }
+        },
+        "/subscriptions/{subscriptionId}/providers/Microsoft.Security/locations/{ascLocation}/topologies": {
+            "get": {
+                "x-ms-examples": {
+                    "Get topology on a subscription from security data location": {
+                        "$ref": "./examples/Topology/GetTopologySubscriptionLocation_example.json"
+                    }
+                },
+                "tags": ["Topology"],
+                "description": "Gets a list that allows to build a topology view of a subscription and location.",
+                "operationId": "Topology_ListByHomeRegion",
+                "parameters": [{
+                        "$ref": "#/parameters/SubscriptionId"
+                    },
+                    {
+                        "$ref": "#/parameters/AscLocation"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersion"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/TopologyList"
+                        }
+                    },
+                    "default": {
+                        "description": "Error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/CloudError"
+                        }
+                    }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
+                }
+            }
+        },
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/locations/{ascLocation}/topologies/{topologyResourceName}": {
+            "get": {
+                "x-ms-examples": {
+                    "Get topology": {
+                        "$ref": "./examples/Topology/GetTopology_example.json"
+                    }
+                },
+                "tags": ["Topology"],
+                "description": "Gets a specific topology component.",
+                "operationId": "Topology_Get",
+                "parameters": [{
+                        "$ref": "#/parameters/SubscriptionId"
+                    },
+                    {
+                        "$ref": "#/parameters/ResourceGroupName"
+                    },
+                    {
+                        "$ref": "#/parameters/AscLocation"
+                    },
+                    {
+                        "$ref": "#/parameters/TopologyResourceName"
+                    },
+                    {
+                        "$ref": "#/parameters/ApiVersion"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/TopologyResource"
+                        }
+                    },
+                    "default": {
+                        "description": "Error response describing why the operation failed.",
+                        "schema": {
+                            "$ref": "#/definitions/CloudError"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
@@ -1642,9 +1759,7 @@
         "SecurityTaskParameters": {
             "type": "object",
             "description": "Changing set of properties, depending on the task type that is derived from the name field",
-            "additionalProperties": {
-                "type": "object"
-            },
+            "additionalProperties": true,
             "properties": {
                 "name": {
                     "readOnly": true,
@@ -1858,9 +1973,7 @@
         },
         "AlertEntity": {
             "type": "object",
-            "additionalProperties": {
-                "type": "object"
-            },
+            "additionalProperties": true,
             "description": "Changing set of properties depending on the entity type.",
             "properties": {
                 "type": {
@@ -1872,9 +1985,7 @@
         },
         "AlertExtendedProperties": {
             "type": "object",
-            "additionalProperties": {
-                "type": "object"
-            },
+            "additionalProperties": true,
             "description": "Changing set of properties depending on the alert type."
         },
         "DiscoveredSecuritySolutionList": {
@@ -1964,6 +2075,130 @@
                 "sku"
             ]
         },
+        "TopologyList": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "array",
+                    "readOnly": true,
+                    "items": {
+                        "$ref": "#/definitions/TopologyResource"
+                    }
+                },
+                "nextLink": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The URI to fetch the next page."
+                }
+            }
+        },
+        "TopologyResource": {
+            "type": "object",
+            "properties": {
+                "properties": {
+                    "x-ms-client-flatten": true,
+                    "readOnly": true,
+                    "$ref": "#/definitions/TopologyResourceProperties"
+                }
+            },
+            "allOf": [{
+                    "$ref": "#/definitions/Resource"
+                },
+                {
+                    "$ref": "#/definitions/Location"
+                }
+            ]
+        },
+        "TopologyResourceProperties": {
+            "type": "object",
+            "properties": {
+                "calculatedDateTime": {
+                    "type": "string",
+                    "format": "date-time",
+                    "readOnly": true,
+                    "description": "The UTC time on which the topology was calculated"
+                },
+                "topologyResources": {
+                    "type": "array",
+                    "readOnly": true,
+                    "description": "Azure resources which are part of this topology resource",
+                    "items": {
+                        "$ref": "#/definitions/TopologySingleResource"
+                    }
+                }
+            }
+        },
+        "TopologySingleResource": {
+            "type": "object",
+            "properties": {
+                "resourceId": {
+                    "type": "string",
+                    "readOnly": true,
+                    "description": "Azure resource id"
+                },
+                "severity": {
+                    "type": "string",
+                    "readOnly": true,
+                    "description": "The security severity of the resource"
+                },
+                "recommendationsExist": {
+                    "type": "boolean",
+                    "readOnly": true,
+                    "description": "Indicates if the resource has security recommendations"
+                },
+                "networkZones": {
+                    "type": "string",
+                    "readOnly": true,
+                    "description": "Indicates the resource connectivity level to the Internet (InternetFacing, Internal ,etc.)"
+                },
+                "topologyScore": {
+                    "type": "integer",
+                    "readOnly": true,
+                    "description": "Score of the resource based on its security severity"
+                },
+                "location": {
+                    "type": "string",
+                    "readOnly": true,
+                    "description": "The location of this resource"
+                },
+                "parents": {
+                    "type": "array",
+                    "readOnly": true,
+                    "description": "Azure resources connected to this resource which are in higher level in the topology view",
+                    "items": {
+                        "$ref": "#/definitions/TopologySingleResourceParent"
+                    }
+                },
+                "children": {
+                    "type": "array",
+                    "readOnly": true,
+                    "description": "Azure resources connected to this resource which are in lower level in the topology view",
+                    "items": {
+                        "$ref": "#/definitions/TopologySingleResourceChild"
+                    }
+                }
+            }
+        },
+        "TopologySingleResourceParent": {
+            "type": "object",
+            "properties": {
+                "resourceId": {
+                    "type": "string",
+                    "readOnly": true,
+                    "description": "Azure resource id which serves as parent resource in topology view"
+                }
+            }
+        },
+        "TopologySingleResourceChild": {
+            "type": "object",
+            "properties": {
+                "resourceId": {
+                    "type": "string",
+                    "readOnly": true,
+                    "description": "Azure resource id which serves as child resource in topology view"
+                }
+            }
+        },
         "JitNetworkAccessPoliciesList": {
             "type": "object",
             "properties": {
@@ -2674,6 +2909,14 @@
             "required": true,
             "type": "string",
             "x-ms-parameter-location": "method"
+        },
+        "TopologyResourceName": {
+            "name": "topologyResourceName",
+            "in": "path",
+            "description": "Name of a topology resources collection.",
+            "required": true,
+            "type": "string",
+            "x-ms-parameter-location": "method"
         }
     }
 }
diff --git a/specification/service-map/resource-manager/readme.go.md b/specification/service-map/resource-manager/readme.go.md
new file mode 100644
index 000000000000..326356917bf6
--- /dev/null
+++ b/specification/service-map/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: servicemap
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2015-11-preview
+```
+
+### Tag: package-2015-11-preview and go
+
+These settings apply only when `--tag=package-2015-11-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-11-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/operationalinsights/mgmt/2015-11-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/service-map/resource-manager/readme.md b/specification/service-map/resource-manager/readme.md
index 8f967023e64a..bdbc83a80011 100644
--- a/specification/service-map/resource-manager/readme.md
+++ b/specification/service-map/resource-manager/readme.md
@@ -27,7 +27,7 @@ Suppressed Rule | Reason
 R3023 OperationsAPIImplementation | Service map is sharing RP with Log Analytics, so this operaration won't reach ServiceMap's service endpoint. Hence this rule is not applicable.
 
 ```yaml
-model-validator: true 
+model-validator: true
 semantic-validator: true
 azure-validator: true
 directive:
@@ -66,36 +66,13 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: servicemap
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2015-11-preview
-```
-
-### Tag: package-2015-11-preview and go
-
-These settings apply only when `--tag=package-2015-11-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-11-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/operationalinsights/mgmt/2015-11-01-preview/servicemap
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
@@ -110,25 +87,25 @@ license-header: MICROSOFT_MIT_NO_CODEGEN
 payload-flattening-threshold: 1
 output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-operationalinsights/servicemap
 ```
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-2015-11-preview
-```
-
-### Tag: package-2015-11-preview and java
-
-These settings apply only when `--tag=package-2015-11-preview --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2015-11-preview' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.servicemap.v2015_11_01_preview
-  output-folder: $(azure-libraries-for-java-folder)/servicemap/resource-manager/v2015_11_01_preview
-regenerate-manager: true
-generate-interface: true
-```
-
-
+
+### Java multi-api
+
+``` yaml $(java) && $(multiapi)
+batch:
+  - tag: package-2015-11-preview
+```
+
+### Tag: package-2015-11-preview and java
+
+These settings apply only when `--tag=package-2015-11-preview --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
+
+``` yaml $(tag) == 'package-2015-11-preview' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.servicemap.v2015_11_01_preview
+  output-folder: $(azure-libraries-for-java-folder)/servicemap/resource-manager/v2015_11_01_preview
+regenerate-manager: true
+generate-interface: true
+```
+
+
diff --git a/specification/service-map/resource-manager/readme.typescript.md b/specification/service-map/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..b819207b569c
--- /dev/null
+++ b/specification/service-map/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-servicemap"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-servicemap"
+  override-client-name: ServicemapManagementClient
+  generate-metadata: true
+```
diff --git a/specification/servicebus/resource-manager/readme.go.md b/specification/servicebus/resource-manager/readme.go.md
new file mode 100644
index 000000000000..0459017ef37b
--- /dev/null
+++ b/specification/servicebus/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: servicebus
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-04
+  - tag: package-2015-08
+```
+
+### Tag: package-2017-04 and go
+
+These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-04-01/$(namespace)
+```
+
+### Tag: package-2015-08 and go
+
+These settings apply only when `--tag=package-2015-08 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-08' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-08-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/servicebus/resource-manager/readme.md b/specification/servicebus/resource-manager/readme.md
index 177b7a11dac5..0f15a7226ca9 100644
--- a/specification/servicebus/resource-manager/readme.md
+++ b/specification/servicebus/resource-manager/readme.md
@@ -76,6 +76,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -125,45 +126,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-servicebus
 ```
 
-
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: servicebus
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-04
-  - tag: package-2015-08
-```
-
-### Tag: package-2017-04 and go
-
-These settings apply only when `--tag=package-2017-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-04' && $(go)
-output-folder: $(go-sdk-folder)/services/servicebus/mgmt/2017-04-01/servicebus
-```
-
-### Tag: package-2015-08 and go
-
-These settings apply only when `--tag=package-2015-08 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-08' && $(go)
-output-folder: $(go-sdk-folder)/services/servicebus/mgmt/2015-08-01/servicebus
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/servicebus/resource-manager/readme.typescript.md b/specification/servicebus/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..4b9c7b395f7c
--- /dev/null
+++ b/specification/servicebus/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-servicebus"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-servicebus"
+  generate-metadata: true
+```
diff --git a/specification/servicefabric/data-plane/readme.go.md b/specification/servicefabric/data-plane/readme.go.md
new file mode 100644
index 000000000000..a3a64274cce0
--- /dev/null
+++ b/specification/servicefabric/data-plane/readme.go.md
@@ -0,0 +1,35 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: servicefabric
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: "6.2"
+  - tag: "6.3"
+```
+
+### Tag: 6.2 and go
+
+These settings apply only when `--tag=6.2 --go` is specified on the command line.
+
+``` yaml $(tag) == '6.2' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/6.2/$(namespace)
+```
+
+
+### Tag: 6.3 and go
+
+These settings apply only when `--tag=6.3 --go` is specified on the command line.
+
+``` yaml $(tag) == '6.2' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/6.3/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/servicefabric/data-plane/readme.md b/specification/servicefabric/data-plane/readme.md
index 27baeb09ef37..97964c4fd6ba 100644
--- a/specification/servicefabric/data-plane/readme.md
+++ b/specification/servicefabric/data-plane/readme.md
@@ -37,11 +37,11 @@ directive:
   - suppress: ListInOperationName
     reason: The operation names follow the Service Fabric Client API operation names from the existing .NET SDK.
   - suppress: GetInOperationName
-    reason: The operation names follow the Service Fabric Client API operation names from the existing .NET SDK.    
+    reason: The operation names follow the Service Fabric Client API operation names from the existing .NET SDK.
   - suppress: PutInOperationName
     reason: The operation names follow the Service Fabric Client API operation names from the existing .NET SDK.
   - suppress: HttpsSupportedScheme
-    reason: Service Fabric clusters are owned by the users and they can be configured to have a secure or un-secure client connection endpoint.    
+    reason: Service Fabric clusters are owned by the users and they can be configured to have a secure or un-secure client connection endpoint.
   - suppress: LongRunningOperationsWithLongRunningExtension
     reason: Service Fabric platform has already established pattern for paged responses based on ContinuationToken parameter.
   - suppress: SecurityDefinitionsStructure
@@ -53,7 +53,7 @@ directive:
   - suppress: APIVersionPattern
     reason: The URL scheme for Service Fabric does not follow Azure Service rules. Service Fabric supports various functions on different entities that are modeled using POST.
   - suppress: DefinitionsPropertiesNamesCamelCase
-    reason: The property names for Service Fabric follow the naming scheme of existing property names in our client SDK and concepts. 
+    reason: The property names for Service Fabric follow the naming scheme of existing property names in our client SDK and concepts.
   - suppress: GuidUsage
     reason: The IDs of the service partition in Service Fabric are GUIDs.
   - suppress: EnumInsteadOfBoolean
@@ -98,6 +98,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
@@ -129,42 +130,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-servicefabric
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: servicefabric
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: "6.2"
-  - tag: "6.3"
-```
-
-### Tag: 6.2 and go
-
-These settings apply only when `--tag=6.2 --go` is specified on the command line.
-
-``` yaml $(tag) == '6.2' && $(go)
-output-folder: $(go-sdk-folder)/services/servicefabric/6.2/servicefabric
-```
-
-
-### Tag: 6.3 and go
-
-These settings apply only when `--tag=6.3 --go` is specified on the command line.
-
-``` yaml $(tag) == '6.2' && $(go)
-output-folder: $(go-sdk-folder)/services/servicefabric/6.3/servicefabric
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/servicefabric/data-plane/readme.typescript.md b/specification/servicefabric/data-plane/readme.typescript.md
new file mode 100644
index 000000000000..1ab368a22b7e
--- /dev/null
+++ b/specification/servicefabric/data-plane/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: false
+  package-name: "@azure/servicefabric"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/servicefabric"
+  override-client-name: ServiceFabricClient
+  generate-metadata: true
+```
diff --git a/specification/servicefabric/resource-manager/readme.go.md b/specification/servicefabric/resource-manager/readme.go.md
new file mode 100644
index 000000000000..b2ee0649bbb3
--- /dev/null
+++ b/specification/servicefabric/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: servicefabric
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-02
+  - tag: package-2017-07
+  - tag: package-2016-09
+```
+
+### Tag: package-2018-02 and go
+
+These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-02' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-02-01/$(namespace)
+```
+
+### Tag: package-2017-07 and go
+
+These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-07' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-07-01-preview/$(namespace)
+```
+
+### Tag: package-2016-09 and go
+
+These settings apply only when `--tag=package-2016-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-09' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-09-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/servicefabric/resource-manager/readme.md b/specification/servicefabric/resource-manager/readme.md
index 4a3c6047d962..1b8ab11cf894 100644
--- a/specification/servicefabric/resource-manager/readme.md
+++ b/specification/servicefabric/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # ServiceFabric
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Service Fabric.
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the ServiceFabricManagementClient API.
 
 ``` yaml
@@ -152,55 +152,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-servicefabric
 ```
 
-
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: servicefabric
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-02
-  - tag: package-2017-07
-  - tag: package-2016-09
-```
-
-### Tag: package-2018-02 and go
-
-These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-02' && $(go)
-output-folder: $(go-sdk-folder)/services/servicefabric/mgmt/2018-02-01/servicefabric
-```
-
-### Tag: package-2017-07 and go
-
-These settings apply only when `--tag=package-2017-07 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-07' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/servicefabric/mgmt/2017-07-01-preview/servicefabric
-```
-
-### Tag: package-2016-09 and go
-
-These settings apply only when `--tag=package-2016-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-09' && $(go)
-output-folder: $(go-sdk-folder)/services/servicefabric/mgmt/2016-09-01/servicefabric
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/servicefabricmesh/resource-manager/readme.go.md b/specification/servicefabricmesh/resource-manager/readme.go.md
new file mode 100644
index 000000000000..1831a2d0dcda
--- /dev/null
+++ b/specification/servicefabricmesh/resource-manager/readme.go.md
@@ -0,0 +1,25 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: servicefabricmesh
+  clear-output-folder: true
+```
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-07-01-preview
+```
+
+### Tag: package-2018-07-01-preview and go
+
+These settings apply only when `--tag=package-2018-07-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-07-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-07-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/servicefabricmesh/resource-manager/readme.md b/specification/servicefabricmesh/resource-manager/readme.md
index a789db75ef22..65686bdaae12 100644
--- a/specification/servicefabricmesh/resource-manager/readme.md
+++ b/specification/servicefabricmesh/resource-manager/readme.md
@@ -6,7 +6,7 @@ This is the AutoRest configuration file for Azure Service Fabric Mesh.
 
 Azure Service Fabric Mesh is fully managed service where developers can build and deploy mission critical applications without managing any infrastructure such as VMs, storage, or networking. Mesh is a serverless environment for applications built from microservices.
 
-[Azure Service Fabric](http://aka.ms/ServiceFabric) is a distributed systems platform that makes it easy to package, deploy, and manage scalable and reliable microservices. 
+[Azure Service Fabric](http://aka.ms/ServiceFabric) is a distributed systems platform that makes it easy to package, deploy, and manage scalable and reliable microservices.
 
 
 ---
@@ -61,6 +61,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -69,7 +70,7 @@ swagger-to-sdk:
 
 
 ## C#
-These settings apply only when `--csharp` is specified on the command line. 
+These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
@@ -107,31 +108,11 @@ python:
   basic-setup-py: true
   output-folder: $(python-sdks-folder)/azure-mgmt-servicefabricmesh
 ```
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: servicefabricmesh
-  clear-output-folder: true
-```
-### Go multi-api
 
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-07-01-preview
-```
-
-### Tag: package-2018-07-01-preview and go
+## Go
 
-These settings apply only when `--tag=package-2018-07-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+See configuration in [readme.go.md](./readme.go.md)
 
-``` yaml $(tag) == 'package-2018-07-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/servicefabricmesh/mgmt/2018-07-01-preview/servicefabricmesh
-```
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/servicefabricmesh/resource-manager/readme.typescript.md b/specification/servicefabricmesh/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..5ce9629016cd
--- /dev/null
+++ b/specification/servicefabricmesh/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-servicefabricmesh"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-servicefabricmesh"
+  generate-metadata: true
+```
diff --git a/specification/signalr/resource-manager/readme.go.md b/specification/signalr/resource-manager/readme.go.md
new file mode 100644
index 000000000000..2f9832efce0c
--- /dev/null
+++ b/specification/signalr/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: signalr
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-03-01-preview
+```
+
+### Tag: package-2018-03-01-preview and go
+
+These settings apply only when `--tag=package-2018-03-01-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-03-01-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-03-01-preview/$(namespace)
+```
diff --git a/specification/signalr/resource-manager/readme.md b/specification/signalr/resource-manager/readme.md
index 9f4517f0e619..d4aea7ad72ce 100644
--- a/specification/signalr/resource-manager/readme.md
+++ b/specification/signalr/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # SignalR
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for SignalR.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for SignalR.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for SignalR, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the SignalR API.
 
 ``` yaml
@@ -53,6 +53,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-node
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -88,33 +89,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-signalr
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: signalr
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-03-01-preview
-```
-
-### Tag: package-2018-03-01-preview and go
-
-These settings apply only when `--tag=package-2018-03-01-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-03-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/signalr/mgmt/2018-03-01-preview/signalr
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
@@ -150,7 +127,7 @@ regenerate-manager: true
 generate-interface: true
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
diff --git a/specification/signalr/resource-manager/readme.typescript.md b/specification/signalr/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..6740ddb839ce
--- /dev/null
+++ b/specification/signalr/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-signalr"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-signalr"
+  generate-metadata: true
+```
diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/GetRestorableDroppedManagedDatabase.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/GetRestorableDroppedManagedDatabase.json
new file mode 100644
index 000000000000..fab7b04f7d0a
--- /dev/null
+++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/GetRestorableDroppedManagedDatabase.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "Test1",
+    "managedInstanceName": "managedInstance",
+    "restorableDroppedDatabaseId": "testdb,131403269876900000",
+    "api-version": "2017-03-01-preview"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "properties": {
+          "databaseName": "testdb",
+          "creationDate": "2017-05-07T04:41:33.937Z",
+          "deletionDate": "2017-05-27T02:49:47.690Z"
+        },
+        "location": "southeastasia",
+        "id":
+          "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/testsvr/restorableDroppedDatabases/testdb,131403269876900000",
+        "name": "testdb,131403269876900000",
+        "type": "Microsoft.Sql/managedInstances/restorableDroppedDatabases"
+      }
+    }
+  }
+}
diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/RestorableDroppedManagedDatabaseListByManagedInstance.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/RestorableDroppedManagedDatabaseListByManagedInstance.json
new file mode 100644
index 000000000000..abd7cdc1a910
--- /dev/null
+++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/RestorableDroppedManagedDatabaseListByManagedInstance.json
@@ -0,0 +1,38 @@
+{
+    "parameters": {
+        "subscriptionId": "00000000-1111-2222-3333-444444444444",
+        "resourceGroupName": "Test1",
+        "managedInstanceName": "managedInstance",
+        "api-version": "2017-03-01-preview"
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "value": [
+                    {
+                        "properties": {
+                            "databaseName": "testdb",
+                            "creationDate": "2017-05-07T04:41:33.937Z",
+                            "deletionDate": "2017-05-27T02:49:47.690Z"
+                        },
+                        "location": "southeastasia",
+                        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/testsvr/restorableDroppedDatabases/testdb,131403269876900000",
+                        "name": "testdb,131403269876900000",
+                        "type": "Microsoft.Sql/managedInstances/restorableDroppedDatabases"
+                    },
+                    {
+                        "properties": {
+                            "databaseName": "testdb2",
+                            "creationDate": "2017-05-07T04:41:33.937Z",
+                            "deletionDate": "2017-05-27T02:49:47.690Z"
+                        },
+                        "location": "southeastasia",
+                        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/testsvr/restorableDroppedDatabases/testdb2,131403269876900000",
+                        "name": "testdb2,131403269876900000",
+                        "type": "Microsoft.Sql/managedInstances/restorableDroppedDatabases"
+                    }
+                ]
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/restorableDroppedManagedDatabases.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/restorableDroppedManagedDatabases.json
new file mode 100644
index 000000000000..99b561a419fd
--- /dev/null
+++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/restorableDroppedManagedDatabases.json
@@ -0,0 +1,323 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2017-03-01-preview",
+    "title": "SqlManagementClient",
+    "description": "The Azure SQL Database management API provides a RESTful set of web APIs that interact with Azure SQL Database services to manage your databases. The API enables users to create, retrieve, update, and delete databases, servers, and other entities."
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases": {
+      "get": {
+        "tags": [
+          "RestorableDroppedManagedDatabases"
+        ],
+        "description": "Gets a list of restorable dropped managed databases.",
+        "operationId": "RestorableDroppedManagedDatabases_ListByInstance",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ResourceGroupParameter"
+          },
+          {
+            "$ref": "#/parameters/ManagedInstanceNameParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully retrieved the list of restorable dropped databases.",
+            "schema": {
+              "$ref": "#/definitions/RestorableDroppedManagedDatabaseListResult"
+            }
+          },
+          "default": {
+            "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found"
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "List restorable dropped databases by managed instances": {
+            "$ref": "./examples/RestorableDroppedManagedDatabaseListByManagedInstance.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/restorableDroppedDatabases/{restorableDroppedDatabaseId}": {
+      "get": {
+        "tags": [
+          "RestorableDroppedManagedDatabases"
+        ],
+        "description": "Gets a restorable dropped managed database.",
+        "operationId": "RestorableDroppedManagedDatabases_Get",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ResourceGroupParameter"
+          },
+          {
+            "$ref": "#/parameters/ManagedInstanceNameParameter"
+          },
+          {
+            "name": "restorableDroppedDatabaseId",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully retrieved the specified restorable dropped database.",
+            "schema": {
+              "$ref": "#/definitions/RestorableDroppedManagedDatabase"
+            }
+          },
+          "default": {
+            "description": "*** Error Responses: ***\n\n * 400 InvalidRestorableDroppedDatabaseDeletionDate - The restorable dropped database deletion date given is invalid\n\n * 400 InvalidRestorableDroppedDatabaseId - Invalid restorable dropped database identifier\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found."
+          }
+        },
+        "x-ms-examples": {
+          "Gets a restorable dropped managed database.": {
+            "$ref": "./examples/GetRestorableDroppedManagedDatabase.json"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "RestorableDroppedManagedDatabaseListResult": {
+      "description": "A list of restorable dropped managed databases.",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Array of results.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RestorableDroppedManagedDatabase"
+          },
+          "readOnly": true
+        },
+        "nextLink": {
+          "description": "Link to retrieve next page of results.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "RestorableDroppedManagedDatabaseProperties": {
+      "description": "The restorable dropped managed database's properties.",
+      "type": "object",
+      "properties": {
+        "databaseName": {
+          "description": "The name of the database.",
+          "type": "string",
+          "readOnly": true
+        },
+        "creationDate": {
+          "format": "date-time",
+          "description": "The creation date of the database (ISO8601 format).",
+          "type": "string",
+          "readOnly": true
+        },
+        "deletionDate": {
+          "format": "date-time",
+          "description": "The deletion date of the database (ISO8601 format).",
+          "type": "string",
+          "readOnly": true
+        },
+        "earliestRestoreDate": {
+          "format": "date-time",
+          "description": "The earliest restore date of the database (ISO8601 format).",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "Resource": {
+      "description": "ARM resource.",
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "Resource ID.",
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "description": "Resource name.",
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "description": "Resource type.",
+          "type": "string",
+          "readOnly": true
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "TrackedResource": {
+      "description": "ARM tracked top level resource.",
+      "required": [
+        "location"
+      ],
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "location": {
+          "description": "Resource location.",
+          "type": "string",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ]
+        },
+        "tags": {
+          "description": "Resource tags.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "RestorableDroppedManagedDatabase": {
+      "description": "A restorable dropped managed database resource.",
+      "required": [
+        "location"
+      ],
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/TrackedResource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/RestorableDroppedManagedDatabaseProperties",
+          "description": "Resource properties.",
+          "x-ms-client-flatten": true
+        }
+      }
+    }
+  },
+  "parameters": {
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "description": "The subscription ID that identifies an Azure subscription.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "client"
+    },
+    "ApiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "description": "The API version to use for the request.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "client"
+    },
+    "ResourceGroupParameter": {
+      "name": "resourceGroupName",
+      "in": "path",
+      "description": "The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "ServerNameParameter": {
+      "name": "serverName",
+      "in": "path",
+      "description": "The name of the server.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "ManagedInstanceNameParameter": {
+      "name": "managedInstanceName",
+      "in": "path",
+      "description": "The name of the managed instance.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "DatabaseNameParameter": {
+      "name": "databaseName",
+      "in": "path",
+      "description": "The name of the database.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "BlobAuditingPolicyNameParameter": {
+      "name": "blobAuditingPolicyName",
+      "in": "path",
+      "description": "The name of the blob auditing policy.",
+      "required": true,
+      "type": "string",
+      "enum": [
+        "default"
+      ],
+      "x-ms-parameter-location": "method"
+    },
+    "SqlVirtualMachineInstanceNameParameter": {
+      "name": "sqlVirtualMachineInstanceName",
+      "in": "path",
+      "description": "The name of the SqlVirtualMachineInstance.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "SqlVirtualMachineContainerNameParameter": {
+      "name": "sqlVirtualMachineContainerName",
+      "in": "path",
+      "description": "The name of the SqlVirtualMachineContainer.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "VirtualClusterNameParameter": {
+      "name": "virtualClusterName",
+      "in": "path",
+      "description": "The name of the virtual cluster.",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    }
+  },
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "flow": "implicit",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/sql/resource-manager/readme.go.md b/specification/sql/resource-manager/readme.go.md
new file mode 100644
index 000000000000..f815a5f970c0
--- /dev/null
+++ b/specification/sql/resource-manager/readme.go.md
@@ -0,0 +1,58 @@
+### Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: sql
+  clear-output-folder: true
+```
+
+#### Go multi-api
+
+From api-version 2017-10 and onwards, only pure package versions should be used. Composite package versions are used for earlier api-versions (2017-03 and earlier) in order to ensure backwards compatibility with previously released versions of Go SDK,
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-pure-2017-10-preview
+  - tag: package-2017-03-preview
+  - tag: package-2015-05-preview
+  - tag: package-2014-04
+```
+
+#### Tag: package-pure-2017-10-preview and go
+
+These settings apply only when `--tag=package-2017-10-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-pure-2017-10-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-10-01-preview/$(namespace)
+```
+
+#### Tag: package-2017-03-preview and go
+
+These settings apply only when `--tag=package-2017-03-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-03-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-03-01-preview/$(namespace)
+```
+
+#### Tag: package-2015-05-preview and go
+
+These settings apply only when `--tag=package-2015-05-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-05-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-05-01-preview/$(namespace)
+```
+
+#### Tag: package-2014-04 and go
+
+These settings apply only when `--tag=package-2014-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2014-04' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2014-04-01/$(namespace)
+```
diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md
index 4e5466897624..859bf982961a 100644
--- a/specification/sql/resource-manager/readme.md
+++ b/specification/sql/resource-manager/readme.md
@@ -557,6 +557,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-node
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-ruby
     after_scripts:
       - bundle install && rake arm:regen_all_profiles['azure_mgmt_sql']
@@ -608,62 +609,7 @@ python:
 
 ### Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: sql
-  clear-output-folder: true
-```
-
-#### Go multi-api
-
-From api-version 2017-10 and onwards, only pure package versions should be used. Composite package versions are used for earlier api-versions (2017-03 and earlier) in order to ensure backwards compatibility with previously released versions of Go SDK,
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-pure-2017-10-preview
-  - tag: package-2017-03-preview
-  - tag: package-2015-05-preview
-  - tag: package-2014-04
-```
-
-#### Tag: package-pure-2017-10-preview and go
-
-These settings apply only when `--tag=package-2017-10-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-pure-2017-10-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/sql/mgmt/2017-10-01-preview/sql
-```
-
-#### Tag: package-2017-03-preview and go
-
-These settings apply only when `--tag=package-2017-03-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-03-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/sql/mgmt/2017-03-01-preview/sql
-```
-
-#### Tag: package-2015-05-preview and go
-
-These settings apply only when `--tag=package-2015-05-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/sql/mgmt/2015-05-01-preview/sql
-```
-
-#### Tag: package-2014-04 and go
-
-These settings apply only when `--tag=package-2014-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2014-04' && $(go)
-output-folder: $(go-sdk-folder)/services/sql/mgmt/2014-04-01/sql
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ### Java
 
diff --git a/specification/sql/resource-manager/readme.typescript.md b/specification/sql/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..56f95ad89486
--- /dev/null
+++ b/specification/sql/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-sql"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-sql"
+  generate-metadata: true
+```
diff --git a/specification/storSimple1200Series/resource-manager/readme.go.md b/specification/storSimple1200Series/resource-manager/readme.go.md
new file mode 100644
index 000000000000..775a37d34d21
--- /dev/null
+++ b/specification/storSimple1200Series/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+```yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: storsimple
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+```yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-10
+```
+
+### Tag: package-2016-10 and go
+
+These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-2016-10' && $(go)
+output-folder: $(go-sdk-folder)/services/storsimple1200series/mgmt/2016-10-01/$(namespace)
+```
diff --git a/specification/storSimple1200Series/resource-manager/readme.md b/specification/storSimple1200Series/resource-manager/readme.md
index db1040fa71f8..5e3fe58bcf18 100644
--- a/specification/storSimple1200Series/resource-manager/readme.md
+++ b/specification/storSimple1200Series/resource-manager/readme.md
@@ -56,6 +56,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-node
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-ruby
     after_scripts:
       - bundle install && rake arm:regen_all_profiles['azure_mgmt_stor_simple1200_series']
@@ -76,34 +77,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: storsimple
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-10
-```
-
-### Tag: package-2016-10 and go
-
-These settings apply only when `--tag=package-2016-10 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-10' && $(go)
-output-folder: $(go-sdk-folder)/services/storsimple1200series/mgmt/2016-10-01/storsimple
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/storSimple1200Series/resource-manager/readme.typescript.md b/specification/storSimple1200Series/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..cc13596718e1
--- /dev/null
+++ b/specification/storSimple1200Series/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-storsimple1200series"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-storsimple1200series"
+  generate-metadata: true
+```
diff --git a/specification/storage/data-plane/Microsoft.StorageDataLake/readme.go.md b/specification/storage/data-plane/Microsoft.StorageDataLake/readme.go.md
new file mode 100644
index 000000000000..f8e96c264598
--- /dev/null
+++ b/specification/storage/data-plane/Microsoft.StorageDataLake/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: storagedatalake
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-06-preview
+```
+
+### Tag:  package-2018-06-preview and go
+
+These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/storage/datalake/2018-06-17/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/storage/data-plane/Microsoft.StorageDataLake/readme.md b/specification/storage/data-plane/Microsoft.StorageDataLake/readme.md
index 5cf5432c5f85..d34d381b0442 100644
--- a/specification/storage/data-plane/Microsoft.StorageDataLake/readme.md
+++ b/specification/storage/data-plane/Microsoft.StorageDataLake/readme.md
@@ -102,30 +102,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: storagedatalake
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-06-preview
-```
-
-### Tag:  package-2018-06-preview and go
-
-These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-06-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/datalake/2018-06-17/storagedatalake
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/storage/resource-manager/readme.go.md b/specification/storage/resource-manager/readme.go.md
index 704e0541d9a0..3c67a4b087d3 100644
--- a/specification/storage/resource-manager/readme.go.md
+++ b/specification/storage/resource-manager/readme.go.md
@@ -31,7 +31,7 @@ These settings apply only when `--tag=package-2018-07 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-07' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/mgmt/2018-07-01/storage
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-07-01/$(namespace)
 ```
 
 ### Tag: package-2018-03 and go
@@ -40,7 +40,7 @@ These settings apply only when `--tag=package-2018-03 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-03' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/storage/mgmt/2018-03-01-preview/storage
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-03-01-preview/$(namespace)
 ```
 
 ### Tag: package-2018-02 and go
@@ -49,7 +49,7 @@ These settings apply only when `--tag=package-2018-02 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-02' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/mgmt/2018-02-01/storage
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-02-01/$(namespace)
 ```
 
 ### Tag: package-2017-10 and go
@@ -58,7 +58,7 @@ These settings apply only when `--tag=package-2017-10 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-10' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/mgmt/2017-10-01/storage
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-10-01/$(namespace)
 ```
 
 ### Tag: package-2017-06 and go
@@ -67,7 +67,7 @@ These settings apply only when `--tag=package-2017-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2017-06' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/mgmt/2017-06-01/storage
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-06-01/$(namespace)
 ```
 
 ### Tag: package-2016-12 and go
@@ -76,7 +76,7 @@ These settings apply only when `--tag=package-2016-12 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-12' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/mgmt/2016-12-01/storage
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-12-01/$(namespace)
 ```
 
 ### Tag: package-2016-05 and go
@@ -85,7 +85,7 @@ These settings apply only when `--tag=package-2016-05 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-05' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/mgmt/2016-05-01/storage
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-05-01/$(namespace)
 ```
 
 ### Tag: package-2016-01 and go
@@ -94,7 +94,7 @@ These settings apply only when `--tag=package-2016-01 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2016-01' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/mgmt/2016-01-01/storage
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-01-01/$(namespace)
 ```
 
 ### Tag: package-2015-06 and go
@@ -103,7 +103,7 @@ These settings apply only when `--tag=package-2015-06 --go` is specified on the
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2015-06' && $(go)
-output-folder: $(go-sdk-folder)/services/storage/mgmt/2015-06-15/storage
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-06-15/$(namespace)
 ```
 
 ### Tag: package-2015-05-preview and go
@@ -112,5 +112,5 @@ These settings apply only when `--tag=package-2015-05-preview --go` is specified
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2015-05-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/storage/mgmt/2015-05-01-preview/storage
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-05-01-preview/$(namespace)
 ```
diff --git a/specification/storage/resource-manager/readme.typescript.md b/specification/storage/resource-manager/readme.typescript.md
index 826820ee77da..1e016af1bce0 100644
--- a/specification/storage/resource-manager/readme.typescript.md
+++ b/specification/storage/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-storage"
-  output-folder: $(typescript-sdks-folder)/packages/arm-storage
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-storage"
   payload-flattening-threshold: 2
   override-client-name: StorageManagementClient
   generate-metadata: true
diff --git a/specification/storageimportexport/resource-manager/readme.go.md b/specification/storageimportexport/resource-manager/readme.go.md
new file mode 100644
index 000000000000..9b48808d7a27
--- /dev/null
+++ b/specification/storageimportexport/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: storageimportexport
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-11
+```
+
+### Tag: package-2016-11 and go
+
+These settings apply only when `--tag=package-2016-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-11' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-11-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/storageimportexport/resource-manager/readme.md b/specification/storageimportexport/resource-manager/readme.md
index 945dcacc96c4..883caf01953a 100644
--- a/specification/storageimportexport/resource-manager/readme.md
+++ b/specification/storageimportexport/resource-manager/readme.md
@@ -51,36 +51,13 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
-  - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-node
+  - repo: azure-sdk-for-js
 ```
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: storageimportexport
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-11
-```
-
-### Tag: package-2016-11 and go
-
-These settings apply only when `--tag=package-2016-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-11' && $(go)
-output-folder: $(go-sdk-folder)/services/storageimportexport/mgmt/2016-11-01/storageimportexport
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
@@ -95,25 +72,25 @@ license-header: MICROSOFT_MIT_NO_CODEGEN
 payload-flattening-threshold: 1
 output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-storageimportexport
 ```
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-2016-11
-```
-
-### Tag: package-2016-11 and java
-
-These settings apply only when `--tag=package-2016-11 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2016-11' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.storageimportexport.v2016_11_01
-  output-folder: $(azure-libraries-for-java-folder)/storageimportexport/resource-manager/v2016_11_01
-regenerate-manager: true
-generate-interface: true
-```
-
-
+
+### Java multi-api
+
+``` yaml $(java) && $(multiapi)
+batch:
+  - tag: package-2016-11
+```
+
+### Tag: package-2016-11 and java
+
+These settings apply only when `--tag=package-2016-11 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
+
+``` yaml $(tag) == 'package-2016-11' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.storageimportexport.v2016_11_01
+  output-folder: $(azure-libraries-for-java-folder)/storageimportexport/resource-manager/v2016_11_01
+regenerate-manager: true
+generate-interface: true
+```
+
+
diff --git a/specification/storageimportexport/resource-manager/readme.typescript.md b/specification/storageimportexport/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..5b2034eaceac
--- /dev/null
+++ b/specification/storageimportexport/resource-manager/readme.typescript.md
@@ -0,0 +1,13 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-storageimportexport"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-storageimportexport"
+  override-client-name: StorageImportExportManagementClient
+  generate-metadata: true
+```
diff --git a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2018-10-01/storagesync.json b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2018-10-01/storagesync.json
index 84b7ce3ec51f..7f848db71e8f 100644
--- a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2018-10-01/storagesync.json
+++ b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2018-10-01/storagesync.json
@@ -3224,6 +3224,10 @@
                 "managementEndpointUri": {
                     "type": "string",
                     "description": "Management Endpoint Uri"
+                },
+                "monitoringConfiguration": {
+                    "type": "string",
+                    "description": "Monitoring Configuration"
                 }
             }
         },
diff --git a/specification/storagesync/resource-manager/Microsoft.StorageSync/stable/2018-07-01/storagesync.json b/specification/storagesync/resource-manager/Microsoft.StorageSync/stable/2018-07-01/storagesync.json
index 986d0fde68e4..697277d2e5d1 100644
--- a/specification/storagesync/resource-manager/Microsoft.StorageSync/stable/2018-07-01/storagesync.json
+++ b/specification/storagesync/resource-manager/Microsoft.StorageSync/stable/2018-07-01/storagesync.json
@@ -3224,6 +3224,10 @@
                 "managementEndpointUri": {
                     "type": "string",
                     "description": "Management Endpoint Uri"
+                },
+                "monitoringConfiguration": {
+                    "type": "string",
+                    "description": "Monitoring Configuration"
                 }
             }
         },
diff --git a/specification/storagesync/resource-manager/readme.go.md b/specification/storagesync/resource-manager/readme.go.md
index e3bf073b9639..c6d9ce18c085 100644
--- a/specification/storagesync/resource-manager/readme.go.md
+++ b/specification/storagesync/resource-manager/readme.go.md
@@ -24,7 +24,7 @@ These settings apply only when `--tag=package-2018-10-01 --go` is specified on t
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-10-01' && $(go)
-output-folder: $(go-sdk-folder)/services/storagesync/mgmt/2018-10-01/storagesync
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-10-01/$(namespace)
 ```
 
 ### Tag: package-2018-07-01 and go
@@ -33,7 +33,7 @@ These settings apply only when `--tag=package-2018-07-01 --go` is specified on t
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-07-01' && $(go)
-output-folder: $(go-sdk-folder)/services/storagesync/mgmt/2018-07-01/storagesync
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-07-01/$(namespace)
 ```
 
 ### Tag: package-2018-04-02 and go
@@ -42,5 +42,5 @@ These settings apply only when `--tag=package-2018-04-02 --go` is specified on t
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ``` yaml $(tag) == 'package-2018-04-02' && $(go)
-output-folder: $(go-sdk-folder)/services/storagesync/mgmt/2018-04-02/storagesync
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-04-02/$(namespace)
 ```
diff --git a/specification/storagesync/resource-manager/readme.md b/specification/storagesync/resource-manager/readme.md
index 3c3a6b903690..4561384d9e80 100644
--- a/specification/storagesync/resource-manager/readme.md
+++ b/specification/storagesync/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # StorageSync
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for StorageSync.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for StorageSync.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for Storage, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -21,7 +21,7 @@ To see additional help and options, run:
 
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the Storage Sync API.
 
 ``` yaml
@@ -84,10 +84,11 @@ swagger-to-sdk:
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
 ```
 
-## C# 
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
 Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
@@ -130,6 +131,10 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-storagesync
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.
diff --git a/specification/storagesync/resource-manager/readme.typescript.md b/specification/storagesync/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..c1e8d70d5c43
--- /dev/null
+++ b/specification/storagesync/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-storagesync"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-storagesync"
+  generate-metadata: true
+```
diff --git a/specification/storsimple8000series/resource-manager/readme.go.md b/specification/storsimple8000series/resource-manager/readme.go.md
new file mode 100644
index 000000000000..a91a371cfa20
--- /dev/null
+++ b/specification/storsimple8000series/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+```yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: storsimple
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+```yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-06
+```
+
+### Tag: package-2017-06 and go
+
+These settings apply only when `--tag=package-2017-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+```yaml $(tag) == 'package-2017-06' && $(go)
+output-folder: $(go-sdk-folder)/services/storsimple8000series/mgmt/2017-06-01/$(namespace)
+```
diff --git a/specification/storsimple8000series/resource-manager/readme.md b/specification/storsimple8000series/resource-manager/readme.md
index a0636c29b01c..8825c9c52582 100644
--- a/specification/storsimple8000series/resource-manager/readme.md
+++ b/specification/storsimple8000series/resource-manager/readme.md
@@ -55,6 +55,7 @@ This is not used by Autorest itself.
 ``` yaml $(swagger-to-sdk)
 swagger-to-sdk:
   - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-js
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
@@ -76,34 +77,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: storsimple
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-06
-```
-
-### Tag: package-2017-06 and go
-
-These settings apply only when `--tag=package-2017-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-06' && $(go)
-output-folder: $(go-sdk-folder)/services/storsimple8000series/mgmt/2017-06-01/storsimple
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
@@ -118,25 +94,25 @@ license-header: MICROSOFT_MIT_NO_CODEGEN
 payload-flattening-threshold: 1
 output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-storsimple8000series
 ```
-
-### Java multi-api
-
-``` yaml $(java) && $(multiapi)
-batch:
-  - tag: package-2017-06
-```
-
-### Tag: package-2017-06 and java
-
-These settings apply only when `--tag=package-2017-06 --java` is specified on the command line.
-Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
-
-``` yaml $(tag) == 'package-2017-06' && $(java) && $(multiapi)
-java:
-  namespace: com.microsoft.azure.management.storsimple.v2017_06_01
-  output-folder: $(azure-libraries-for-java-folder)/storsimple/resource-manager/v2017_06_01
-regenerate-manager: true
-generate-interface: true
-```
-
-
+
+### Java multi-api
+
+``` yaml $(java) && $(multiapi)
+batch:
+  - tag: package-2017-06
+```
+
+### Tag: package-2017-06 and java
+
+These settings apply only when `--tag=package-2017-06 --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.
+
+``` yaml $(tag) == 'package-2017-06' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.storsimple.v2017_06_01
+  output-folder: $(azure-libraries-for-java-folder)/storsimple/resource-manager/v2017_06_01
+regenerate-manager: true
+generate-interface: true
+```
+
+
diff --git a/specification/storsimple8000series/resource-manager/readme.typescript.md b/specification/storsimple8000series/resource-manager/readme.typescript.md
new file mode 100644
index 000000000000..93e568ad40f6
--- /dev/null
+++ b/specification/storsimple8000series/resource-manager/readme.typescript.md
@@ -0,0 +1,12 @@
+## TypeScript
+
+These settings apply only when `--typescript` is specified on the command line.
+Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
+
+``` yaml $(typescript)
+typescript:
+  azure-arm: true
+  package-name: "@azure/arm-storsimple8000series"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-storsimple8000series"
+  generate-metadata: true
+```
diff --git a/specification/streamanalytics/resource-manager/readme.go.md b/specification/streamanalytics/resource-manager/readme.go.md
new file mode 100644
index 000000000000..443818eee8dd
--- /dev/null
+++ b/specification/streamanalytics/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: streamanalytics
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2016-03
+```
+
+### Tag: package-2016-03 and go
+
+These settings apply only when `--tag=package-2016-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-03-01/$(namespace)
+```
diff --git a/specification/streamanalytics/resource-manager/readme.md b/specification/streamanalytics/resource-manager/readme.md
index fe106986895a..f91a1fb2788d 100644
--- a/specification/streamanalytics/resource-manager/readme.md
+++ b/specification/streamanalytics/resource-manager/readme.md
@@ -81,34 +81,9 @@ csharp:
   clear-output-folder: true
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: streamanalytics
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2016-03
-```
-
-### Tag: package-2016-03 and go
-
-These settings apply only when `--tag=package-2016-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-03' && $(go)
-output-folder: $(go-sdk-folder)/services/streamanalytics/mgmt/2016-03-01/streamanalytics
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/streamanalytics/resource-manager/readme.typescript.md b/specification/streamanalytics/resource-manager/readme.typescript.md
index 11ce3aa7a89e..79443e71df6c 100644
--- a/specification/streamanalytics/resource-manager/readme.typescript.md
+++ b/specification/streamanalytics/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-streamanalytics"
-  output-folder: $(typescript-sdks-folder)/packages/arm-streamanalytics
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-streamanalytics"
   generate-metadata: true
 ```
diff --git a/specification/subscription/resource-manager/readme.go.md b/specification/subscription/resource-manager/readme.go.md
new file mode 100644
index 000000000000..df396b0b4fb0
--- /dev/null
+++ b/specification/subscription/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: subscription
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-03-preview
+  - tag: package-2017-11-preview
+```
+
+### Tag: package-2018-03-preview and go
+
+These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2018-03-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-03-01-preview/$(namespace)
+```
+
+### Tag: package-2017-11-preview and go
+
+These settings apply only when `--tag=package-2017-11-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-11-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-11-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/subscription/resource-manager/readme.md b/specification/subscription/resource-manager/readme.md
index feb1ad5fb2ca..74498b7f5e58 100644
--- a/specification/subscription/resource-manager/readme.md
+++ b/specification/subscription/resource-manager/readme.md
@@ -1,5 +1,5 @@
 # Subscription
-    
+
 > see https://aka.ms/autorest
 
 This is the AutoRest configuration file for Subscription.
@@ -7,7 +7,7 @@ This is the AutoRest configuration file for Subscription.
 
 
 ---
-## Getting Started 
+## Getting Started
 To build the SDK for Subscription, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -20,13 +20,13 @@ To see additional help and options, run:
 ## Configuration
 
 ## Suppression
-``` yaml 
-directive: 
+``` yaml
+directive:
   - suppress: R2059
 ```
 
 
-### Basic Information 
+### Basic Information
 These are the global settings for the Subscription API.
 
 ``` yaml
@@ -103,41 +103,7 @@ python:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: subscription
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-03-preview
-  - tag: package-2017-11-preview
-```
-
-### Tag: package-2018-03-preview and go
-
-These settings apply only when `--tag=package-2018-03-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2018-03-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/subscription/mgmt/2018-03-01-preview/subscription
-```
-
-### Tag: package-2017-11-preview and go
-
-These settings apply only when `--tag=package-2017-11-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-11-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/subscription/mgmt/2017-11-01-preview/subscription
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/subscription/resource-manager/readme.typescript.md b/specification/subscription/resource-manager/readme.typescript.md
index fe82e79cc0fc..123671817de8 100644
--- a/specification/subscription/resource-manager/readme.typescript.md
+++ b/specification/subscription/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-subscriptions"
-  output-folder: $(typescript-sdks-folder)/packages/arm-subscriptions
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-subscriptions"
   generate-metadata: true
 ```
diff --git a/specification/timeseriesinsights/resource-manager/readme.go.md b/specification/timeseriesinsights/resource-manager/readme.go.md
new file mode 100644
index 000000000000..595b6f9fd345
--- /dev/null
+++ b/specification/timeseriesinsights/resource-manager/readme.go.md
@@ -0,0 +1,36 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  clear-output-folder: true
+  namespace: timeseriesinsights
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2017-11-15
+  - tag: package-2017-02-preview
+```
+
+### Tag: package-2017-11-15 and go
+
+These settings apply only when `--tag=package-2017-11-15 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-11-15' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-11-15/$(namespace)
+```
+
+### Tag: package-2017-02-preview and go
+
+These settings apply only when `--tag=package-2017-02-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2017-02-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-02-28-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/timeseriesinsights/resource-manager/readme.md b/specification/timeseriesinsights/resource-manager/readme.md
index b15504e6250b..95dee2ea7dd3 100644
--- a/specification/timeseriesinsights/resource-manager/readme.md
+++ b/specification/timeseriesinsights/resource-manager/readme.md
@@ -83,40 +83,7 @@ swagger-to-sdk:
 
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  clear-output-folder: true
-  namespace: timeseriesinsights
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2017-11-15
-  - tag: package-2017-02-preview
-```
-
-### Tag: package-2017-11-15 and go
-
-These settings apply only when `--tag=package-2017-11-15 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-11-15' && $(go)
-output-folder: $(go-sdk-folder)/services/timeseriesinsights/mgmt/2017-11-15/timeseriesinsights
-```
-
-### Tag: package-2017-02-preview and go
-
-These settings apply only when `--tag=package-2017-02-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag)=='package-2017-02-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/timeseriesinsights/mgmt/2017-02-28-preview/timeseriesinsights
-```
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/timeseriesinsights/resource-manager/readme.typescript.md b/specification/timeseriesinsights/resource-manager/readme.typescript.md
index 45db8927eb04..746bac2ded98 100644
--- a/specification/timeseriesinsights/resource-manager/readme.typescript.md
+++ b/specification/timeseriesinsights/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-timeseriesinsights"
-  output-folder: $(typescript-sdks-folder)/packages/arm-timeseriesinsights
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-timeseriesinsights"
   generate-metadata: true
 ```
diff --git a/specification/trafficmanager/resource-manager/readme.go.md b/specification/trafficmanager/resource-manager/readme.go.md
new file mode 100644
index 000000000000..2a786747810a
--- /dev/null
+++ b/specification/trafficmanager/resource-manager/readme.go.md
@@ -0,0 +1,76 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: trafficmanager
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-03
+  - tag: package-2018-02
+  - tag: package-2017-09-preview
+  - tag: package-2017-05
+  - tag: package-2017-03
+  - tag: package-2015-11
+```
+
+### Tag: package-2018-03 and go
+
+These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-03-01/$(namespace)
+```
+
+### Tag: package-2018-02 and go
+
+These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-02' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-02-01/$(namespace)
+```
+
+### Tag: package-2017-09-preview and go
+
+These settings apply only when `--tag=package-2017-09-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-09-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-09-01-preview/$(namespace)
+```
+
+### Tag: package-2017-05 and go
+
+These settings apply only when `--tag=package-2017-05 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-05' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-05-01/$(namespace)
+```
+
+### Tag: package-2017-03 and go
+
+These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-03' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2017-03-01/$(namespace)
+```
+
+### Tag: package-2015-11 and go
+
+These settings apply only when `--tag=package-2015-11 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-11' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2015-11-01/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/trafficmanager/resource-manager/readme.md b/specification/trafficmanager/resource-manager/readme.md
index 497a6d066bd1..82e4c3822794 100644
--- a/specification/trafficmanager/resource-manager/readme.md
+++ b/specification/trafficmanager/resource-manager/readme.md
@@ -92,7 +92,7 @@ directive:
   - suppress: R3023
     reason: it's implemented in the main network spec
     approved-by: "@fearthecowboy"
-  
+
   - where: $.paths["/providers/Microsoft.Network/checkTrafficManagerNameAvailability"].post.operationId
     suppress: R2066
     reason: the name does include it.
@@ -106,7 +106,7 @@ directive:
     suppress: R3006
     reason: Existing API; can't change without breaking API. Will consider in future API version
     approved-by: "@fearthecowboy"
-    
+
 ```
 ### Tag: package-2017-09-preview
 
@@ -226,85 +226,9 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-trafficmanager
 ```
 
-
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: trafficmanager
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-03
-  - tag: package-2018-02
-  - tag: package-2017-09-preview
-  - tag: package-2017-05
-  - tag: package-2017-03
-  - tag: package-2015-11
-```
-
-### Tag: package-2018-03 and go
-
-These settings apply only when `--tag=package-2018-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-03' && $(go)
-output-folder: $(go-sdk-folder)/services/trafficmanager/mgmt/2018-03-01/trafficmanager
-```
-
-### Tag: package-2018-02 and go
-
-These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-02' && $(go)
-output-folder: $(go-sdk-folder)/services/trafficmanager/mgmt/2018-02-01/trafficmanager
-```
-
-### Tag: package-2017-09-preview and go
-
-These settings apply only when `--tag=package-2017-09-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-09-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/trafficmanager/mgmt/2017-09-01-preview/trafficmanager
-```
-
-### Tag: package-2017-05 and go
-
-These settings apply only when `--tag=package-2017-05 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-05' && $(go)
-output-folder: $(go-sdk-folder)/services/trafficmanager/mgmt/2017-05-01/trafficmanager
-```
-
-### Tag: package-2017-03 and go
-
-These settings apply only when `--tag=package-2017-03 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-03' && $(go)
-output-folder: $(go-sdk-folder)/services/trafficmanager/mgmt/2017-03-01/trafficmanager
-```
-
-### Tag: package-2015-11 and go
-
-These settings apply only when `--tag=package-2015-11 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-11' && $(go)
-output-folder: $(go-sdk-folder)/services/trafficmanager/mgmt/2015-11-01/trafficmanager
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/trafficmanager/resource-manager/readme.typescript.md b/specification/trafficmanager/resource-manager/readme.typescript.md
index 779d0b7c6dcb..17c58edd6535 100644
--- a/specification/trafficmanager/resource-manager/readme.typescript.md
+++ b/specification/trafficmanager/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-trafficmanager"
-  output-folder: $(typescript-sdks-folder)/packages/arm-trafficmanager
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-trafficmanager"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
diff --git a/specification/visualstudio/resource-manager/readme.go.md b/specification/visualstudio/resource-manager/readme.go.md
new file mode 100644
index 000000000000..6fa1eb8cd015
--- /dev/null
+++ b/specification/visualstudio/resource-manager/readme.go.md
@@ -0,0 +1,26 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: visualstudio
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2014-04-preview
+```
+
+### Tag: package-2014-04-preview and go
+
+These settings apply only when `--tag=package-2014-04-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2014-04-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2014-04-01-preview/$(namespace)
+```
\ No newline at end of file
diff --git a/specification/visualstudio/resource-manager/readme.md b/specification/visualstudio/resource-manager/readme.md
index 367e3cce6f8f..273fce78f603 100644
--- a/specification/visualstudio/resource-manager/readme.md
+++ b/specification/visualstudio/resource-manager/readme.md
@@ -62,34 +62,9 @@ swagger-to-sdk:
   - repo: azure-sdk-for-js
 ```
 
-
 ## Go
 
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: visualstudio
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2014-04-preview
-```
-
-### Tag: package-2014-04-preview and go
-
-These settings apply only when `--tag=package-2014-04-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2014-04-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/visualstudio/mgmt/2014-04-01-preview/visualstudio
-```
-
+See configuration in [readme.go.md](./readme.go.md)
 
 ## Java
 
diff --git a/specification/visualstudio/resource-manager/readme.typescript.md b/specification/visualstudio/resource-manager/readme.typescript.md
index 201fe318c8fb..73cdf32cc268 100644
--- a/specification/visualstudio/resource-manager/readme.typescript.md
+++ b/specification/visualstudio/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-visualstudio"
-  output-folder: $(typescript-sdks-folder)/packages/arm-visualstudio
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-visualstudio"
   generate-metadata: true
 ```
diff --git a/specification/web/resource-manager/readme.go.md b/specification/web/resource-manager/readme.go.md
new file mode 100644
index 000000000000..72b73eabce45
--- /dev/null
+++ b/specification/web/resource-manager/readme.go.md
@@ -0,0 +1,46 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: web
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-02
+  - tag: package-2016-09
+  - tag: package-2015-08-preview
+```
+
+### Tag: package-2018-02 and go
+
+These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-02' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2018-02-01/$(namespace)
+```
+
+### Tag: package-2016-09 and go
+
+These settings apply only when `--tag=package-2016-09 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2016-09' && $(go)
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2016-09-01/$(namespace)
+```
+
+### Tag: package-2015-08-preview and go
+
+These settings apply only when `--tag=package-2015-08-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2015-08-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2015-08-01-preview/$(namespace)
+```
diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md
index 6b16c4eda059..35ada8e4b8f8 100644
--- a/specification/web/resource-manager/readme.md
+++ b/specification/web/resource-manager/readme.md
@@ -319,55 +319,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-web
 ```
 
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: web
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-02
-  - tag: package-2016-09
-  - tag: package-2015-08-preview
-```
-
-### Tag: package-2018-02 and go
-
-These settings apply only when `--tag=package-2018-02 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-02' && $(go)
-output-folder: $(go-sdk-folder)/services/web/mgmt/2018-02-01/web
-```
-
-### Tag: package-2016-09 and go
-
-These settings apply only when `--tag=package-2016-09 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2016-09' && $(go)
-output-folder: $(go-sdk-folder)/services/web/mgmt/2016-09-01/web
-```
-
-### Tag: package-2015-08-preview and go
-
-These settings apply only when `--tag=package-2015-08-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2015-08-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/web/mgmt/2015-08-preview/web
-```
-
-
 ## Python
 
 These settings apply only when `--python` is specified on the command line.
@@ -381,6 +332,10 @@ python:
   namespace: azure.mgmt.web
 ```
 
+## Go
+
+See configuration in [readme.go.md](./readme.go.md)
+
 
 ## Java
 
diff --git a/specification/web/resource-manager/readme.typescript.md b/specification/web/resource-manager/readme.typescript.md
index a7d0289c06df..f6ba495a3cbb 100644
--- a/specification/web/resource-manager/readme.typescript.md
+++ b/specification/web/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-appservice"
-  output-folder: $(typescript-sdks-folder)/packages/arm-appservice
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-appservice"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
diff --git a/specification/workloadmonitor/resource-manager/readme.md b/specification/workloadmonitor/resource-manager/readme.md
index 91dbd56a9656..0df5b6b5f4bc 100644
--- a/specification/workloadmonitor/resource-manager/readme.md
+++ b/specification/workloadmonitor/resource-manager/readme.md
@@ -24,15 +24,15 @@ These are the global settings for the API.
 
 ``` yaml
 openapi-type: arm
-tag: package-2018-08-preview
+tag: package-2018-08-31-preview
 ```
 
 
-### Tag: package-2018-08-preview
+### Tag: package-2018-08-31-preview
 
-These settings apply only when `--tag=package-2018-08-preview` is specified on the command line.
+These settings apply only when `--tag=package-2018-08-31-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-2018-08-preview'
+``` yaml $(tag) == 'package-2018-08-31-preview'
 input-file:
 - microsoft.workloadmonitor/preview/2018-08-31-preview/Microsoft.WorkloadMonitor.json
 ```
@@ -42,3 +42,126 @@ directive:
 - suppress:
     - R3026 # Create/Update/Delete operations are not exposed.
 ```
+
+---
+# Code Generation
+
+
+## Swagger to SDK
+
+This section describes what SDK should be generated by the automatic system.
+This is not used by Autorest itself.
+
+``` yaml $(swagger-to-sdk)
+swagger-to-sdk:
+  - repo: azure-sdk-for-python
+  - repo: azure-sdk-for-java
+  - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-node
+```
+
+
+### C#
+
+These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
+
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  namespace: Microsoft.Azure.Management.WorkloadMonitor
+  output-folder: $(csharp-sdks-folder)/WorkloadMonitor/Management.WorkloadMonitor/Generated
+  clear-output-folder: true
+```
+
+
+## Python
+
+These settings apply only when `--python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
+
+``` yaml $(python)
+python-mode: create
+python:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  payload-flattening-threshold: 2
+  namespace: azure.mgmt.workloadmonitor
+  package-name: azure-mgmt-workloadmonitor
+  clear-output-folder: true
+```
+``` yaml $(python) && $(python-mode) == 'update'
+python:
+  no-namespace-folders: true
+  output-folder: $(python-sdks-folder)/azure-mgmt-workloadmonitor/azure/mgmt/workloadmonitor
+```
+``` yaml $(python) && $(python-mode) == 'create'
+python:
+  basic-setup-py: true
+  output-folder: $(python-sdks-folder)/azure-mgmt-workloadmonitor
+```
+
+
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: workloadmonitor
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-08-31-preview
+```
+
+### Tag: package-2018-08-31-preview and go
+
+These settings apply only when `--tag=package-2018-08-31-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-08-31-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/workloadmonitor/mgmt/2018-08-31-preview/workloadmonitor
+```
+
+
+## Java
+
+These settings apply only when `--java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
+
+``` yaml $(java)
+azure-arm: true
+fluent: true
+namespace: com.microsoft.azure.management.workloadmonitor
+license-header: MICROSOFT_MIT_NO_CODEGEN
+payload-flattening-threshold: 1
+output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-workloadmonitor
+```
+
+### Java multi-api
+
+``` yaml $(java) && $(multiapi)
+batch:
+  - tag: package-2018-08-31-preview
+```
+
+### Tag: package-2018-08-31-preview and java
+
+These settings apply only when `--tag=package-2018-08-31-preview --java` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
+
+``` yaml $(tag) == 'package-2018-08-31-preview' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.workloadmonitor.v2018_08_31_preview
+  output-folder: $(azure-libraries-for-java-folder)/workloadmonitor/resource-manager/v2018_08_31_preview
+regenerate-manager: true
+generate-interface: true
+```
\ No newline at end of file