diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicAKSCompute.json
index 1b668ec3065d..5a9b40a2241e 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicAKSCompute.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicAKSCompute.json
@@ -21,7 +21,7 @@
                 "location": "eastus",
                 "properties": {
                     "computeType": "AKS",
-                    "provisioningState": "Succeeded"
+                    "provisioningState": "Creating"
                 }
             }
         },
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicBatchAICompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicBatchAICompute.json
index 7a1eec345fce..d3f2ffe05ffd 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicBatchAICompute.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicBatchAICompute.json
@@ -21,7 +21,7 @@
                 "location": "eastus",
                 "properties": {
                     "computeType": "BatchAI",
-                    "provisioningState": "Succeeded"
+                    "provisioningState": "Creating"
                 }
             }
         },
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicDataFactoryCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicDataFactoryCompute.json
index d23cfe7e2d97..5dcfa2b1644b 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicDataFactoryCompute.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/createBasicDataFactoryCompute.json
@@ -21,7 +21,7 @@
                 "location": "eastus",
                 "properties": {
                     "computeType": "DataFactory",
-                    "provisioningState": "Succeeded"
+                    "provisioningState": "Creating"
                 }
             }
         },
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getAKSCompute.json
index f8aee325bc18..2b032361a3fd 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getAKSCompute.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getAKSCompute.json
@@ -17,22 +17,7 @@
                     "description": "some compute",
                     "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
                     "computeType": "AKS",
-                    "provisioningState": "Succeeded",
-                    "properties": {
-                        "clusterFqdn": "compute123-56826-c9b00420020b2-6a3f9fd6.hcp.eastus.azmk8s.io",
-                        "systemServices": [
-                            {
-                            "systemServiceType": "ScoringFrontEnd",
-                            "publicIpAddress": "1.1.1.1",
-                            "version": "prod/1.20180420.3/v1.0.preview/c8aeb0be7644c2107855662bcc5471ab2b2d5521"
-                            }
-                        ],
-                        "agentCount": 4,
-                        "agentVmSize": "Standard_D3_v2",
-                        "sslConfiguration": {
-                            "status": "Disabled"
-                        }
-                    }
+                    "provisioningState": "Succeeded"
                 }
             }
         }
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getBatchAICompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getBatchAICompute.json
index c3da36c97832..5e5d75a75a47 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getBatchAICompute.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getBatchAICompute.json
@@ -17,16 +17,7 @@
                     "description": "some compute",
                     "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.BatchAI/clusters/compute123-ccb488844dcc2",
                     "computeType": "BatchAI",
-                    "provisioningState": "Succeeded",
-                    "properties": {
-                        "vmSize": "STANDARD_NC6",
-                        "vmPriority": "dedicated",
-                        "scaleSettings": {
-                            "maxNodeCount": 4,
-                            "minNodeCount": 4,
-                            "autoScaleEnabled": false
-                        }
-                    }
+                    "provisioningState": "Succeeded"
                 }
             }
         }
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getComputes.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getComputes.json
index efa83159b759..899e990ea9ef 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getComputes.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getComputes.json
@@ -18,22 +18,7 @@
                             "description": "some compute",
                             "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
                             "computeType": "AKS",
-                            "provisioningState": "Succeeded",
-                            "properties": {
-                                "clusterFqdn": "compute123-56826-c9b00420020b2-6a3f9fd6.hcp.eastus.azmk8s.io",
-                                "systemServices": [
-                                    {
-                                    "systemServiceType": "ScoringFrontEnd",
-                                    "publicIpAddress": "1.1.1.1",
-                                    "version": "prod/1.20180420.3/v1.0.preview/c8aeb0be7644c2107855662bcc5471ab2b2d5521"
-                                    }
-                                ],
-                                "agentCount": 4,
-                                "agentVmSize": "Standard_D3_v2",
-                                "sslConfiguration": {
-                                    "status": "Disabled"
-                                }
-                            }
+                            "provisioningState": "Succeeded"
                         }
                     },
                     {
@@ -45,25 +30,11 @@
                             "description": "some compute",
                             "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute1234-56826-c9b00420020b2",
                             "computeType": "AKS",
-                            "provisioningState": "Succeeded",
-                            "properties": {
-                                "clusterFqdn": "compute123-56826-c9b00420020b2-6a3f9fd6.hcp.eastus.azmk8s.io",
-                                "systemServices": [
-                                    {
-                                    "systemServiceType": "ScoringFrontEnd",
-                                    "publicIpAddress": "1.1.1.1",
-                                    "version": "prod/1.20180420.3/v1.0.preview/c8aeb0be7644c2107855662bcc5471ab2b2d5521"
-                                    }
-                                ],
-                                "agentCount": 4,
-                                "agentVmSize": "Standard_D3_v2",
-                                "sslConfiguration": {
-                                    "status": "Disabled"
-                                }
-                            }
+                            "provisioningState": "Succeeded"
                         }
                     }
