diff --git a/custom-words.txt b/custom-words.txt
index ce169f4f0b37..44203b06ab76 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -1602,6 +1602,7 @@ VMQS
 vmsizes
 VMSS
 VMSSVM
+vmuuid
 vmware
 vmwaretools
 VMXNET
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/assessments.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/assessments.json
new file mode 100644
index 000000000000..9df7c5685835
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/assessments.json
@@ -0,0 +1,374 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Security Center",
+    "description": "API spec for Microsoft.Security (Azure Security Center) resource provider",
+    "version": "2019-01-01-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": {
+    "/{scope}/providers/Microsoft.Security/assessments": {
+      "get": {
+        "x-ms-examples": {
+          "List security assessments": {
+            "$ref": "./examples/Assessments/ListAssessments_example.json"
+          }
+        },
+        "tags": [
+          "Assessments"
+        ],
+        "description": "Get security assessments on all your scanned resources inside a scope",
+        "operationId": "Assessments_List",
+        "parameters": [
+          {
+            "$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
+          },
+          {
+            "$ref": "../../../common/v1/types.json#/parameters/Scope"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SecurityAssessmentList"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "../../../common/v1/types.json#/definitions/CloudError"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/{resourceId}/providers/Microsoft.Security/assessments/{assessmentName}": {
+      "get": {
+        "x-ms-examples": {
+          "Get security recommendation task from security data location": {
+            "$ref": "./examples/Assessments/GetAssessment_example.json"
+          },
+          "Get security recommendation task from security data location with expand parameter": {
+            "$ref": "./examples/Assessments/GetAssessmentWithExpand_example.json"
+          }
+        },
+        "tags": [
+          "Assessments"
+        ],
+        "description": "Get a security assessment on your scanned resource",
+        "operationId": "Assessments_Get",
+        "parameters": [
+          {
+            "$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
+          },
+          {
+            "$ref": "../../../common/v1/types.json#/parameters/ResourceId"
+          },
+          {
+            "$ref": "#/parameters/AssessmentName"
+          },
+          {
+            "$ref": "#/parameters/ExpandAssessments"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SecurityAssessment"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "../../../common/v1/types.json#/definitions/CloudError"
+            }
+          }
+        }
+      },
+      "put": {
+        "x-ms-examples": {
+          "Create security recommendation task on a resource": {
+            "$ref": "./examples/Assessments/PutAssessment_example.json"
+          }
+        },
+        "tags": [
+          "Assessments"
+        ],
+        "description": "Create a security assessment on your resource. An assessment metadata that describes this assessment must be predefined with the same name before inserting the assessment result",
+        "operationId": "Assessments_CreateOrUpdate",
+        "parameters": [
+          {
+            "$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
+          },
+          {
+            "$ref": "../../../common/v1/types.json#/parameters/ResourceId"
+          },
+          {
+            "$ref": "#/parameters/AssessmentName"
+          },
+          {
+            "$ref": "#/parameters/AssessmentBody"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Created",
+            "schema": {
+              "$ref": "#/definitions/SecurityAssessment"
+            }
+          },
+          "200": {
+            "description": "OK - Updated",
+            "schema": {
+              "$ref": "#/definitions/SecurityAssessment"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "../../../common/v1/types.json#/definitions/CloudError"
+            }
+          }
+        }
+      },
+      "delete": {
+        "x-ms-examples": {
+          "Delete a security recommendation task on a resource": {
+            "$ref": "./examples/Assessments/DeleteAssessment_example.json"
+          }
+        },
+        "tags": [
+          "Assessments"
+        ],
+        "description": "Delete a security assessment on your resource. An assessment metadata that describes this assessment must be predefined with the same name before inserting the assessment result",
+        "operationId": "Assessments_Delete",
+        "parameters": [
+          {
+            "$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
+          },
+          {
+            "$ref": "../../../common/v1/types.json#/parameters/ResourceId"
+          },
+          {
+            "$ref": "#/parameters/AssessmentName"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK - Assessment was deleted"
+          },
+          "204": {
+            "description": "No Content - Assessment does not exist"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "../../../common/v1/types.json#/definitions/CloudError"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "SecurityAssessmentList": {
+      "type": "object",
+      "description": "Page of a security assessments list",
+      "properties": {
+        "value": {
+          "description": "Collection of security assessments in this page",
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SecurityAssessment"
+          }
+        },
+        "nextLink": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The URI to fetch the next page."
+        }
+      }
+    },
+    "SecurityAssessment": {
+      "type": "object",
+      "description": "Security assessment on a resource",
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SecurityAssessmentProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "../../../common/v1/types.json#/definitions/Resource"
+        }
+      ]
+    },
+    "SecurityAssessmentProperties": {
+      "type": "object",
+      "description": "Describes properties of an assessment.",
+      "properties": {
+        "resourceDetails": {
+          "$ref": "../../../common/v1/types.json#/definitions/ResourceDetails"
+        },
+        "displayName": {
+          "readOnly": true,
+          "type": "string",
+          "description": "User friendly display name of the assessment"
+        },
+        "status": {
+          "$ref": "#/definitions/AssessmentStatus"
+        },
+        "additionalData": {
+          "type": "object",
+          "description": "Additional data regarding the assessment",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "links": {
+          "$ref": "#/definitions/AssessmentLinks"
+        }
+      },
+      "required": [
+        "resourceDetails",
+        "status"
+      ]
+    },
+    "AssessmentLinks": {
+      "type": "object",
+      "description": "Links relevant to the assessment",
+      "readOnly": true,
+      "properties": {
+        "azurePortalUri": {
+          "type": "string",
+          "description": "Link to assessment in Azure Portal",
+          "readOnly": true
+        }
+      }
+    },
+    "AssessmentStatus": {
+      "type": "object",
+      "description": "The result of the assessment",
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "Programmatic code for the status of the assessment",
+          "enum": [
+            "Healthy",
+            "Unhealthy",
+            "NotApplicable"
+          ],
+          "x-ms-enum": {
+            "name": "AssessmentStatusCode",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Healthy",
+                "description": "The resource is healthy"
+              },
+              {
+                "value": "Unhealthy",
+                "description": "The resource has a security issue that needs to be addressed"
+              },
+              {
+                "value": "NotApplicable",
+                "description": "Assessment for this resource did not happen"
+              }
+            ]
+          }
+        },
+        "cause": {
+          "type": "string",
+          "description": "Programmatic code for the cause of the assessment status"
+        },
+        "description": {
+          "type": "string",
+          "description": "Human readable description of the assessment status"
+        }
+      },
+      "required": [
+        "code"
+      ]
+    }
+  },
+  "parameters": {
+    "ExpandAssessments": {
+      "name": "$expand",
+      "in": "query",
+      "required": false,
+      "type": "string",
+      "description": "OData expand. Optional.",
+      "x-ms-parameter-location": "method",
+      "enum": [
+        "links",
+        "metadata"
+      ],
+      "x-ms-enum": {
+        "name": "ExpandEnum",
+        "modelAsString": true,
+        "values": [
+          {
+            "value": "links",
+            "description": "All links associated with an assessment"
+          },
+          {
+            "value": "metadata",
+            "description": "Assessment metadata"
+          }
+        ]
+      }
+    },
+    "AssessmentName": {
+      "name": "assessmentName",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "The Assessment Key - Unique key for the assessment type",
+      "x-ms-parameter-location": "method"
+    },
+    "AssessmentBody": {
+      "name": "assessment",
+      "in": "body",
+      "required": true,
+      "schema": {
+        "$ref": "#/definitions/SecurityAssessment"
+      },
+      "description": "Calculated assessment on a pre-defined assessment metadata",
+      "x-ms-parameter-location": "method"
+    }
+  }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/DeleteAssessment_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/DeleteAssessment_example.json
new file mode 100644
index 000000000000..d4c39e23b6dc
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/DeleteAssessment_example.json
@@ -0,0 +1,11 @@
+{
+  "parameters": {
+    "api-version": "2019-01-01-preview",
+    "resourceId": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2",
+    "assessmentName": "8bb8be0a-6010-4789-812f-e4d661c4ed0e"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/GetAssessmentWithExpand_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/GetAssessmentWithExpand_example.json
new file mode 100644
index 000000000000..19b0dcfa2ba4
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/GetAssessmentWithExpand_example.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "api-version": "2019-01-01-preview",
+    "resourceId": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2",
+    "assessmentName": "21300918-b2e3-0346-785f-c77ff57d243b",
+    "$expand": "links"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2/providers/Microsoft.Security/assessments/21300918-b2e3-0346-785f-c77ff57d243b",
+        "name": "21300918-b2e3-0346-785f-c77ff57d243b",
+        "type": "Microsoft.Security/assessments",
+        "properties": {
+          "resourceDetails": {
+            "source": "Azure",
+            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2"
+          },
+          "displayName": "Install endpoint protection solution on virtual machine scale sets",
+          "status": {
+            "code": "NotApplicable",
+            "cause": "OffByPolicy",
+            "description": "The effective policy for the assessment was evaluated to off - use Microsoft.Authorization/policyAssignments to turn this assessment on"
+          },
+          "additionalData": {
+            "linkedWorkspaceId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.OperationalInsights/workspaces/myLaWorkspace"
+          },
+          "links": {
+            "azurePortalUri": "https://www.portal.azure.com/?fea#blade/Microsoft_Azure_Security/RecommendationsBlade/assessmentKey/21300918-b2e3-0346-785f-c77ff57d243b"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/GetAssessment_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/GetAssessment_example.json
new file mode 100644
index 000000000000..652044282e4f
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/GetAssessment_example.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "api-version": "2019-01-01-preview",
+    "resourceId": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2",
+    "assessmentName": "21300918-b2e3-0346-785f-c77ff57d243b"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2/providers/Microsoft.Security/assessments/21300918-b2e3-0346-785f-c77ff57d243b",
+        "name": "21300918-b2e3-0346-785f-c77ff57d243b",
+        "type": "Microsoft.Security/assessments",
+        "properties": {
+          "resourceDetails": {
+            "source": "Azure",
+            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2"
+          },
+          "displayName": "Install endpoint protection solution on virtual machine scale sets",
+          "status": {
+            "code": "NotApplicable",
+            "cause": "OffByPolicy",
+            "description": "The effective policy for the assessment was evaluated to off - use Microsoft.Authorization/policyAssignments to turn this assessment on"
+          },
+          "additionalData": {
+            "linkedWorkspaceId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.OperationalInsights/workspaces/myLaWorkspace"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/ListAssessments_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/ListAssessments_example.json
new file mode 100644
index 000000000000..e1748ee2443c
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/ListAssessments_example.json
@@ -0,0 +1,49 @@
+{
+  "parameters": {
+    "api-version": "2019-01-01-preview",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1/providers/Microsoft.Security/assessments/21300918-b2e3-0346-785f-c77ff57d243b",
+            "name": "21300918-b2e3-0346-785f-c77ff57d243b",
+            "type": "Microsoft.Security/assessments",
+            "properties": {
+              "resourceDetails": {
+                "source": "Azure",
+                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1"
+              },
+              "displayName": "Install endpoint protection solution on virtual machine scale sets",
+              "status": {
+                "code": "Healthy"
+              }
+            }
+          },
+          {
+            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2/providers/Microsoft.Security/assessments/21300918-b2e3-0346-785f-c77ff57d243b",
+            "name": "21300918-b2e3-0346-785f-c77ff57d243b",
+            "type": "Microsoft.Security/assessments",
+            "properties": {
+              "resourceDetails": {
+                "source": "Azure",
+                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2"
+              },
+              "displayName": "Install endpoint protection solution on virtual machine scale sets",
+              "status": {
+                "code": "NotApplicable",
+                "cause": "OffByPolicy",
+                "description": "The effective policy for the assessment was evaluated to off - use Microsoft.Authorization/policyAssignments to turn this assessment on"
+              },
+              "additionalData": {
+                "linkedWorkspaceId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.OperationalInsights/workspaces/myLaWorkspace"
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/PutAssessment_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/PutAssessment_example.json
new file mode 100644
index 000000000000..f99ff77dc262
--- /dev/null
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/Assessments/PutAssessment_example.json
@@ -0,0 +1,53 @@
+{
+  "parameters": {
+    "api-version": "2019-01-01-preview",
+    "resourceId": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss2",
+    "assessmentName": "8bb8be0a-6010-4789-812f-e4d661c4ed0e",
+    "assessment": {
+      "properties": {
+        "resourceDetails": {
+          "source": "Azure"
+        },
+        "status": {
+          "code": "Healthy"
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1/providers/Microsoft.Security/assessments/8bb8be0a-6010-4789-812f-e4d661c4ed0e",
+        "name": "8bb8be0a-6010-4789-812f-e4d661c4ed0e",
+        "type": "Microsoft.Security/assessments",
+        "properties": {
+          "resourceDetails": {
+            "source": "Azure",
+            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1/providers/Microsoft.Security/assessments/8bb8be0a-6010-4789-812f-e4d661c4ed0e"
+          },
+          "displayName": "Install internal agent on VM",
+          "status": {
+            "code": "Healthy"
+          }
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1/providers/Microsoft.Security/assessments/8bb8be0a-6010-4789-812f-e4d661c4ed0e",
+        "name": "8bb8be0a-6010-4789-812f-e4d661c4ed0e",
+        "type": "Microsoft.Security/assessments",
+        "properties": {
+          "resourceDetails": {
+            "source": "Azure",
+            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1/providers/Microsoft.Security/assessments/8bb8be0a-6010-4789-812f-e4d661c4ed0e"
+          },
+          "displayName": "Install internal agent on VM",
+          "status": {
+            "code": "Healthy"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
index 75e3ec273651..7e0b487c7586 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
@@ -236,87 +236,19 @@
           "description": "The date and time the sub-assessment was generated"
         },
         "resourceDetails": {
-          "$ref": "#/definitions/ResourceDetails"
+          "$ref": "../../../common/v1/types.json#/definitions/ResourceDetails"
         },
         "additionalData": {
           "$ref": "#/definitions/AdditionalData"
         }
       }
     },
-    "ResourceDetails": {
-      "type": "object",
-      "description": "Details of the resource that was assessed",
-      "discriminator": "source",
-      "properties": {
-        "source": {
-          "readOnly": true,
-          "type": "string",
-          "description": "The platform where the assessed resource resides",
-          "enum": [
-            "Azure",
-            "Aws"
-          ],
-          "x-ms-enum": {
-            "name": "Source",
-            "modelAsString": true,
-            "values": [
-              {
-                "value": "Azure"
-              },
-              {
-                "value": "Aws"
-              }
-            ]
-          }
-        }
-      }
-    },
-    "AzureResourceDetails": {
-      "type": "object",
-      "description": "Details of the resource that was assessed",
-      "x-ms-discriminator-value": "Azure",
-      "allOf": [
-        {
-          "$ref": "#/definitions/ResourceDetails"
-        }
-      ],
-      "properties": {
-        "id": {
-          "readOnly": true,
-          "type": "string",
-          "description": "Azure resource ID of the assessed resource"
-        }
-      }
-    },
-    "AwsResourceDetails": {
-      "type": "object",
-      "description": "Details of the resource that was assessed",
-      "x-ms-discriminator-value": "Aws",
-      "allOf": [
-        {
-          "$ref": "#/definitions/ResourceDetails"
-        }
-      ],
-      "properties": {
-        "accountId": {
-          "readOnly": true,
-          "type": "string",
-          "description": "AWS account ID"
-        },
-        "awsResourceId": {
-          "readOnly": true,
-          "type": "string",
-          "description": "AWS resource ID. can be ARN or other"
-        }
-      }
-    },
     "AdditionalData": {
       "type": "object",
       "description": "Details of the sub-assessment",
       "discriminator": "assessedResourceType",
       "properties": {
         "assessedResourceType": {
-          "readOnly": true,
           "type": "string",
           "description": "Sub-assessment resource type",
           "enum": [
@@ -340,7 +272,10 @@
             ]
           }
         }
-      }
+      },
+      "required": [
+        "assessedResourceType"
+      ]
     },
     "SubAssessmentStatus": {
       "type": "object",
diff --git a/specification/security/resource-manager/common/v1/types.json b/specification/security/resource-manager/common/v1/types.json
index 876690153551..5996220fe2bc 100644
--- a/specification/security/resource-manager/common/v1/types.json
+++ b/specification/security/resource-manager/common/v1/types.json
@@ -158,6 +158,89 @@
     "AscLocationProperties": {
       "type": "object",
       "description": "An empty set of properties"
+    },
+    "ResourceDetails": {
+      "type": "object",
+      "description": "Details of the resource that was assessed",
+      "discriminator": "source",
+      "properties": {
+        "source": {
+          "type": "string",
+          "description": "The platform where the assessed resource resides",
+          "enum": [
+            "Azure",
+            "OnPremise"
+          ],
+          "x-ms-enum": {
+            "name": "source",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Azure",
+                "description": "Resource is in Azure"
+              },
+              {
+                "value": "OnPremise",
+                "description": "Resource in an on premise machine connected to Azure cloud"
+              }
+            ]
+          }
+        }
+      },
+      "required": [
+        "source"
+      ]
+    },
+    "AzureResourceDetails": {
+      "type": "object",
+      "description": "Details of the Azure resource that was assessed",
+      "x-ms-discriminator-value": "Azure",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ResourceDetails"
+        }
+      ],
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Azure resource Id of the assessed resource"
+        }
+      }
+    },
+    "OnPremiseResourceDetails": {
+      "type": "object",
+      "description": "Details of the On Premise resource that was assessed",
+      "x-ms-discriminator-value": "OnPremise",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ResourceDetails"
+        }
+      ],
+      "properties": {
+        "workspaceId": {
+          "type": "string",
+          "description": "Azure resource Id of the workspace the machine is attached to"
+        },
+        "vmuuid": {
+          "type": "string",
+          "description": "The unique Id of the machine"
+        },
+        "sourceComputerId": {
+          "type": "string",
+          "description": "The oms agent Id installed on the machine"
+        },
+        "machineName": {
+          "type": "string",
+          "description": "The name of the machine"
+        }
+      },
+      "required": [
+        "workspaceId",
+        "vmuuid",
+        "sourceComputerId",
+        "machineName"
+      ]
     }
   },
   "parameters": {
diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md
index b9ecf45969c6..5819b640cec4 100644
--- a/specification/security/resource-manager/readme.md
+++ b/specification/security/resource-manager/readme.md
@@ -158,6 +158,7 @@ input-file:
 - Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
 - Microsoft.Security/preview/2019-01-01-preview/automations.json
 - Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json
+- Microsoft.Security/preview/2019-01-01-preview/assessments.json
 
 # Needed when there is more than one input file
 override-info:
@@ -218,6 +219,8 @@ These settings apply only when `--tag=package-2019-01-preview-only` is specified
 input-file:
 - Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json
 - Microsoft.Security/preview/2019-01-01-preview/serverVulnerabilityAssessments.json
+- Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json
+- Microsoft.Security/preview/2019-01-01-preview/assessments.json
 
 # Needed when there is more than one input file
 override-info:
@@ -326,47 +329,48 @@ AutoRest V3 generators require the use of `--tag=all-api-versions` to select api
 
 This block is updated by an automatic script. Edits may be lost!
 
-``` yaml $(tag) == 'all-api-versions' /* autogenerated */
-# include the azure profile definitions from the standard location
-require: $(this-folder)/../../../profiles/readme.md
-
-# all the input files across all versions
-input-file:
-  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/automations.json
-  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
-  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/pricings.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/securityContacts.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/workspaceSettings.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/autoProvisioningSettings.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/compliances.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/advancedThreatProtectionSettings.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/deviceSecurityGroups.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/settings.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/informationProtectionPolicies.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/operations.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/locations.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/tasks.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/alerts.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/discoveredSecuritySolutions.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/jitNetworkAccessPolicies.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/applicationWhitelistings.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/externalSecuritySolutions.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/topologies.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/allowedConnections.json
-  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/adaptiveNetworkHardenings.json
-  - $(this-folder)/Microsoft.Security/stable/2018-06-01/pricings.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutions.json
-  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutionAnalytics.json
-  - $(this-folder)/Microsoft.Security/stable/2019-01-01/alerts.json
-  - $(this-folder)/Microsoft.Security/stable/2017-08-01/complianceResults.json
-  - $(this-folder)/Microsoft.Security/stable/2019-01-01/settings.json
-  - $(this-folder)/Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json
-  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json
-  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotSecuritySolutionAnalytics.json
-  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/serverVulnerabilityAssessments.json
-  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json
-
+``` yaml $(tag) == 'all-api-versions' /* autogenerated */
+# include the azure profile definitions from the standard location
+require: $(this-folder)/../../../profiles/readme.md
+
+# all the input files across all versions
+input-file:
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/automations.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/pricings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/securityContacts.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/workspaceSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/autoProvisioningSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/compliances.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/advancedThreatProtectionSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/deviceSecurityGroups.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/settings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/informationProtectionPolicies.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/operations.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/locations.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/tasks.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/alerts.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/discoveredSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/jitNetworkAccessPolicies.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/applicationWhitelistings.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/externalSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/topologies.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/allowedConnections.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/adaptiveNetworkHardenings.json
+  - $(this-folder)/Microsoft.Security/stable/2018-06-01/pricings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutionAnalytics.json
+  - $(this-folder)/Microsoft.Security/stable/2019-01-01/alerts.json
+  - $(this-folder)/Microsoft.Security/stable/2017-08-01/complianceResults.json
+  - $(this-folder)/Microsoft.Security/stable/2019-01-01/settings.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotSecuritySolutionAnalytics.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/serverVulnerabilityAssessments.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessments.json
+
 ```
 
 If there are files that should not be in the `all-api-versions` set,