diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
index 5f95cbb62ab..fa831c317a8 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
@@ -2220,44 +2220,70 @@ public class GenericOperationDAOImpl implements OperationDAO {
                     "    DM_ENROLMENT_OP_MAPPING eom " +
                     "LEFT JOIN " +
                     "    DM_DEVICE_OPERATION_RESPONSE opr ON opr.EN_OP_MAP_ID = eom.ID " +
-                    "INNER JOIN " +
-                    "    (SELECT DISTINCT OPERATION_ID FROM DM_ENROLMENT_OP_MAPPING WHERE TENANT_ID = ? ");
+                    "INNER JOIN ");
 
-            if (activityPaginationRequest.getDeviceType() != null) {
-                sql.append("AND DEVICE_TYPE = ? ");
-            }
-            if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
-                sql.append("AND DEVICE_IDENTIFICATION IN (");
-                for (int i = 0; i < activityPaginationRequest.getDeviceIds().size() - 1; i++) {
-                    sql.append("?, ");
+            if (activityPaginationRequest.getDeviceType() != null ||
+                    (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) ||
+                    activityPaginationRequest.getSince() != 0 ||
+                    activityPaginationRequest.getStatus() != null) {
+
+                sql.append("(SELECT DISTINCT OPERATION_ID FROM DM_ENROLMENT_OP_MAPPING eom WHERE TENANT_ID = ? ");
+
+                if (activityPaginationRequest.getDeviceType() != null) {
+                    sql.append("AND DEVICE_TYPE = ? ");
+                }
+                if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
+                    sql.append("AND eom.DEVICE_IDENTIFICATION IN (");
+                    for (int i = 0; i < activityPaginationRequest.getDeviceIds().size() - 1; i++) {
+                        sql.append("?, ");
+                    }
+                    sql.append("?) ");
+                }
+                if (activityPaginationRequest.getOperationId() > 0) {
+                    sql.append("AND OPERATION_ID = ? ");
+                }
+                if (activityPaginationRequest.getOperationCode() != null) {
+                    sql.append("AND OPERATION_CODE = ? ");
+                }
+                if (activityPaginationRequest.getInitiatedBy() != null) {
+                    sql.append("AND INITIATED_BY = ? ");
+                }
+                if (activityPaginationRequest.getSince() != 0) {
+                    sql.append("AND UPDATED_TIMESTAMP > ? ");
+                }
+                if (activityPaginationRequest.getStartTimestamp() > 0 && activityPaginationRequest.getEndTimestamp() > 0) {
+                    isTimeDurationFilteringProvided = true;
+                    sql.append("AND CREATED_TIMESTAMP BETWEEN ? AND ? ");
+                }
+                if (activityPaginationRequest.getType() != null) {
+                    sql.append("AND TYPE = ? ");
+                }
+                if (activityPaginationRequest.getStatus() != null) {
+                    sql.append("AND STATUS = ? ");
                 }
-                sql.append("?) ");
-            }
-            if (activityPaginationRequest.getOperationId() > 0) {
-                sql.append("AND OPERATION_ID = ? ");
-            }
-            if (activityPaginationRequest.getOperationCode() != null) {
-                sql.append("AND OPERATION_CODE = ? ");
-            }
-            if (activityPaginationRequest.getInitiatedBy() != null) {
-                sql.append("AND INITIATED_BY = ? ");
-            }
-            if (activityPaginationRequest.getSince() != 0) {
-                sql.append("AND UPDATED_TIMESTAMP > ? ");
-            }
-            if (activityPaginationRequest.getStartTimestamp() > 0 && activityPaginationRequest.getEndTimestamp() > 0) {
-                isTimeDurationFilteringProvided = true;
-                sql.append("AND CREATED_TIMESTAMP BETWEEN  ? AND ? ");
-            }
-            if (activityPaginationRequest.getType() != null) {
-                sql.append("AND TYPE = ? ");
-            }
-            if (activityPaginationRequest.getStatus() != null) {
-                sql.append("AND STATUS = ? ");
-            }
 
