diff --git a/specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/examples/EnvironmentsPatchSkuCapacity.json b/specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/examples/EnvironmentsPatchTags.json
similarity index 83%
rename from specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/examples/EnvironmentsPatchSkuCapacity.json
rename to specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/examples/EnvironmentsPatchTags.json
index f7da024b97f4..7d89abb50275 100644
--- a/specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/examples/EnvironmentsPatchSkuCapacity.json
+++ b/specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/examples/EnvironmentsPatchTags.json
@@ -3,10 +3,9 @@
     "subscriptionId": "subid",
     "resourceGroupName": "rg1",
     "environmentName": "env1",
-    "standardEnvironmentUpdateParameters": {
-      "sku": {
-        "name": "S1",
-        "capacity": 10
+    "environmentUpdateParameters": {
+      "tags": {
+        "someTag": "someTagValue"
       }
     },
     "api-version": "2018-08-15-preview"
@@ -19,7 +18,9 @@
         "name": "env1",
         "type": "Microsoft.TimeSeriesInsights/Environments",
         "kind": "Standard",
-        "tags": {},
+        "tags": {
+          "someTag": "someTagValue"
+        },
         "properties": {
           "dataRetentionTime": "P31D",
           "provisioningState": "Succeeded",
diff --git a/specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/timeseriesinsights.json b/specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/timeseriesinsights.json
index 4e115cfd1aa4..8ecaee789a01 100644
--- a/specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/timeseriesinsights.json
+++ b/specification/timeseriesinsights/resource-manager/Microsoft.TimeSeriesInsights/preview/2018-08-15-preview/timeseriesinsights.json
@@ -181,7 +181,7 @@
         "operationId": "Environments_Update",
         "x-ms-examples": {
           "EnvironmentsUpdate": {
-            "$ref": "./examples/EnvironmentsPatchSkuCapacity.json"
+            "$ref": "./examples/EnvironmentsPatchTags.json"
           }
         },
         "x-ms-long-running-operation": true,
@@ -197,11 +197,11 @@
             "$ref": "#/parameters/EnvironmentNameParameter"
           },
           {
-            "name": "standardEnvironmentUpdateParameters",
+            "name": "environmentUpdateParameters",
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/StandardEnvironmentUpdateParameters"
+              "$ref": "#/definitions/EnvironmentUpdateParameters"
             },
             "description": "Request object that contains the updated information for the environment."
           },
@@ -211,7 +211,7 @@
         ],
         "responses": {
           "200": {
-            "description": "The environment definition was successfully updated and is in the response. If the environment was updated synchronously, the response will include a provisioningState value of \"Succeeded\". If the environment was updated asynchronous, the response will include a provisioningState value of \"Updating\".  You can periodically get your environment definition and monitor progress of the update via the provisioningState property.",
+            "description": "The environment definition was successfully updated and is in the response. If the environment was updated synchronously, the response will include a provisioningState value of \"Succeeded\". If the environment was updated asynchronously, the response will include a provisioningState value of \"Updating\".  You can periodically get your environment definition and monitor progress of the update via the provisioningState property.",
             "schema": {
               "$ref": "#/definitions/EnvironmentResource"
             }
@@ -1547,7 +1547,7 @@
           "items": {
             "$ref": "#/definitions/TimeSeriesIdProperty"
           },
-          "description": "The list of event properties which will be used to partition data in the environment."
+          "description": "The list of event properties which will be used to partition data in the environment. Currently, only a single partition key property is supported."
         }
       },
       "required": [
@@ -1569,7 +1569,7 @@
           "description": "The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data."
         },
         "warmStoreConfiguration": {
-          "x-ms-client-flatten": true,
+          "x-ms-client-flatten": false,
           "$ref": "#/definitions/WarmStoreConfigurationProperties",
           "description": "The warm store configuration provides the details to create a warm store cache that will retain a copy of the environment's data available for faster query."
         }
@@ -1636,7 +1636,7 @@
           "description": "The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data."
         },
         "warmStoreConfiguration": {
-          "x-ms-client-flatten": true,
+          "x-ms-client-flatten": false,
           "$ref": "#/definitions/WarmStoreConfigurationProperties",
           "description": "The warm store configuration provides the details to create a warm store cache that will retain a copy of the environment's data available for faster query."
         }
@@ -1675,13 +1675,6 @@
             "name": "StorageLimitExceededBehavior",
             "modelAsString": true
           }
-        },
-        "partitionKeyProperties": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/TimeSeriesIdProperty"
-          },
-          "description": "The list of event properties which will be used to partition data in the environment."
         }
       }
     },
@@ -1694,7 +1687,7 @@
           "description": "The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data."
         },
         "warmStoreConfiguration": {
-          "x-ms-client-flatten": true,
+          "x-ms-client-flatten": false,
           "$ref": "#/definitions/WarmStoreConfigurationProperties",
           "description": "The warm store configuration provides the details to create a warm store cache that will retain a copy of the environment's data available for faster query."
         }
@@ -1848,6 +1841,10 @@
             "name": "Kind",
             "modelAsString": true
           }
+        },
+        "localTimestamp": {
+          "$ref": "#/definitions/LocalTimestamp",
+          "description": "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events."
         }
       },
       "required": [
@@ -1911,6 +1908,7 @@
     },
     "EventHubEventSourceUpdateParameters": {
       "type": "object",
+      "x-ms-discriminator-value": "Microsoft.EventHub",
       "properties": {
         "properties": {
           "x-ms-client-flatten": true,
@@ -1926,6 +1924,7 @@
       "description": "Parameters supplied to the Update Event Source operation to update an EventHub event source."
     },
     "IoTHubEventSourceUpdateParameters": {
+      "x-ms-discriminator-value": "Microsoft.IoTHub",
       "type": "object",
       "properties": {
         "properties": {
@@ -1995,7 +1994,7 @@
       "description": "An event source that receives its data from an Azure EventHub."
     },
     "IoTHubEventSourceResource": {
-      "x-ms-discriminator-value": "Microsoft.IotHub",
+      "x-ms-discriminator-value": "Microsoft.IoTHub",
       "properties": {
         "properties": {
           "x-ms-client-flatten": true,
@@ -2160,9 +2159,7 @@
           "description": "An enum that represents the format of the local timestamp property that needs to be set.",
           "type": "string",
           "enum": [
-            "Embedded",
-            "Iana",
-            "TimeSpan"
+            "Embedded"
           ],
           "x-ms-enum": {
             "name": "LocalTimestampFormat",