diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
index 34b385655c4..67cdf57a338 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -515,6 +515,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_POLICY (
 CREATE VIEW DEVICES_VIEW_1 AS
 SELECT
 DEVICE_INFO.DEVICE_ID,
+DEVICE_INFO.DEVICE_IDENTIFICATION,
 DEVICE_INFO.PLATFORM,
 DEVICE_INFO.OWNERSHIP,
 DEVICE_INFO.CONNECTIVITY_STATUS,
@@ -524,6 +525,7 @@ DEVICE_INFO.TENANT_ID
 FROM
 (SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_TYPE.NAME AS PLATFORM,
 DM_ENROLMENT.OWNERSHIP,
 DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
@@ -542,6 +544,7 @@ ORDER BY DEVICE_INFO.DEVICE_ID;
 CREATE VIEW DEVICES_VIEW_2 AS
 SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_DETAIL.DEVICE_MODEL,
 DM_DEVICE_DETAIL.VENDOR,
 DM_DEVICE_DETAIL.OS_VERSION,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
index e709195f193..e18fcf915a5 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -507,6 +507,7 @@ CREATE INDEX FK_DM_DEVICE_DETAILS_DEVICE_idx ON DM_DEVICE_DETAIL (DEVICE_ID ASC)
 CREATE VIEW DEVICES_VIEW_1 AS
 SELECT TOP 100 PERCENT
 DEVICE_INFO.DEVICE_ID,
+DEVICE_INFO.DEVICE_IDENTIFICATION,
 DEVICE_INFO.PLATFORM,
 DEVICE_INFO.OWNERSHIP,
 DEVICE_INFO.CONNECTIVITY_STATUS,
@@ -517,6 +518,7 @@ DEVICE_INFO.TENANT_ID
 FROM
 (SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_TYPE.NAME AS PLATFORM,
 DM_ENROLMENT.OWNERSHIP,
 DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
@@ -537,6 +539,7 @@ GO
 CREATE VIEW DEVICES_VIEW_2 AS
 SELECT TOP 100 PERCENT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_DETAIL.DEVICE_MODEL,
 DM_DEVICE_DETAIL.VENDOR,
 DM_DEVICE_DETAIL.OS_VERSION,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
index e031ea2fe2f..0fd8889cc33 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -527,6 +527,7 @@ ENGINE = InnoDB;
 CREATE VIEW DEVICE_INFO_VIEW AS
 SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_TYPE.NAME AS PLATFORM,
 DM_ENROLMENT.OWNERSHIP,
 DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
@@ -544,6 +545,7 @@ FROM DM_POLICY_COMPLIANCE_STATUS;
 CREATE VIEW DEVICES_VIEW_1 AS
 SELECT
 DEVICE_INFO_VIEW.DEVICE_ID,
+DEVICE_INFO_VIEW.DEVICE_IDENTIFICATION,
 DEVICE_INFO_VIEW.PLATFORM,
 DEVICE_INFO_VIEW.OWNERSHIP,
 DEVICE_INFO_VIEW.CONNECTIVITY_STATUS,
@@ -560,6 +562,7 @@ ORDER BY DEVICE_INFO_VIEW.DEVICE_ID;
 CREATE VIEW DEVICES_VIEW_2 AS
 SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_DETAIL.DEVICE_MODEL,
 DM_DEVICE_DETAIL.VENDOR,
 DM_DEVICE_DETAIL.OS_VERSION,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
index c4a2fd0267c..7a41ae3a66e 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -853,6 +853,7 @@ WHEN (NEW.ID IS NULL)
 CREATE VIEW DEVICES_VIEW_1 AS
 SELECT
 DEVICE_INFO.DEVICE_ID,
+DEVICE_INFO.DEVICE_IDENTIFICATION,
 DEVICE_INFO.PLATFORM,
 DEVICE_INFO.OWNERSHIP,
 DEVICE_INFO.CONNECTIVITY_STATUS,
@@ -862,6 +863,7 @@ DEVICE_INFO.TENANT_ID
 FROM
 (SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_TYPE.NAME AS PLATFORM,
 DM_ENROLMENT.OWNERSHIP,
 DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
@@ -880,6 +882,7 @@ ORDER BY DEVICE_INFO.DEVICE_ID;
 CREATE VIEW DEVICES_VIEW_2 AS
 SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_DETAIL.DEVICE_MODEL,
 DM_DEVICE_DETAIL.VENDOR,
 DM_DEVICE_DETAIL.OS_VERSION,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index 7e8c8a3e0c0..9ec4ef37788 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -434,6 +434,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL (
 CREATE VIEW DEVICES_VIEW_1 AS
 SELECT
 DEVICE_INFO.DEVICE_ID,
+DEVICE_INFO.DEVICE_IDENTIFICATION,
 DEVICE_INFO.PLATFORM,
 DEVICE_INFO.OWNERSHIP,
 DEVICE_INFO.CONNECTIVITY_STATUS,
@@ -443,6 +444,7 @@ DEVICE_INFO.TENANT_ID
 FROM
 (SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_TYPE.NAME AS PLATFORM,
 DM_ENROLMENT.OWNERSHIP,
 DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
@@ -461,6 +463,7 @@ ORDER BY DEVICE_INFO.DEVICE_ID;
 CREATE VIEW DEVICES_VIEW_2 AS
 SELECT
 DM_DEVICE.ID AS DEVICE_ID,
+DM_DEVICE.DEVICE_IDENTIFICATION,
 DM_DEVICE_DETAIL.DEVICE_MODEL,
 DM_DEVICE_DETAIL.VENDOR,
 DM_DEVICE_DETAIL.OS_VERSION,