-            sql.append("ORDER BY OPERATION_ID ASC limit ? , ? ) eom_ordered " +
-                    "ON eom_ordered.OPERATION_ID = eom.OPERATION_ID WHERE eom.TENANT_ID = ? ");
+                sql.append("ORDER BY OPERATION_ID ASC limit ? , ? ) eom_ordered " +
+                        "ON eom_ordered.OPERATION_ID = eom.OPERATION_ID WHERE eom.TENANT_ID = ? ");
+            } else {
+                sql.append("(SELECT ID AS OPERATION_ID FROM DM_OPERATION WHERE TENANT_ID = ? ");
+
+                if (activityPaginationRequest.getStartTimestamp() > 0 && activityPaginationRequest.getEndTimestamp() > 0) {
+                    isTimeDurationFilteringProvided = true;
+                    sql.append("AND CREATED_TIMESTAMP BETWEEN ? AND ? ");
+                }
+                if (activityPaginationRequest.getOperationId() > 0) {
+                    sql.append("AND ID = ? ");
+                }
+                if (activityPaginationRequest.getOperationCode() != null) {
+                    sql.append("AND OPERATION_CODE = ? ");
+                }
+                if (activityPaginationRequest.getInitiatedBy() != null) {
+                    sql.append("AND INITIATED_BY = ? ");
+                }
+
+                sql.append("ORDER BY ID ASC ) dm_ordered " +
+                        "ON dm_ordered.OPERATION_ID = eom.OPERATION_ID WHERE eom.TENANT_ID = ? ");
+            }
 
             if (activityPaginationRequest.getDeviceType() != null) {
                 sql.append("AND eom.DEVICE_TYPE = ? ");
@@ -2282,7 +2308,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
                 sql.append("AND eom.UPDATED_TIMESTAMP > ? ");
             }
             if (isTimeDurationFilteringProvided) {
-                sql.append("AND eom.CREATED_TIMESTAMP BETWEEN  ? AND ? ");
+                sql.append("AND eom.CREATED_TIMESTAMP BETWEEN ? AND ? ");
             }
             if (activityPaginationRequest.getType() != null) {
                 sql.append("AND eom.TYPE = ? ");
@@ -2296,47 +2322,78 @@ public class GenericOperationDAOImpl implements OperationDAO {
             int index = 1;
             try (PreparedStatement stmt = conn.prepareStatement(sql.toString())) {
                 stmt.setInt(index++, tenantId);
-                if (activityPaginationRequest.getDeviceType() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getDeviceType());
-                }
-                if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
-                    for (String deviceId : activityPaginationRequest.getDeviceIds()) {
-                        stmt.setString(index++, deviceId);
+                if (activityPaginationRequest.getDeviceType() != null ||
+                        (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) ||
+                        activityPaginationRequest.getSince() != 0 ||
+                        activityPaginationRequest.getStatus() != null) {
+
+                    if (activityPaginationRequest.getDeviceType() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getDeviceType());
+                    }
+                    if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
+                        for (String deviceId : activityPaginationRequest.getDeviceIds()) {
+                            stmt.setString(index++, deviceId);
+                        }
+                    }
+                    if (activityPaginationRequest.getOperationCode() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getOperationCode());
+                    }
+                    if (activityPaginationRequest.getOperationId() > 0) {
+                        stmt.setInt(index++, activityPaginationRequest.getOperationId());
+                    }
+                    if (activityPaginationRequest.getInitiatedBy() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getInitiatedBy());
+                    }
+                    if (activityPaginationRequest.getSince() != 0) {
+                        stmt.setLong(index++, activityPaginationRequest.getSince());
+                    }
+                    if (isTimeDurationFilteringProvided) {
+                        stmt.setLong(index++, activityPaginationRequest.getStartTimestamp());
+                        stmt.setLong(index++, activityPaginationRequest.getEndTimestamp());
+                    }
+                    if (activityPaginationRequest.getType() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getType().name());
+                    }
+                    if (activityPaginationRequest.getStatus() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getStatus().name());
                     }