-                ]
+                ],
+                "nextLink": "nextLink"
             }
         }
     }
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/systemUpdateCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/systemUpdateCompute.json
new file mode 100644
index 000000000000..e0b596696809
--- /dev/null
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/systemUpdateCompute.json
@@ -0,0 +1,18 @@
+{
+    "parameters": {
+        "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
+        "resourceGroupName": "testrg123",
+        "workspaceName": "workspaces123",
+        "computeName": "compute123",
+        "api-version": "2018-03-01-preview"
+    },
+    "responses": {
+        "200": {},
+        "202": {
+            "headers": {
+                "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...",
+                "Location": "https://management.azure.com/subscriptions/...pathToOperationResult..."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateAKSCompute.json
index 0009bddaa08c..77a00340ab83 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateAKSCompute.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateAKSCompute.json
@@ -29,22 +29,7 @@
                     "description": "some compute",
                     "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
                     "computeType": "AKS",
-                    "provisioningState": "Succeeded",
-                    "properties": {
-                        "clusterFqdn": "compute123-56826-c9b00420020b2-6a3f9fd6.hcp.eastus.azmk8s.io",
-                        "systemServices": [
-                            {
-                            "systemServiceType": "ScoringFrontEnd",
-                            "publicIpAddress": "1.1.1.1",
-                            "version": "prod/1.20180420.3/v1.0.preview/c8aeb0be7644c2107855662bcc5471ab2b2d5521"
-                            }
-                        ],
-                        "agentCount": 4,
-                        "agentVmSize": "Standard_D3_v2",
-                        "sslConfiguration": {
-                            "status": "Disabled"
-                        }
-                    }
+                    "provisioningState": "Updating"
                 }
             }
         },
@@ -58,22 +43,7 @@
                     "description": "some compute",
                     "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
                     "computeType": "AKS",
-                    "provisioningState": "Updating",
-                    "properties": {
-                        "clusterFqdn": "compute123-56826-c9b00420020b2-6a3f9fd6.hcp.eastus.azmk8s.io",
-                        "systemServices": [
-                            {
-                            "systemServiceType": "ScoringFrontEnd",
-                            "publicIpAddress": "1.1.1.1",
-                            "version": "prod/1.20180420.3/v1.0.preview/c8aeb0be7644c2107855662bcc5471ab2b2d5521"
-                            }
-                        ],
-                        "agentCount": 4,
-                        "agentVmSize": "Standard_D3_v2",
-                        "sslConfiguration": {
-                            "status": "Disabled"
-                        }
-                    }
+                    "provisioningState": "Updating"
                 }
             },
             "headers": {
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateBatchAICompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateBatchAICompute.json
index 48e76ab7ced7..a81692e3d392 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateBatchAICompute.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateBatchAICompute.json
@@ -35,16 +35,7 @@
                     "description": "some compute",
                     "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.BatchAI/clusters/compute123-ccb488844dcc2",
                     "computeType": "BatchAI",
-                    "provisioningState": "Succeeded",
-                    "properties": {
-                        "vmSize": "STANDARD_NC6",
-                        "vmPriority": "dedicated",
-                        "scaleSettings": {
-                            "maxNodeCount": 4,
-                            "minNodeCount": 4,
-                            "autoScaleEnabled": false
-                        }
-                    }
+                    "provisioningState": "Updating"
                 }
             }
         },
@@ -58,16 +49,7 @@
                     "description": "some compute",
                     "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.BatchAI/clusters/compute123-ccb488844dcc2",
                     "computeType": "BatchAI",
