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 098ebc5d98e..e5f1d228bdf 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
@@ -5,7 +5,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
      SHARED_WITH_ALL_TENANTS BOOLEAN NOT NULL DEFAULT FALSE,
      PRIMARY KEY (ID)
 )ENGINE = InnoDB;
-CREATE INDEX device_type_name ON DM_DEVICE_TYPE (NAME);
+
+CREATE INDEX IDX_DEVICE_TYPE ON DM_DEVICE_TYPE (NAME);
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE (
      ID                    INTEGER AUTO_INCREMENT NOT NULL,
@@ -20,17 +21,17 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE (
      REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE = InnoDB;
 
+CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID);
 
 CREATE TABLE IF NOT EXISTS DM_OPERATION (
     ID INTEGER AUTO_INCREMENT NOT NULL,
-    TYPE VARCHAR(50) NOT NULL,
+    TYPE VARCHAR(20) NOT NULL,
     CREATED_TIMESTAMP TIMESTAMP NOT NULL,
     RECEIVED_TIMESTAMP TIMESTAMP NULL,
-    OPERATION_CODE VARCHAR(1000) NOT NULL,
+    OPERATION_CODE VARCHAR(50) NOT NULL,
     PRIMARY KEY (ID)
 )ENGINE = InnoDB;
 
-
 CREATE TABLE IF NOT EXISTS DM_CONFIG_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
     OPERATION_CONFIG  BLOB DEFAULT NULL,
@@ -39,7 +40,6 @@ CREATE TABLE IF NOT EXISTS DM_CONFIG_OPERATION (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE = InnoDB;
 
-
 CREATE TABLE IF NOT EXISTS DM_COMMAND_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
     ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
@@ -48,7 +48,6 @@ CREATE TABLE IF NOT EXISTS DM_COMMAND_OPERATION (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE = InnoDB;
 
-
 CREATE TABLE IF NOT EXISTS DM_POLICY_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
     ENABLED INTEGER NOT NULL DEFAULT 0,
@@ -58,7 +57,6 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_OPERATION (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE = InnoDB;
 
-
 CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
     ENABLED INTEGER NOT NULL DEFAULT 0,
@@ -68,7 +66,6 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE = InnoDB;
 
-
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     DEVICE_ID INTEGER NOT NULL,
@@ -83,6 +80,8 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE = InnoDB;
 
+CREATE INDEX IDX_ENROLMENT_FK_DEVICE_ID ON DM_ENROLMENT(DEVICE_ID);
+CREATE INDEX IDX_ENROLMENT_DEVICE_ID_TENANT_ID ON DM_ENROLMENT(DEVICE_ID, TENANT_ID);
 
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
     ID INTEGER AUTO_INCREMENT NOT NULL,
@@ -98,6 +97,9 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE = InnoDB;
 
+CREATE INDEX IDX_ENROLMENT_OP_MAPPING ON DM_ENROLMENT_OP_MAPPING (UPDATED_TIMESTAMP);
+CREATE INDEX IDX_EN_OP_MAPPING_EN_ID ON DM_ENROLMENT_OP_MAPPING(ENROLMENT_ID);
+CREATE INDEX IDX_EN_OP_MAPPING_OP_ID ON DM_ENROLMENT_OP_MAPPING(OPERATION_ID);
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
     ID INTEGER AUTO_INCREMENT NOT NULL,
@@ -112,6 +114,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 )ENGINE = InnoDB;
 
+CREATE INDEX IDX_ENID_OPID ON DM_DEVICE_OPERATION_RESPONSE(OPERATION_ID, ENROLMENT_ID);
+
 -- POLICY RELATED TABLES ---
 
 CREATE  TABLE IF NOT EXISTS DM_PROFILE (
@@ -585,3 +589,7 @@ ORDER BY TENANT_ID, DEVICE_ID;
 
 -- END OF DASHBOARD RELATED VIEWS --
 
+
+
+SELECT feom.DEVICE_IDENTIFICATION, feom.DEVICE_TYPE, or.OPERATION_RESPONSE, feom.CREATED_TIMESTAMP
+FROM DM_DEVICE_OPERATION_RESPONSE dor, (SELECT eom.OPERATION_ID, fe.DEVICE_IDENTIFICATION, fe.DEVICE_TYPE, fe.ENROLMENT_ID, eom.CREATED_TIMESTAMP, eom.UPDATED_TIMESTAMP, or.RECEIVED_TIMESTAMP FROM DM_ENROLMENT_OP_MAPPING eom, (SELECT e.ID AS ENROLMENT_ID, fd.DEVICE_ID, fd.DEVICE_IDENTIFICATION, fd.DEVICE_TYPE FROM DM_ENROLMENT e, (SELECT DISTINCT d.ID AS DEVICE_ID, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = -1234) fd WHERE e.DEVICE_ID = fd.DEVICE_ID AND e.TENANT_ID = -1234) fe WHERE eom.ENROLMENT_ID = fe.ENROLMENT_ID) feom WHERE or.OPERATION_ID = or.OPERATION_ID;
\ No newline at end of file