-                }
-                if (activityPaginationRequest.getOperationCode() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getOperationCode());
-                }
-                if (activityPaginationRequest.getOperationId() > 0) {
-                    stmt.setInt(index++, activityPaginationRequest.getOperationId());
-                }
-                if (activityPaginationRequest.getInitiatedBy() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getInitiatedBy());
-                }
-                if (activityPaginationRequest.getSince() != 0) {
-                    stmt.setLong(index++, activityPaginationRequest.getSince());
-                }
-                if (isTimeDurationFilteringProvided) {
-                    stmt.setLong(index++, activityPaginationRequest.getStartTimestamp());
-                    stmt.setLong(index++, activityPaginationRequest.getEndTimestamp());
-                }
-                if (activityPaginationRequest.getType() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getType().name());
-                }
-                if (activityPaginationRequest.getStatus() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getStatus().name());
-                }
 
-                stmt.setInt(index++, activityPaginationRequest.getOffset());
-                stmt.setInt(index++, activityPaginationRequest.getLimit());
-                stmt.setInt(index++, tenantId);
+                    stmt.setInt(index++, activityPaginationRequest.getOffset());
+                    stmt.setInt(index++, activityPaginationRequest.getLimit());
+                    stmt.setInt(index++, tenantId);
 
-                if (activityPaginationRequest.getDeviceType() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getDeviceType());
-                }
-                if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
-                    for (String deviceId : activityPaginationRequest.getDeviceIds()) {
-                        stmt.setString(index++, deviceId);
+                    if (activityPaginationRequest.getDeviceType() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getDeviceType());
+                    }
+                    if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
+                        for (String deviceId : activityPaginationRequest.getDeviceIds()) {
+                            stmt.setString(index++, deviceId);
+                        }
+                    }
+                } else {
+                    if (isTimeDurationFilteringProvided) {
+                        stmt.setLong(index++, activityPaginationRequest.getStartTimestamp());
+                        stmt.setLong(index++, activityPaginationRequest.getEndTimestamp());
+                    }
+                    if (activityPaginationRequest.getOperationCode() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getOperationCode());
+                    }
+                    if (activityPaginationRequest.getOperationId() > 0) {
+                        stmt.setInt(index++, activityPaginationRequest.getOperationId());
+                    }
+                    if (activityPaginationRequest.getInitiatedBy() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getInitiatedBy());
+                    }
+
+                    stmt.setInt(index++, tenantId);
+
+                    if (activityPaginationRequest.getDeviceType() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getDeviceType());
+                    }
+                    if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
+                        for (String deviceId : activityPaginationRequest.getDeviceIds()) {
+                            stmt.setString(index++, deviceId);
+                        }
                     }
                 }
                 if (activityPaginationRequest.getOperationCode() != null) {
@@ -2386,70 +2443,107 @@ public class GenericOperationDAOImpl implements OperationDAO {
             boolean isTimeDurationFilteringProvided = false;
             Connection conn = OperationManagementDAOFactory.getConnection();
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            StringBuilder sql = new StringBuilder("SELECT count(DISTINCT OPERATION_ID) AS ACTIVITY_COUNT " +
-                    "FROM DM_ENROLMENT_OP_MAPPING WHERE TENANT_ID = ? ");
+            StringBuilder sql = new StringBuilder();
 
-            if (activityPaginationRequest.getDeviceType() != null) {
-                sql.append("AND DEVICE_TYPE = ? ");
-            }
-            if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
-                sql.append("AND DEVICE_IDENTIFICATION IN (");
-                for (int i = 0; i < activityPaginationRequest.getDeviceIds().size() - 1; i++) {
-                    sql.append("?, ");
-                }
-                sql.append("?) ");
-            }
-            if (activityPaginationRequest.getOperationCode() != null) {
-                sql.append("AND OPERATION_CODE = ? ");
-            }
-            if (activityPaginationRequest.getOperationId() > 0) {
-                sql.append("AND OPERATION_ID = ? ");
-            }
-            if (activityPaginationRequest.getInitiatedBy() != null) {
-                sql.append("AND INITIATED_BY = ? ");
-            }
-            if (activityPaginationRequest.getSince() != 0) {
-                sql.append("AND UPDATED_TIMESTAMP > ? ");
-            }
-            if (activityPaginationRequest.getType() != null) {
-                sql.append("AND TYPE = ? ");
-            }
-            if (activityPaginationRequest.getStatus() != null) {
-                sql.append("AND STATUS = ? ");
-            }
-            if (activityPaginationRequest.getStartTimestamp() > 0 && activityPaginationRequest.getEndTimestamp() > 0) {
-                isTimeDurationFilteringProvided = true;
-                sql.append("AND CREATED_TIMESTAMP BETWEEN ? AND ? ");
-            }
+            if (activityPaginationRequest.getDeviceType() != null ||
+                    (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) ||
+                    activityPaginationRequest.getSince() != 0 ||
+                    activityPaginationRequest.getStatus() != null) {
+
+                sql.append("SELECT count(DISTINCT OPERATION_ID) AS ACTIVITY_COUNT " +
+                        "FROM DM_ENROLMENT_OP_MAPPING WHERE TENANT_ID = ? ");
 
-            int index = 1;
-            try (PreparedStatement stmt = conn.prepareStatement(sql.toString())) {
-                stmt.setInt(index++, tenantId);
                 if (activityPaginationRequest.getDeviceType() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getDeviceType());
+                    sql.append("AND DEVICE_TYPE = ? ");
                 }
                 if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
-                    for (String deviceId : activityPaginationRequest.getDeviceIds()) {
-                        stmt.setString(index++, deviceId);
+                    sql.append("AND DEVICE_IDENTIFICATION IN (");
+                    for (int i = 0; i < activityPaginationRequest.getDeviceIds().size() - 1; i++) {
+                        sql.append("?, ");
                     }
+                    sql.append("?) ");
                 }
                 if (activityPaginationRequest.getOperationCode() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getOperationCode());
+                    sql.append("AND OPERATION_CODE = ? ");
                 }
                 if (activityPaginationRequest.getOperationId() > 0) {
-                    stmt.setInt(index++, activityPaginationRequest.getOperationId());
+                    sql.append("AND OPERATION_ID = ? ");
                 }
                 if (activityPaginationRequest.getInitiatedBy() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getInitiatedBy());
+                    sql.append("AND INITIATED_BY = ? ");
                 }
                 if (activityPaginationRequest.getSince() != 0) {
-                    stmt.setLong(index++, activityPaginationRequest.getSince());
+                    sql.append("AND UPDATED_TIMESTAMP > ? ");
                 }
                 if (activityPaginationRequest.getType() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getType().name());
