diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/devices.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/devices.json
index be173e7e497b..6a3e58596326 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/devices.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/devices.json
@@ -420,20 +420,17 @@
           "maximum": 100,
           "description": "risk score of the device."
         },
-        "sensorName": {
+        "sensors": {
           "readOnly": true,
-          "type": "string",
-          "description": "When the device is unmanaged, the sensor that scanned this device."
-        },
-        "siteName": {
-          "readOnly": true,
-          "type": "string",
-          "description": "The sensor site name."
+          "type": "array",
+          "description": "List of sensors that scanned this device.",
+          "items": {
+            "$ref": "#/definitions/Sensor"
+          }
         },
-        "zoneName": {
+        "site": {
           "readOnly": true,
-          "type": "string",
-          "description": "The sensor zone name."
+          "$ref": "#/definitions/Site"
         },
         "deviceStatus": {
           "readOnly": true,
@@ -601,6 +598,33 @@
           "description": "list of protocol identifiers."
         }
       }
+    },
+    "Sensor": {
+      "type": "object",
+      "description": "Sensor data",
+      "properties": {
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Sensor name"
+        },
+        "zone": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Zone Name."
+        }
+      }
+    },
+    "Site": {
+      "type": "object",
+      "description": "Site data",
+      "properties": {
+        "displayName": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Site display name"
+        }
+      }
     }
   },
   "parameters": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevice.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevice.json
index 162758cf19c3..b90115600eb5 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevice.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevice.json
@@ -62,9 +62,15 @@
           "programmingState": "NotProgrammingDevice",
           "scanningFunctionality": "NotScannerDevice",
           "riskScore": 100,
-          "sensorName": "mySensor",
-          "siteName": "mySite",
-          "zoneName": "myZone",
+          "sensors": [
+            {
+              "name": "mySensorName",
+              "zone": "myZoneName"
+            }
+          ],
+          "site": {
+            "displayName": "mySite"
+          },
           "deviceStatus": "Active"
         }
       }
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForHub.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForHub.json
index 9bff57945fd5..777df993569e 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForHub.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForHub.json
@@ -63,9 +63,15 @@
               "programmingState": "NotProgrammingDevice",
               "scanningFunctionality": "NotScannerDevice",
               "riskScore": 100,
-              "sensorName": "mySensor",
-              "siteName": "mySite",
-              "zoneName": "myZone",
+              "sensors": [
+                {
+                  "name": "mySensorName",
+                  "zone": "myZoneName"
+                }
+              ],
+              "site": {
+                "displayName": "mySite"
+              },
               "deviceStatus": "Active"
             }
           }
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForSubscription.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForSubscription.json
index 8552d79ac8a6..b4aca357ced5 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForSubscription.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForSubscription.json
@@ -63,9 +63,15 @@
               "programmingState": "NotProgrammingDevice",
               "scanningFunctionality": "NotScannerDevice",
               "riskScore": 100,
-              "sensorName": "mySensor",
-              "siteName": "mySite",
-              "zoneName": "myZone",
+              "sensors": [
+                {
+                  "name": "mySensorName",
+                  "zone": "myZoneName"
+                }
+              ],
+              "site": {
+                "displayName": "mySite"
+              },
               "deviceStatus": "Active"
             }
           }