-                    "provisioningState": "Updating",
-                    "properties": {
-                        "vmSize": "STANDARD_NC6",
-                        "vmPriority": "dedicated",
-                        "scaleSettings": {
-                            "maxNodeCount": 4,
-                            "minNodeCount": 4,
-                            "autoScaleEnabled": false
-                        }
-                    }
+                    "provisioningState": "Updating"
                 }
             },
             "headers": {
diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/machineLearningServices.json
index 7ea8fbb05e33..796e2901aa57 100644
--- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/machineLearningServices.json
+++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2018-03-01-preview/machineLearningServices.json
@@ -403,7 +403,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes": {
       "get": {
         "tags": [
           "OperationalizationClusters",
@@ -450,7 +450,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}": {
       "get": {
         "tags": [
           "OperationalizationClusters",
@@ -500,8 +500,8 @@
           "MachineLearningComputes"
         ],
         "operationId": "MachineLearningCompute_CreateOrUpdate",
-        "x-ms-long-running-operation": true,
         "description": "Creates or updates compute. This call will overwrite a compute if it exists. This is a nonrecoverable operation. If your intent is to create a new compute, do a GET first to verify that it does not exist yet.",
+        "x-ms-long-running-operation": true,
         "x-ms-examples": {
           "Create a BatchAI Compute": { "$ref": "./examples/createBasicBatchAICompute.json" },
           "Create AKS Compute": { "$ref": "./examples/createBasicAKSCompute.json" },
@@ -562,8 +562,8 @@
           "MachineLearningComputes"
         ],
         "operationId": "MachineLearningCompute_Delete",
-        "x-ms-long-running-operation": true,
         "description": "Deletes specified Machine Learning compute.",
+        "x-ms-long-running-operation": true,
         "x-ms-examples": {
           "Delete Compute": { "$ref": "./examples/deleteCompute.json" }
         },
@@ -608,15 +608,68 @@
             }
           }
         }
+      },
+      "post": {
+        "tags": [
+          "OperationalizationClusters",
+          "MachineLearningComputes"
+        ],
+        "operationId": "MachineLearningCompute_SystemUpdate",
+        "description": "System Update On Machine Learning compute.",
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "System Update Compute": { "$ref": "./examples/systemUpdateCompute.json" }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/WorkspaceNameParameter"
+          },
+          {
+            "$ref": "#/parameters/ComputeNameParameter"
+          },
+          {
+            "$ref": "#/parameters/APIVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Compute System updated."
+          },
+          "202": {
+            "description": "Compute System Update initiated.",
+            "headers": {
+              "Azure-AsyncOperation": {
+                "description": "URI to poll for asynchronous operation status.",
+                "type": "string"
+              },
+              "Location": {
+                "description": "URI to poll for asynchronous operation result.",
+                "type": "string"
+              }
+            }
+          },
+          "default": {
+            "description": "Error response describing why the request failed.",
+            "schema": {
+              "$ref": "#/definitions/MachineLearningServiceError"
+            }
+          }
+        }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/listKeys": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/listKeys": {
       "post": {
         "tags": [
           "OperationalizationClusters",
           "MachineLearningComputes"
         ],
-        "operationId": "MachineLearningCompute_GetKeys",
+        "operationId": "MachineLearningCompute_ListKeys",
         "description": "Gets secrets related to Machine Learning compute (storage keys, service credentials, etc).",
         "x-ms-examples": {
           "List AKS Compute Keys": { "$ref": "./examples/listKeysAKSCompute.json" },
@@ -1067,6 +1120,10 @@
           "description": "The type of compute",
           "$ref": "#/definitions/ComputeType"
         },
+        "computeLocation": {
+          "description": "Location for the underlying compute",
+          "type": "string"
+        },
         "provisioningState": {
           "type": "string",
           "description": "The provision state of the cluster. Valid values are Unknown, Updating, Provisioning, Succeeded, and Failed.",
@@ -1210,6 +1267,14 @@
                   "description": "Virtual Machine size",
                   "type": "string"
                 },
+                "sshPort": {
+                  "description": "Port open for ssh connections.",
+                  "type": "integer"
+                },
+                "address": {
+                  "description": "Public IP address of the virtual machine.",
+                  "type": "string"
+                },
                 "administratorAccount": {
                   "description": "Admin credentials for virtual machine",
                   "$ref": "#/definitions/VirtualMachineSshCredentials"
@@ -1221,6 +1286,37 @@
       ],
       "x-ms-discriminator-value": "VirtualMachine"
     },
+    "HDInsight": {
+      "description": "A HDInsight compute.",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Compute"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "properties": {
+              "type": "object",
+              "properties": {
+                "sshPort": {
+                  "description": "Port open for ssh connections on the master node of the cluster.",
+                  "type": "integer"
+                },
+                "address": {
+                  "description": "Public IP address of the master node of the cluster.",
+                  "type": "string"
+                },
+                "administratorAccount": {
+                  "description": "Admin credentials for master node of the cluster",
+                  "$ref": "#/definitions/VirtualMachineSshCredentials"
+                }
+              }
+            }
+          }
+        }
+      ],
+      "x-ms-discriminator-value": "HDInsight"
+    },
     "DataFactory": {
       "description": "A DataFactory compute.",
       "allOf": [
@@ -1400,7 +1496,8 @@
         "AKS",
         "BatchAI",
         "DataFactory",
-        "VirtualMachine"
+        "VirtualMachine",
+        "HDInsight"
       ],
       "x-ms-enum": {
         "name": "ComputeType",