+                    sql.append("AND TYPE = ? ");
                 }
                 if (activityPaginationRequest.getStatus() != null) {
-                    stmt.setString(index++, activityPaginationRequest.getStatus().name());
+                    sql.append("AND STATUS = ? ");
+                }
+
+            } else {
+                sql.append("SELECT count(ID) AS ACTIVITY_COUNT FROM DM_OPERATION WHERE TENANT_ID = ? ");
+
+                if (activityPaginationRequest.getOperationCode() != null) {
+                    sql.append("AND OPERATION_CODE = ? ");
+                }
+                if (activityPaginationRequest.getOperationId() > 0) {
+                    sql.append("AND ID = ? ");
+                }
+                if (activityPaginationRequest.getInitiatedBy() != null) {
+                    sql.append("AND INITIATED_BY = ? ");
+                }
+            }
+            if (activityPaginationRequest.getStartTimestamp() > 0 && activityPaginationRequest.getEndTimestamp() > 0) {
+                isTimeDurationFilteringProvided = true;
+                sql.append("AND CREATED_TIMESTAMP BETWEEN ? AND ? ");
+            }
+
+            int index = 1;
+            try (PreparedStatement stmt = conn.prepareStatement(sql.toString())) {
+                stmt.setInt(index++, tenantId);
+
+                if (activityPaginationRequest.getDeviceType() != null ||
+                        (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) ||
+                        activityPaginationRequest.getSince() != 0 ||
+                        activityPaginationRequest.getStatus() != null) {
+                    if (activityPaginationRequest.getDeviceType() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getDeviceType());
+                    }
+                    if (activityPaginationRequest.getDeviceIds() != null && !activityPaginationRequest.getDeviceIds().isEmpty()) {
+                        for (String deviceId : activityPaginationRequest.getDeviceIds()) {
+                            stmt.setString(index++, deviceId);
+                        }
+                    }
+                    if (activityPaginationRequest.getOperationCode() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getOperationCode());
+                    }
+                    if (activityPaginationRequest.getOperationId() > 0) {
+                        stmt.setInt(index++, activityPaginationRequest.getOperationId());
+                    }
+                    if (activityPaginationRequest.getInitiatedBy() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getInitiatedBy());
+                    }
+                    if (activityPaginationRequest.getSince() != 0) {
+                        stmt.setLong(index++, activityPaginationRequest.getSince());
+                    }
+                    if (activityPaginationRequest.getType() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getType().name());
+                    }
+                    if (activityPaginationRequest.getStatus() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getStatus().name());
+                    }
+                } else {
+                    if (activityPaginationRequest.getOperationCode() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getOperationCode());
+                    }
+                    if (activityPaginationRequest.getOperationId() > 0) {
+                        stmt.setInt(index++, activityPaginationRequest.getOperationId());
+                    }
+                    if (activityPaginationRequest.getInitiatedBy() != null) {
+                        stmt.setString(index++, activityPaginationRequest.getInitiatedBy());
+                    }
                 }
                 if (isTimeDurationFilteringProvided) {
                     stmt.setLong(index++, activityPaginationRequest.getStartTimestamp());
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
index a0be9fd7048..f261a3b49e5 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -92,6 +92,7 @@ CREATE TABLE IF NOT EXISTS DM_OPERATION (
     INITIATED_BY VARCHAR(100) NULL,
     OPERATION_DETAILS BLOB DEFAULT NULL,
     ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
+    TENANT_ID INT NOT NULL,
     PRIMARY KEY (ID)
 );
 
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
index 16af46d997a..1c0a4b75a45 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -126,9 +126,17 @@ CREATE TABLE DM_OPERATION (
     INITIATED_BY VARCHAR(100) NULL,
     OPERATION_DETAILS VARBINARY(MAX) DEFAULT NULL,
     ENABLED BIT NOT NULL DEFAULT 0,
+    TENANT_ID INTEGER NOT NULL,
     PRIMARY KEY (ID)
 );
 
+IF NOT  EXISTS (SELECT * FROM SYS.INDEXES WHERE NAME = 'IDX_OP_CREATED' AND  OBJECT_ID = OBJECT_ID('DM_OPERATION'))
+CREATE INDEX IDX_OP_CREATED ON DM_OPERATION(CREATED_TIMESTAMP);
+IF NOT  EXISTS (SELECT * FROM SYS.INDEXES WHERE NAME = 'IDX_OP_CODE' AND  OBJECT_ID = OBJECT_ID('DM_OPERATION'))
+CREATE INDEX IDX_OP_CODE ON DM_OPERATION(OPERATION_CODE);
+IF NOT  EXISTS (SELECT * FROM SYS.INDEXES WHERE NAME = 'IDX_OP_INITIATED_BY' AND  OBJECT_ID = OBJECT_ID('DM_OPERATION'))
+CREATE INDEX IDX_OP_INITIATED_BY ON DM_OPERATION(INITIATED_BY);
+
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_ENROLMENT]') AND TYPE IN (N'U'))
 CREATE TABLE DM_ENROLMENT (
     ID INTEGER IDENTITY(1,1) NOT NULL,
@@ -196,6 +204,8 @@ IF NOT  EXISTS (SELECT * FROM SYS.INDEXES WHERE NAME = 'IDX_EN_OP_MAPPING_OP_ID'
 CREATE INDEX IDX_EN_OP_MAPPING_OP_ID ON DM_ENROLMENT_OP_MAPPING(OPERATION_ID);
 IF NOT  EXISTS (SELECT * FROM SYS.INDEXES WHERE NAME = 'IDX_EN_OP_MAPPING_EN_ID_STATUS' AND  OBJECT_ID = OBJECT_ID('DM_ENROLMENT_OP_MAPPING'))
 CREATE INDEX IDX_EN_OP_MAPPING_EN_ID_STATUS ON DM_ENROLMENT_OP_MAPPING(ENROLMENT_ID, STATUS);
+IF NOT  EXISTS (SELECT * FROM SYS.INDEXES WHERE NAME = 'IDX_ENROLMENT_OP_MAPPING_CREATED_TS' AND  OBJECT_ID = OBJECT_ID('DM_ENROLMENT_OP_MAPPING'))
+CREATE INDEX IDX_ENROLMENT_OP_MAPPING_CREATED_TS ON DM_ENROLMENT_OP_MAPPING(CREATED_TIMESTAMP);
 
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_DEVICE_OPERATION_RESPONSE]') AND TYPE IN (N'U'))
 CREATE TABLE DM_DEVICE_OPERATION_RESPONSE (
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
index d184237d445..1ea355fb818 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -107,9 +107,14 @@ CREATE TABLE IF NOT EXISTS DM_OPERATION (
     INITIATED_BY VARCHAR(100) NULL,
     OPERATION_DETAILS BLOB DEFAULT NULL,
     ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
+    TENANT_ID INT NOT NULL,
     PRIMARY KEY (ID)
 )ENGINE = InnoDB;
 
+CREATE INDEX IDX_OP_CREATED ON DM_OPERATION (CREATED_TIMESTAMP ASC);
+CREATE INDEX IDX_OP_CODE ON DM_OPERATION (OPERATION_CODE ASC);
+CREATE INDEX IDX_OP_INITIATED_BY ON DM_OPERATION (INITIATED_BY ASC);
+
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     DEVICE_ID INTEGER NOT NULL,
@@ -170,6 +175,7 @@ CREATE INDEX IDX_ENROLMENT_OP_MAPPING ON DM_ENROLMENT_OP_MAPPING (UPDATED_TIMEST
 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 INDEX IDX_EN_OP_MAPPING_EN_ID_STATUS ON DM_ENROLMENT_OP_MAPPING(ENROLMENT_ID, STATUS);
+CREATE INDEX IDX_ENROLMENT_OP_MAPPING_CREATED_TS ON DM_ENROLMENT_OP_MAPPING (CREATED_TIMESTAMP ASC);
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE
 (
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
index 60c7aaf89e6..f19645cdb75 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -181,6 +181,7 @@ CREATE TABLE DM_OPERATION (
   INITIATED_BY VARCHAR2(100) NULL,
   ENABLED NUMBER(10) DEFAULT 0 NOT NULL,
   OPERATION_DETAILS BLOB DEFAULT NULL,
+  TENANT_ID INTEGER NOT NULL,
   CONSTRAINT PK_DM_OPERATION PRIMARY KEY (ID)
 )
 /
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index f9f68793382..51361a90d31 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -100,10 +100,13 @@ CREATE TABLE IF NOT EXISTS DM_OPERATION (
     INITIATED_BY VARCHAR(100) NULL,
     OPERATION_DETAILS BYTEA DEFAULT NULL,
     ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
+    TENANT_ID INTEGER NOT NULL,
     PRIMARY KEY (ID)
 );
 
-
+CREATE INDEX IDX_OP_CREATED ON DM_OPERATION (CREATED_TIMESTAMP);
+CREATE INDEX IDX_OP_CODE ON DM_OPERATION (OPERATION_CODE);
+CREATE INDEX IDX_OP_INITIATED_BY ON DM_OPERATION (INITIATED_BY);
 
 CREATE SEQUENCE DM_ENROLMENT_seq;
 
@@ -161,6 +164,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
 CREATE INDEX fk_dm_device_operation_mapping_operation ON DM_ENROLMENT_OP_MAPPING (OPERATION_ID);
 CREATE INDEX IDX_DM_ENROLMENT_OP_MAPPING ON DM_ENROLMENT_OP_MAPPING (ENROLMENT_ID,OPERATION_ID);
 CREATE INDEX ID_DM_ENROLMENT_OP_MAPPING_UPDATED_TIMESTAMP ON DM_ENROLMENT_OP_MAPPING (UPDATED_TIMESTAMP);
+CREATE INDEX IDX_ENROLMENT_OP_MAPPING_CREATED_TS ON DM_ENROLMENT_OP_MAPPING (CREATED_TIMESTAMP);
 
 ALTER TABLE DM_ENROLMENT_OP_MAPPING
     ADD OPERATION_CODE VARCHAR(50) NOT NULL,