diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreate.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreate.json
index 23b513323e97..830acfa41d1d 100644
--- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreate.json
+++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreate.json
@@ -11,7 +11,12 @@
       "kind": "Storage",
       "location": "eastus2euap",
       "properties": {
-        "isHnsEnabled": true
+        "isHnsEnabled": true,
+        "routingPreference": {
+          "routingChoice": "MicrosoftRouting",
+          "publishMicrosoftEndpoints": true,
+          "publishInternetEndpoints": true
+        }
       },
       "tags": {
         "key1": "value1",
@@ -35,10 +40,29 @@
             "blob": "https://sto4445.blob.core.windows.net/",
             "file": "https://sto4445.file.core.windows.net/",
             "queue": "https://sto4445.queue.core.windows.net/",
-            "table": "https://sto4445.table.core.windows.net/"
+            "table": "https://sto4445.table.core.windows.net/",
+            "microsoftEndpoints": {
+              "web": "https://sto4445-microsoftrouting.web.core.windows.net/",
+              "dfs": "https://sto4445-microsoftrouting.dfs.core.windows.net/",
+              "blob": "https://sto4445-microsoftrouting.blob.core.windows.net/",
+              "file": "https://sto4445-microsoftrouting.file.core.windows.net/",
+              "queue": "https://sto4445-microsoftrouting.queue.core.windows.net/",
+              "table": "https://sto4445-microsoftrouting.table.core.windows.net/"
+            },
+            "internetEndpoints": {
+              "web": "https://sto4445-internetrouting.web.core.windows.net/",
+              "dfs": "https://sto4445-internetrouting.dfs.core.windows.net/",
+              "blob": "https://sto4445-internetrouting.blob.core.windows.net/",
+              "file": "https://sto4445-internetrouting.file.core.windows.net/"
+            }
           },
           "primaryLocation": "eastus2euap",
           "provisioningState": "Succeeded",
+          "routingPreference": {
+            "routingChoice": "MicrosoftRouting",
+            "publishMicrosoftEndpoints": true,
+            "publishInternetEndpoints": true
+          },
           "secondaryLocation": "centraluseuap",
           "statusOfPrimary": "available",
           "statusOfSecondary": "available",
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountGetProperties.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountGetProperties.json
index df0f7b8374c2..bc0987aee262 100644
--- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountGetProperties.json
+++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountGetProperties.json
@@ -33,10 +33,29 @@
             "blob": "https://sto8596.blob.core.windows.net/",
             "file": "https://sto8596.file.core.windows.net/",
             "queue": "https://sto8596.queue.core.windows.net/",
-            "table": "https://sto8596.table.core.windows.net/"
+            "table": "https://sto8596.table.core.windows.net/",
+            "microsoftEndpoints": {
+              "web": "https://sto8596-microsoftrouting.web.core.windows.net/",
+              "dfs": "https://sto8596-microsoftrouting.dfs.core.windows.net/",
+              "blob": "https://sto8596-microsoftrouting.blob.core.windows.net/",
+              "file": "https://sto8596-microsoftrouting.file.core.windows.net/",
+              "queue": "https://sto8596-microsoftrouting.queue.core.windows.net/",
+              "table": "https://sto8596-microsoftrouting.table.core.windows.net/"
+            },
+            "internetEndpoints": {
+              "web": "https://sto8596-internetrouting.web.core.windows.net/",
+              "dfs": "https://sto8596-internetrouting.dfs.core.windows.net/",
+              "blob": "https://sto8596-internetrouting.blob.core.windows.net/",
+              "file": "https://sto8596-internetrouting.file.core.windows.net/"
+            }
           },
           "primaryLocation": "eastus2(stage)",
           "provisioningState": "Succeeded",
+          "routingPreference": {
+            "routingChoice": "MicrosoftRouting",
+            "publishMicrosoftEndpoints": true,
+            "publishInternetEndpoints": true
+          },
           "secondaryLocation": "northcentralus(stage)",
           "statusOfPrimary": "available",
           "statusOfSecondary": "available",
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountList.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountList.json
index 2927913adedf..5205da3e4874 100644
--- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountList.json
+++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountList.json
@@ -22,10 +22,29 @@
                 "blob": "https://sto1125.blob.core.windows.net/",
                 "file": "https://sto1125.file.core.windows.net/",
                 "queue": "https://sto1125.queue.core.windows.net/",
-                "table": "https://sto1125.table.core.windows.net/"
+                "table": "https://sto1125.table.core.windows.net/",
+                "microsoftEndpoints": {
+                  "web": "https://sto1125-microsoftrouting.web.core.windows.net/",
+                  "dfs": "https://sto1125-microsoftrouting.dfs.core.windows.net/",
+                  "blob": "https://sto1125-microsoftrouting.blob.core.windows.net/",
+                  "file": "https://sto1125-microsoftrouting.file.core.windows.net/",
+                  "queue": "https://sto1125-microsoftrouting.queue.core.windows.net/",
+                  "table": "https://sto1125-microsoftrouting.table.core.windows.net/"
+                },
+                "internetEndpoints": {
+                  "web": "https://sto1125-internetrouting.web.core.windows.net/",
+                  "dfs": "https://sto1125-internetrouting.dfs.core.windows.net/",
+                  "blob": "https://sto1125-internetrouting.blob.core.windows.net/",
+                  "file": "https://sto1125-internetrouting.file.core.windows.net/"
+                }
               },
               "primaryLocation": "eastus2euap",
               "provisioningState": "Succeeded",
+              "routingPreference": {
+                "routingChoice": "MicrosoftRouting",
+                "publishMicrosoftEndpoints": true,
+                "publishInternetEndpoints": true
+              },
               "secondaryLocation": "centraluseuap",
               "statusOfPrimary": "available",
               "statusOfSecondary": "available",
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json
index 9435b6eb1848..5a09784b26cf 100644
--- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json
+++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json
@@ -9,6 +9,11 @@
       "properties": {
         "networkAcls": {
           "defaultAction": "Allow"
+        },
+        "routingPreference": {
+          "routingChoice": "MicrosoftRouting",
+          "publishMicrosoftEndpoints": true,
+          "publishInternetEndpoints": true
         }
       }
     }
@@ -35,10 +40,29 @@
             "blob": "https://sto8596.blob.core.windows.net/",
             "file": "https://sto8596.file.core.windows.net/",
             "queue": "https://sto8596.queue.core.windows.net/",
-            "table": "https://sto8596.table.core.windows.net/"
+            "table": "https://sto8596.table.core.windows.net/",
+            "microsoftEndpoints": {
+              "web": "https://sto8596-microsoftrouting.web.core.windows.net/",
+              "dfs": "https://sto8596-microsoftrouting.dfs.core.windows.net/",
+              "blob": "https://sto8596-microsoftrouting.blob.core.windows.net/",
+              "file": "https://sto8596-microsoftrouting.file.core.windows.net/",
+              "queue": "https://sto8596-microsoftrouting.queue.core.windows.net/",
+              "table": "https://sto8596-microsoftrouting.table.core.windows.net/"
+            },
+            "internetEndpoints": {
+              "web": "https://sto8596-internetrouting.web.core.windows.net/",
+              "dfs": "https://sto8596-internetrouting.dfs.core.windows.net/",
+              "blob": "https://sto8596-internetrouting.blob.core.windows.net/",
+              "file": "https://sto8596-internetrouting.file.core.windows.net/"
+            }
           },
           "primaryLocation": "eastus2(stage)",
           "provisioningState": "Succeeded",
+          "routingPreference": {
+            "routingChoice": "MicrosoftRouting",
+            "publishMicrosoftEndpoints": true,
+            "publishInternetEndpoints": true
+          },
           "secondaryLocation": "northcentralus(stage)",
           "statusOfPrimary": "available",
           "statusOfSecondary": "available",
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json
index 3b8924b50edd..152e2623a191 100644
--- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json
+++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json
@@ -1750,12 +1750,12 @@
           "description": "Gets the dfs endpoint."
         },
         "microsoftEndpoints":{
-          "x-ms-client-flatten": true,
+          "x-ms-client-flatten": false,
           "$ref": "#/definitions/StorageAccountMicrosoftEndpoints",
           "description": "Gets the microsoft routing storage endpoints."
         },
         "internetEndpoints":{
-          "x-ms-client-flatten": true,
+          "x-ms-client-flatten": false,
           "$ref": "#/definitions/StorageAccountInternetEndpoints",
           "description": "Gets the internet routing storage endpoints"
         }
@@ -1856,7 +1856,7 @@
       "properties": {
         "routingChoice": {
           "type": "string",
-          "description": "Routing Choice defines the kind of network routing opted by the user. The default option is microsoft routing",
+          "description": "Routing Choice defines the kind of network routing opted by the user.",
           "enum": [
             "MicrosoftRouting",
             "InternetRouting"