diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml
index 6887a4f3e5..5e7d63b270 100644
--- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml
+++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml
@@ -116,12 +116,19 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>
+                        --add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED
+                        --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
+                    </argLine>
                     <systemPropertyVariables>
                         <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
                     </systemPropertyVariables>
                     <suiteXmlFiles>
                         <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
                     </suiteXmlFiles>
+                    <classpathDependencyExcludes>
+                        <classpathDependencyExclude>org.ops4j.pax.logging</classpathDependencyExclude>
+                    </classpathDependencyExcludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -254,7 +261,7 @@
 
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <artifactId>powermock-api-mockito2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
index defd753f33..6c906a5c49 100644
--- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
+++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
@@ -1,3 +1,51 @@
+ DROP VIEW IF EXISTS FEATURE_NON_COMPLIANCE_INFO;
+    ALTER TABLE IF EXISTS DM_DEVICE DROP CONSTRAINT IF EXISTS fk_DM_DEVICE_DM_DEVICE_TYPE2;
+--    ALTER TABLE IF EXISTS DM_DEVICE_TYPE_PLATFORM DROP CONSTRAINT IF EXISTS DM_DEVICE_TYPE_DM_DEVICE_TYPE_PLATFORM_MAPPING;
+    ALTER TABLE IF EXISTS DM_ROLE_GROUP_MAP DROP CONSTRAINT IF EXISTS FK_DM_ROLE_GROUP_MAP_DM_GROUP2;
+    ALTER TABLE IF EXISTS DM_DEVICE_GROUP_MAP DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_GROUP_MAP_DM_GROUP2;
+    ALTER TABLE IF EXISTS DM_DEVICE_GROUP_POLICY DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_GROUP_POLICY;
+--    ALTER TABLE IF EXISTS DM_GEOFENCE_GROUP_MAPPING DROP CONSTRAINT IF EXISTS FK_DM_GEOFENCE_GROUP_MAPPING_GROUP;
+--    ALTER TABLE IF EXISTS DM_DEVICE_EVENT_GROUP_MAPPING DROP CONSTRAINT IF EXISTS FK_DM_EVENT_GROUP_MAPPING_GROUP;
+
+    ALTER TABLE IF EXISTS DM_DEVICE_GROUP_MAP DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_GROUP_MAP_DM_DEVICE2;
+    ALTER TABLE IF EXISTS DM_ENROLMENT DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_ENROLMENT;
+    ALTER TABLE IF EXISTS DM_DEVICE_STATUS DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_STATUS_DEVICE;
+    ALTER TABLE IF EXISTS DM_DEVICE_POLICY DROP CONSTRAINT IF EXISTS FK_DEVICE_DEVICE_POLICY;
+    ALTER TABLE IF EXISTS DM_DEVICE_POLICY_APPLIED DROP CONSTRAINT IF EXISTS FK_DM_POLICY_DEVCIE_APPLIED;
+    ALTER TABLE IF EXISTS DM_APPLICATION DROP CONSTRAINT IF EXISTS FK_DM_DEVICE;
+    ALTER TABLE IF EXISTS DM_NOTIFICATION DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_NOTIFICATION;
+    ALTER TABLE IF EXISTS DM_DEVICE_INFO DROP CONSTRAINT IF EXISTS DM_DEVICE_INFO_DEVICE;
+    ALTER TABLE IF EXISTS DM_DEVICE_LOCATION DROP CONSTRAINT IF EXISTS DM_DEVICE_LOCATION_DEVICE;
+    ALTER TABLE IF EXISTS DM_DEVICE_DETAIL DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_DETAILS_DEVICE;
+
+    ALTER TABLE IF EXISTS DM_ENROLMENT_OP_MAPPING DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_OPERATION_MAPPING_OPERATION;
+    ALTER TABLE IF EXISTS DM_DEVICE_OPERATION_RESPONSE DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_OPERATION_RESPONSE_OPERATION;
+
+    ALTER TABLE IF EXISTS DM_DEVICE_STATUS DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_STATUS_ENROLMENT;
+    ALTER TABLE IF EXISTS DM_ENROLMENT_OP_MAPPING DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_OPERATION_MAPPING_DEVICE;
+    ALTER TABLE IF EXISTS DM_DEVICE_OPERATION_RESPONSE DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_OPERATION_RESPONSE_ENROLLMENT;
+    ALTER TABLE IF EXISTS DM_APPLICATION DROP CONSTRAINT IF EXISTS FK_DM_ENROLEMENT;
+    ALTER TABLE IF EXISTS DM_DEVICE_INFO DROP CONSTRAINT IF EXISTS DM_DEVICE_INFO_DEVICE_ENROLLMENT;
+    ALTER TABLE IF EXISTS DM_DEVICE_LOCATION DROP CONSTRAINT IF EXISTS DM_DEVICE_LOCATION_DM_ENROLLMENT;
+    ALTER TABLE IF EXISTS DM_DEVICE_DETAIL DROP CONSTRAINT IF EXISTS FK_DM_ENROLMENT_DEVICE_DETAILS;
+    ALTER TABLE IF EXISTS DM_DEVICE_OPERATION_RESPONSE DROP CONSTRAINT IF EXISTS FK_DM_EN_OP_MAP_RESPONSE;
+    ALTER TABLE IF EXISTS DM_DEVICE_OPERATION_RESPONSE_LARGE DROP CONSTRAINT IF EXISTS FK_DM_EN_OP_MAP_RESPONSE_LARGE;
+    ALTER TABLE IF EXISTS DM_DEVICE_OPERATION_RESPONSE_LARGE DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_OPERATION_RESPONSE_LARGE_MAPPING;
+--
+    ALTER TABLE IF EXISTS DM_POLICY DROP CONSTRAINT IF EXISTS FK_DM_PROFILE_DM_POLICY;
+    ALTER TABLE IF EXISTS DM_PROFILE_FEATURES DROP CONSTRAINT IF EXISTS FK_DM_PROFILE_DM_POLICY_FEATURES;
+--
+    ALTER TABLE IF EXISTS DM_DEVICE_POLICY DROP CONSTRAINT IF EXISTS FK_POLICY_DEVICE_POLICY;
+    ALTER TABLE IF EXISTS DM_DEVICE_TYPE_POLICY DROP CONSTRAINT IF EXISTS FK_DEVICE_TYPE_POLICY;
+    ALTER TABLE IF EXISTS DM_POLICY_CORRECTIVE_ACTION DROP CONSTRAINT IF EXISTS FK_DM_POLICY_DM_POLICY_CORRECTIVE_ACTION;
+    ALTER TABLE IF EXISTS DM_ROLE_POLICY DROP CONSTRAINT IF EXISTS FK_ROLE_POLICY_POLICY;
+    ALTER TABLE IF EXISTS DM_USER_POLICY DROP CONSTRAINT IF EXISTS DM_POLICY_USER_POLICY;
+    ALTER TABLE IF EXISTS DM_POLICY_CRITERIA DROP CONSTRAINT IF EXISTS FK_POLICY_POLICY_CRITERIA;
+    ALTER TABLE IF EXISTS DM_DEVICE_GROUP_POLICY DROP CONSTRAINT IF EXISTS FK_DM_DEVICE_GROUP_DM_POLICY;
+    ALTER TABLE IF EXISTS DM_POLICY_CRITERIA DROP CONSTRAINT IF EXISTS FK_CRITERIA_POLICY_CRITERIA;
+    ALTER TABLE IF EXISTS DM_POLICY_CRITERIA_PROPERTIES DROP CONSTRAINT IF EXISTS FK_POLICY_CRITERIA_PROPERTIES;
+    ALTER TABLE IF EXISTS DM_POLICY_COMPLIANCE_FEATURES DROP CONSTRAINT IF EXISTS FK_COMPLIANCE_FEATURES_STATUS;
+
 DROP TABLE IF EXISTS DM_DEVICE_TYPE;
 CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
      ID INT AUTO_INCREMENT NOT NULL,
@@ -13,24 +61,22 @@ DROP TABLE IF EXISTS DM_GROUP;
 CREATE TABLE IF NOT EXISTS DM_GROUP (
   ID                  INTEGER AUTO_INCREMENT NOT NULL,
   GROUP_NAME          VARCHAR(100) DEFAULT NULL,
-  DESCRIPTION         TEXT         DEFAULT NULL,
   STATUS VARCHAR(50) DEFAULT NULL,
-  DATE_OF_CREATE      BIGINT       DEFAULT NULL,
-  DATE_OF_LAST_UPDATE BIGINT       DEFAULT NULL,
-  OWNER               VARCHAR(45)  DEFAULT NULL,
+  DESCRIPTION         TEXT         DEFAULT NULL,
+  OWNER               VARCHAR(255)  DEFAULT NULL,
   PARENT_PATH VARCHAR(255) DEFAULT NULL,
   TENANT_ID           INTEGER      DEFAULT 0,
   PRIMARY KEY (ID)
 );
-
-DROP TABLE IF EXISTS DM_DEVICE_CERTIFICATE;
-CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
-      ID                    INTEGER auto_increment NOT NULL,
-      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
-    	CERTIFICATE                  BLOB DEFAULT NULL,
-    	TENANT_ID INTEGER DEFAULT 0,
-    	USERNAME  VARCHAR(500) DEFAULT NULL,
-    	PRIMARY KEY (ID)
+DROP TABLE IF EXISTS DM_ROLE_GROUP_MAP;
+CREATE TABLE IF NOT EXISTS DM_ROLE_GROUP_MAP (
+  ID        INTEGER AUTO_INCREMENT NOT NULL,
+  GROUP_ID  INTEGER     DEFAULT NULL,
+  ROLE      VARCHAR(45) DEFAULT NULL,
+  TENANT_ID INTEGER     DEFAULT 0,
+  PRIMARY KEY (ID),
+  CONSTRAINT fk_DM_ROLE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID)
+  REFERENCES DM_GROUP (ID) ON DELETE CASCADE ON UPDATE CASCADE
 );
 
 DROP TABLE IF EXISTS DM_DEVICE;
@@ -38,13 +84,14 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE (
      ID                    INTEGER auto_increment NOT NULL,
      DESCRIPTION           TEXT DEFAULT NULL,
      NAME                  VARCHAR(100) DEFAULT NULL,
-     DEVICE_TYPE_ID        INT(11) DEFAULT NULL,
+     DEVICE_TYPE_ID        INT DEFAULT NULL,
      DEVICE_IDENTIFICATION VARCHAR(300) DEFAULT NULL,
      LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
      TENANT_ID INTEGER DEFAULT 0,
      PRIMARY KEY (ID),
-     CONSTRAINT fk_DM_DEVICE_DM_DEVICE_TYPE2 FOREIGN KEY (DEVICE_TYPE_ID )
-     REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+     CONSTRAINT fk_DM_DEVICE_DM_DEVICE_TYPE2 FOREIGN KEY (DEVICE_TYPE_ID)
+     REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+     CONSTRAINT uk_DM_DEVICE UNIQUE (NAME, DEVICE_TYPE_ID, DEVICE_IDENTIFICATION, TENANT_ID)
 );
 
 DROP TABLE IF EXISTS DM_DEVICE_PROPERTIES;
@@ -53,8 +100,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
      DEVICE_IDENTIFICATION VARCHAR(300) NOT NULL,
      PROPERTY_NAME VARCHAR(100) DEFAULT 0,
      PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
-     TENANT_ID VARCHAR(100) DEFAULT NULL,
-     PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME)
+     TENANT_ID VARCHAR(100),
+     PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME, TENANT_ID)
 );
 
 DROP TABLE IF EXISTS GROUP_PROPERTIES;
@@ -74,9 +121,9 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP (
   TENANT_ID INTEGER DEFAULT 0,
   PRIMARY KEY (ID),
   CONSTRAINT fk_DM_DEVICE_GROUP_MAP_DM_DEVICE2 FOREIGN KEY (DEVICE_ID)
-  REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  REFERENCES DM_DEVICE (ID) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT fk_DM_DEVICE_GROUP_MAP_DM_GROUP2 FOREIGN KEY (GROUP_ID)
-  REFERENCES DM_GROUP (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+  REFERENCES DM_GROUP (ID) ON DELETE CASCADE ON UPDATE CASCADE
 );
 
 DROP TABLE IF EXISTS DM_OPERATION;
@@ -96,7 +143,7 @@ DROP TABLE IF EXISTS DM_ENROLMENT;
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     DEVICE_ID INTEGER NOT NULL,
-    OWNER VARCHAR(50) NOT NULL,
+    OWNER VARCHAR(255) NOT NULL,
     OWNERSHIP VARCHAR(45) DEFAULT NULL,
     STATUS VARCHAR(50) NULL,
     IS_TRANSFERRED BOOLEAN NOT NULL DEFAULT FALSE,
@@ -105,7 +152,8 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     TENANT_ID INT NOT NULL,
     PRIMARY KEY (ID),
     CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES
-    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+    CONSTRAINT uk_dm_device_enrolment UNIQUE (DEVICE_ID, OWNER, OWNERSHIP, TENANT_ID)
 );
 DROP TABLE IF EXISTS DM_DEVICE_STATUS;
 CREATE TABLE IF NOT EXISTS DM_DEVICE_STATUS (
@@ -119,7 +167,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_STATUS (
     CONSTRAINT fk_dm_device_status_device FOREIGN KEY (DEVICE_ID) REFERENCES
         DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dm_device_status_enrolment FOREIGN KEY (ENROLMENT_ID) REFERENCES
-        DM_ENROLMENT (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+        DM_ENROLMENT (ID) ON DELETE CASCADE ON UPDATE CASCADE
 );
 DROP TABLE IF EXISTS DM_ENROLMENT_OP_MAPPING;
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
@@ -167,10 +215,14 @@ CREATE TABLE DM_DEVICE_OPERATION_RESPONSE_LARGE (
     ID INTEGER NOT NULL,
     OPERATION_RESPONSE LONGBLOB DEFAULT NULL,
     OPERATION_ID INTEGER NOT NULL,
+    EN_OP_MAP_ID  INTEGER NOT NULL,
     RECEIVED_TIMESTAMP TIMESTAMP NULL,
     DEVICE_IDENTIFICATION VARCHAR(300) DEFAULT NULL,
     CONSTRAINT fk_dm_device_operation_response_large_mapping FOREIGN KEY (ID)
         REFERENCES DM_DEVICE_OPERATION_RESPONSE (ID)
+        ON DELETE NO ACTION ON UPDATE NO ACTION,
+    CONSTRAINT  fk_dm_en_op_map_response_large FOREIGN KEY (EN_OP_MAP_ID)
+        REFERENCES DM_ENROLMENT_OP_MAPPING (ID)
         ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
@@ -181,30 +233,25 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE (
   ID INT NOT NULL AUTO_INCREMENT ,
   PROFILE_NAME VARCHAR(45) NOT NULL ,
   TENANT_ID INT NOT NULL ,
-  DEVICE_TYPE VARCHAR(20) NOT NULL ,
+  DEVICE_TYPE VARCHAR(300) NOT NULL ,
   CREATED_TIME DATETIME NOT NULL ,
   UPDATED_TIME DATETIME NOT NULL ,
-  PRIMARY KEY (ID) ,
-  CONSTRAINT DM_PROFILE_DEVICE_TYPE
-    FOREIGN KEY (DEVICE_TYPE )
-    REFERENCES DM_DEVICE_TYPE (NAME )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  PRIMARY KEY (ID)
 );
 
 DROP TABLE IF EXISTS DM_POLICY;
 CREATE  TABLE IF NOT EXISTS DM_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
+  ID INT NOT NULL AUTO_INCREMENT ,
   NAME VARCHAR(45) DEFAULT NULL ,
-  PAYLOAD_VERSION VARCHAR (45) DEFAULT NULL,
   DESCRIPTION VARCHAR(1000) NULL,
-  TENANT_ID INT(11) NOT NULL ,
-  PROFILE_ID INT(11) NOT NULL ,
+  PAYLOAD_VERSION VARCHAR (45) NULL,
+  TENANT_ID INT NOT NULL ,
+  PROFILE_ID INT NOT NULL ,
   OWNERSHIP_TYPE VARCHAR(45) NULL,
   COMPLIANCE VARCHAR(100) NULL,
   PRIORITY INT NOT NULL,
-  ACTIVE INT(2) NOT NULL,
-  UPDATED INT(1) NULL,
+  ACTIVE INT NOT NULL,
+  UPDATED INT NULL,
   POLICY_TYPE VARCHAR(45) NULL,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_DM_PROFILE_DM_POLICY
@@ -213,31 +260,13 @@ CREATE  TABLE IF NOT EXISTS DM_POLICY (
     ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
-
-DROP TABLE IF EXISTS DM_POLICY_CORRECTIVE_ACTION;
-CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION (
-  ID INT(11) NOT NULL AUTO_INCREMENT,
-  ACTION_TYPE VARCHAR(45) NOT NULL,
-  CORRECTIVE_POLICY_ID INT(11) DEFAULT NULL,
-  POLICY_ID INT(11) NOT NULL,
-  FEATURE_ID INT(11) DEFAULT NULL,
-  IS_REACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
-  PRIMARY KEY (ID),
-  CONSTRAINT FK_DM_POLICY_DM_POLICY_CORRECTIVE_ACTION
-    FOREIGN KEY (POLICY_ID)
-    REFERENCES DM_POLICY (ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
-);
-
-
 DROP TABLE IF EXISTS DM_DEVICE_POLICY;
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
-  DEVICE_ID INT(11) NOT NULL ,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ID INT NOT NULL AUTO_INCREMENT ,
+  DEVICE_ID INT NOT NULL ,
+  ENROLMENT_ID INT NOT NULL,
   DEVICE BLOB NOT NULL,
-  POLICY_ID INT(11) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_POLICY_DEVICE_POLICY
     FOREIGN KEY (POLICY_ID )
@@ -253,29 +282,24 @@ CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
 
 DROP TABLE IF EXISTS DM_DEVICE_TYPE_POLICY;
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
-  ID INT(11) NOT NULL ,
-  DEVICE_TYPE VARCHAR(20) NOT NULL ,
-  POLICY_ID INT(11) NOT NULL ,
+  ID INT NOT NULL ,
+  DEVICE_TYPE VARCHAR(300) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_DEVICE_TYPE_POLICY
     FOREIGN KEY (POLICY_ID )
     REFERENCES DM_POLICY (ID )
     ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT FK_DEVICE_TYPE_POLICY_DEVICE_TYPE
-    FOREIGN KEY (DEVICE_TYPE )
-    REFERENCES DM_DEVICE_TYPE (NAME)
-    ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
 
 DROP TABLE IF EXISTS DM_PROFILE_FEATURES;
 CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
-  ID INT(11) NOT NULL AUTO_INCREMENT,
-  PROFILE_ID INT(11) NOT NULL,
+  ID INT NOT NULL AUTO_INCREMENT,
+  PROFILE_ID INT NOT NULL,
   FEATURE_CODE VARCHAR(100) NOT NULL,
-  DEVICE_TYPE VARCHAR(20) NOT NULL,
-  TENANT_ID INT(11) NOT NULL ,
+  DEVICE_TYPE VARCHAR(300) NOT NULL,
+  TENANT_ID INT NOT NULL ,
   CONTENT BLOB NULL DEFAULT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES
@@ -285,11 +309,26 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
     ON UPDATE NO ACTION
 );
 
+CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION (
+  ID INT NOT NULL AUTO_INCREMENT,
+  ACTION_TYPE VARCHAR(45) NOT NULL,
+  CORRECTIVE_POLICY_ID INT DEFAULT NULL,
+  POLICY_ID INT NOT NULL,
+  FEATURE_ID INT DEFAULT NULL,
+  IS_REACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
+  PRIMARY KEY (ID),
+  CONSTRAINT FK_DM_POLICY_DM_POLICY_CORRECTIVE_ACTION
+    FOREIGN KEY (POLICY_ID)
+    REFERENCES DM_POLICY (ID)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+);
+
 DROP TABLE IF EXISTS DM_ROLE_POLICY;
 CREATE  TABLE IF NOT EXISTS DM_ROLE_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
+  ID INT NOT NULL AUTO_INCREMENT ,
   ROLE_NAME VARCHAR(45) NOT NULL ,
-  POLICY_ID INT(11) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_ROLE_POLICY_POLICY
     FOREIGN KEY (POLICY_ID )
@@ -315,11 +354,11 @@ DROP TABLE IF EXISTS DM_DEVICE_POLICY_APPLIED;
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY_APPLIED (
   ID INT NOT NULL AUTO_INCREMENT ,
   DEVICE_ID INT NOT NULL ,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ENROLMENT_ID INT NOT NULL,
   POLICY_ID INT NOT NULL ,
   POLICY_CONTENT BLOB NULL ,
   TENANT_ID INT NOT NULL,
-  APPLIED TINYINT(1) NULL ,
+  APPLIED TINYINT NULL ,
   CREATED_TIME TIMESTAMP NULL ,
   UPDATED_TIME TIMESTAMP NULL ,
   APPLIED_TIME TIMESTAMP NULL ,
@@ -363,7 +402,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA_PROPERTIES (
   POLICY_CRITERION_ID INT NOT NULL,
   PROP_KEY VARCHAR(45) NULL,
   PROP_VALUE VARCHAR(100) NULL,
-  CONTENT BLOB NULL COMMENT 'This is used to ',
+  CONTENT BLOB NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_POLICY_CRITERIA_PROPERTIES
     FOREIGN KEY (POLICY_CRITERION_ID)
@@ -376,7 +415,7 @@ DROP TABLE IF EXISTS DM_POLICY_COMPLIANCE_STATUS;
 CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
   ID INT NOT NULL AUTO_INCREMENT,
   DEVICE_ID INT NOT NULL,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ENROLMENT_ID INT NOT NULL,
   POLICY_ID INT NOT NULL,
   TENANT_ID INT NOT NULL,
   STATUS INT NULL,
@@ -391,8 +430,8 @@ DROP TABLE IF EXISTS DM_POLICY_CHANGE_MGT;
 CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT (
   ID INT NOT NULL AUTO_INCREMENT,
   POLICY_ID INT NOT NULL,
-  DEVICE_TYPE VARCHAR(20) NOT NULL,
-  TENANT_ID INT(11) NOT NULL,
+  DEVICE_TYPE VARCHAR(300) NOT NULL ,
+  TENANT_ID INT NOT NULL,
   PRIMARY KEY (ID)
 );
 
@@ -423,7 +462,7 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION (
     LOCATION_URL VARCHAR(100) DEFAULT NULL,
     IMAGE_URL VARCHAR(100) DEFAULT NULL,
     APP_PROPERTIES BLOB NULL,
-    MEMORY_USAGE INTEGER(10) NULL,
+    MEMORY_USAGE INTEGER NULL,
     IS_ACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
     DEVICE_ID INTEGER NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
@@ -434,7 +473,7 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION (
         REFERENCES DM_DEVICE (ID)
         ON DELETE NO ACTION
         ON UPDATE NO ACTION,
-    CONSTRAINT FK_DM_APP_MAP_DM_ENROL
+    CONSTRAINT fk_dm_enrolement
       FOREIGN KEY (ENROLMENT_ID)
       REFERENCES DM_ENROLMENT (ID)
       ON DELETE NO ACTION
@@ -448,15 +487,14 @@ DROP TABLE IF EXISTS DM_NOTIFICATION;
 CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
     NOTIFICATION_ID INTEGER AUTO_INCREMENT NOT NULL,
     DEVICE_ID INTEGER NOT NULL,
-    OPERATION_ID INTEGER NOT NULL,
+    OPERATION_ID INTEGER NULL,
     TENANT_ID INTEGER NOT NULL,
     STATUS VARCHAR(10) NULL,
-    DESCRIPTION VARCHAR(100) NULL,
+    DESCRIPTION VARCHAR(1000) NULL,
+    LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
     PRIMARY KEY (NOTIFICATION_ID),
     CONSTRAINT fk_dm_device_notification FOREIGN KEY (DEVICE_ID) REFERENCES
-    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
-    CONSTRAINT fk_dm_operation_notification FOREIGN KEY (OPERATION_ID) REFERENCES
-    DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 -- NOTIFICATION TABLE END --
 
@@ -494,7 +532,11 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_LOCATION (
   STATE VARCHAR(45) NULL,
   COUNTRY VARCHAR(45) NULL,
   GEO_HASH VARCHAR(45) NULL,
-  UPDATE_TIMESTAMP BIGINT(15) NOT NULL,
+  UPDATE_TIMESTAMP BIGINT NOT NULL,
+  ALTITUDE DOUBLE NULL,
+  SPEED FLOAT NULL,
+  BEARING FLOAT NULL,
+  DISTANCE DOUBLE NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_LOCATION_DEVICE
     FOREIGN KEY (DEVICE_ID)
@@ -507,6 +549,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_LOCATION (
     ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
+DROP INDEX IF EXISTS DM_DEVICE_LOCATION_GEO_hashx;
+CREATE INDEX DM_DEVICE_LOCATION_GEO_hashx ON DM_DEVICE_LOCATION(GEO_HASH ASC);
 
 DROP TABLE IF EXISTS DM_DEVICE_DETAIL;
 CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL (
@@ -527,8 +571,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL (
   CPU_USAGE DECIMAL(5) NULL,
   TOTAL_RAM_MEMORY DECIMAL(30,3) NULL,
   AVAILABLE_RAM_MEMORY DECIMAL(30,3) NULL,
-  PLUGGED_IN INT(1) NULL,
-  UPDATE_TIMESTAMP BIGINT(15) NOT NULL,
+  PLUGGED_IN INT NULL,
+  UPDATE_TIMESTAMP BIGINT NOT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_DEVICE_DETAILS_DEVICE
     FOREIGN KEY (DEVICE_ID)
@@ -553,15 +597,14 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_POLICY (
   CONSTRAINT FK_DM_DEVICE_GROUP_POLICY
     FOREIGN KEY (DEVICE_GROUP_ID)
     REFERENCES DM_GROUP (ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
+    ON DELETE CASCADE
+    ON UPDATE CASCADE ,
   CONSTRAINT FK_DM_DEVICE_GROUP_DM_POLICY
     FOREIGN KEY (POLICY_ID)
     REFERENCES DM_POLICY (ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+    ON DELETE CASCADE
+    ON UPDATE CASCADE
 );
-
 -- END OF POLICY AND DEVICE GROUP MAPPING --
 
 -- DASHBOARD RELATED VIEWS --
@@ -621,22 +664,4 @@ DM_DEVICE.DEVICE_TYPE_ID = DM_DEVICE_TYPE.ID AND
 DM_DEVICE.ID = DM_DEVICE_DETAIL.DEVICE_ID
 ORDER BY TENANT_ID, DEVICE_ID;
 
-/*
- * Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
- *
- * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 -- END OF DASHBOARD RELATED VIEWS --
diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml
index fc32a2698d..96fd6acfff 100644
--- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml
+++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/test/resources/user-test/user-mgt-registry-test.xml
@@ -27,7 +27,7 @@
 	    <EveryOneRoleName>everyone</EveryOneRoleName>
             <ReadOnly>false</ReadOnly>
             <MaxUserNameListLength>500</MaxUserNameListLength>
-			<Property name="url">jdbc:h2:target/databasetest/CARBON_TEST</Property>
+			<Property name="url">jdbc:h2:./target/databasetest/CARBON_TEST</Property>
 			<Property name="driverName">org.h2.Driver</Property>
 			<Property name="maxActive">50</Property>
 			<Property name="maxWait">60000</Property>
diff --git a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml
index 45b7fd07c9..8add23b3d8 100644
--- a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml
+++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml
@@ -114,6 +114,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>
+                        --add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED
+                        --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
+                    </argLine>
                     <systemPropertyVariables>
                         <log4j.configuration>file:src/test/resources/carbon-home/repository/conf/log4j.properties
                         </log4j.configuration>
@@ -121,6 +125,9 @@
                     <suiteXmlFiles>
                         <file>src/test/resources/testng.xml</file>
                     </suiteXmlFiles>
+                    <classpathDependencyExcludes>
+                        <classpathDependencyExclude>org.ops4j.pax.logging</classpathDependencyExclude>
+                    </classpathDependencyExcludes>
                 </configuration>
             </plugin>
         </plugins>
@@ -342,7 +349,7 @@
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <artifactId>powermock-api-mockito2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
index 40ad63072f..df3277920d 100644
--- a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
+++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
@@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
   STATUS VARCHAR(50) DEFAULT NULL,
   DESCRIPTION         TEXT         DEFAULT NULL,
   OWNER               VARCHAR(255)  DEFAULT NULL,
-  PARENT_PATH         VARCHAR(255)  DEFAULT '/',
+  PARENT_PATH VARCHAR(255) DEFAULT NULL,
   TENANT_ID           INTEGER      DEFAULT 0,
   PRIMARY KEY (ID)
 );
@@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE (
      ID                    INTEGER auto_increment NOT NULL,
      DESCRIPTION           TEXT DEFAULT NULL,
      NAME                  VARCHAR(100) DEFAULT NULL,
-     DEVICE_TYPE_ID        INT(11) DEFAULT NULL,
+     DEVICE_TYPE_ID        INT DEFAULT NULL,
      DEVICE_IDENTIFICATION VARCHAR(300) DEFAULT NULL,
      LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
      TENANT_ID INTEGER DEFAULT 0,
@@ -84,8 +84,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP (
 CREATE TABLE IF NOT EXISTS DM_OPERATION (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     TYPE VARCHAR(50) NOT NULL,
-    CREATED_TIMESTAMP TIMESTAMP NOT NULL,
-    RECEIVED_TIMESTAMP TIMESTAMP NULL,
+    CREATED_TIMESTAMP BIGINT NOT NULL,
+    RECEIVED_TIMESTAMP BIGINT NULL,
     OPERATION_CODE VARCHAR(1000) NOT NULL,
     INITIATED_BY VARCHAR(100) NULL,
     OPERATION_DETAILS BLOB DEFAULT NULL,
@@ -108,7 +108,19 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT uk_dm_device_enrolment UNIQUE (DEVICE_ID, OWNER, OWNERSHIP, TENANT_ID)
 );
-
+CREATE TABLE IF NOT EXISTS DM_DEVICE_STATUS (
+    ID INTEGER AUTO_INCREMENT NOT NULL,
+    ENROLMENT_ID INTEGER NOT NULL,
+    DEVICE_ID INTEGER NOT NULL,
+    STATUS VARCHAR(50) DEFAULT NULL,
+    UPDATE_TIME TIMESTAMP DEFAULT NULL,
+    CHANGED_BY VARCHAR(255) NOT NULL,
+    PRIMARY KEY (ID),
+    CONSTRAINT fk_dm_device_status_device FOREIGN KEY (DEVICE_ID) REFERENCES
+        DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+    CONSTRAINT fk_dm_device_status_enrolment FOREIGN KEY (ENROLMENT_ID) REFERENCES
+        DM_ENROLMENT (ID) ON DELETE CASCADE ON UPDATE CASCADE
+);
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
@@ -176,17 +188,17 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
+  ID INT NOT NULL AUTO_INCREMENT ,
   NAME VARCHAR(45) DEFAULT NULL ,
   DESCRIPTION VARCHAR(1000) NULL,
   PAYLOAD_VERSION VARCHAR (45) NULL,
-  TENANT_ID INT(11) NOT NULL ,
-  PROFILE_ID INT(11) NOT NULL ,
+  TENANT_ID INT NOT NULL ,
+  PROFILE_ID INT NOT NULL ,
   OWNERSHIP_TYPE VARCHAR(45) NULL,
   COMPLIANCE VARCHAR(100) NULL,
   PRIORITY INT NOT NULL,
-  ACTIVE INT(2) NOT NULL,
-  UPDATED INT(1) NULL,
+  ACTIVE INT NOT NULL,
+  UPDATED INT NULL,
   POLICY_TYPE VARCHAR(45) NULL,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_DM_PROFILE_DM_POLICY
@@ -197,11 +209,11 @@ CREATE  TABLE IF NOT EXISTS DM_POLICY (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
-  DEVICE_ID INT(11) NOT NULL ,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ID INT NOT NULL AUTO_INCREMENT ,
+  DEVICE_ID INT NOT NULL ,
+  ENROLMENT_ID INT NOT NULL,
   DEVICE BLOB NOT NULL,
-  POLICY_ID INT(11) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_POLICY_DEVICE_POLICY
     FOREIGN KEY (POLICY_ID )
@@ -216,9 +228,9 @@ CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
-  ID INT(11) NOT NULL ,
+  ID INT NOT NULL ,
   DEVICE_TYPE VARCHAR(300) NOT NULL ,
-  POLICY_ID INT(11) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_DEVICE_TYPE_POLICY
     FOREIGN KEY (POLICY_ID )
@@ -228,11 +240,11 @@ CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
-  ID INT(11) NOT NULL AUTO_INCREMENT,
-  PROFILE_ID INT(11) NOT NULL,
+  ID INT NOT NULL AUTO_INCREMENT,
+  PROFILE_ID INT NOT NULL,
   FEATURE_CODE VARCHAR(100) NOT NULL,
   DEVICE_TYPE VARCHAR(300) NOT NULL,
-  TENANT_ID INT(11) NOT NULL ,
+  TENANT_ID INT NOT NULL ,
   CONTENT BLOB NULL DEFAULT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES
@@ -243,11 +255,11 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
 );
 
 CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION (
-  ID INT(11) NOT NULL AUTO_INCREMENT,
+  ID INT NOT NULL AUTO_INCREMENT,
   ACTION_TYPE VARCHAR(45) NOT NULL,
-  CORRECTIVE_POLICY_ID INT(11) DEFAULT NULL,
-  POLICY_ID INT(11) NOT NULL,
-  FEATURE_ID INT(11) DEFAULT NULL,
+  CORRECTIVE_POLICY_ID INT DEFAULT NULL,
+  POLICY_ID INT NOT NULL,
+  FEATURE_ID INT DEFAULT NULL,
   IS_REACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_POLICY_DM_POLICY_CORRECTIVE_ACTION
@@ -258,9 +270,9 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_ROLE_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
+  ID INT NOT NULL AUTO_INCREMENT ,
   ROLE_NAME VARCHAR(45) NOT NULL ,
-  POLICY_ID INT(11) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_ROLE_POLICY_POLICY
     FOREIGN KEY (POLICY_ID )
@@ -284,11 +296,11 @@ CREATE  TABLE IF NOT EXISTS DM_USER_POLICY (
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY_APPLIED (
   ID INT NOT NULL AUTO_INCREMENT ,
   DEVICE_ID INT NOT NULL ,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ENROLMENT_ID INT NOT NULL,
   POLICY_ID INT NOT NULL ,
   POLICY_CONTENT BLOB NULL ,
   TENANT_ID INT NOT NULL,
-  APPLIED TINYINT(1) NULL ,
+  APPLIED TINYINT NULL ,
   CREATED_TIME TIMESTAMP NULL ,
   UPDATED_TIME TIMESTAMP NULL ,
   APPLIED_TIME TIMESTAMP NULL ,
@@ -341,7 +353,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA_PROPERTIES (
 CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
   ID INT NOT NULL AUTO_INCREMENT,
   DEVICE_ID INT NOT NULL,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ENROLMENT_ID INT NOT NULL,
   POLICY_ID INT NOT NULL,
   TENANT_ID INT NOT NULL,
   STATUS INT NULL,
@@ -356,7 +368,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT (
   ID INT NOT NULL AUTO_INCREMENT,
   POLICY_ID INT NOT NULL,
   DEVICE_TYPE VARCHAR(300) NOT NULL ,
-  TENANT_ID INT(11) NOT NULL,
+  TENANT_ID INT NOT NULL,
   PRIMARY KEY (ID)
 );
 
@@ -385,7 +397,7 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION (
     LOCATION_URL VARCHAR(100) DEFAULT NULL,
     IMAGE_URL VARCHAR(100) DEFAULT NULL,
     APP_PROPERTIES BLOB NULL,
-    MEMORY_USAGE INTEGER(10) NULL,
+    MEMORY_USAGE INTEGER NULL,
     IS_ACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
     DEVICE_ID INTEGER NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
@@ -405,6 +417,16 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION (
 
 -- POLICY RELATED TABLES  FINISHED --
 
+CREATE TABLE IF NOT EXISTS DM_APP_ICONS (
+    ID INTEGER AUTO_INCREMENT NOT NULL,
+    ICON_PATH VARCHAR(150) DEFAULT NULL,
+    PACKAGE_NAME VARCHAR(150) NOT NULL,
+    VERSION VARCHAR(50) DEFAULT '1.1.0',
+    CREATED_TIMESTAMP TIMESTAMP NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY (ID)
+);
+
 -- NOTIFICATION TABLE --
 CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
     NOTIFICATION_ID INTEGER AUTO_INCREMENT NOT NULL,
@@ -425,7 +447,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
   DEVICE_ID INT NULL,
   ENROLMENT_ID INT NOT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(1000) NULL,
+  VALUE_FIELD VARCHAR(1500) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_INFO_DEVICE
     FOREIGN KEY (DEVICE_ID)
@@ -454,7 +476,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_LOCATION (
   STATE VARCHAR(45) NULL,
   COUNTRY VARCHAR(45) NULL,
   GEO_HASH VARCHAR(45) NULL,
-  UPDATE_TIMESTAMP BIGINT(15) NOT NULL,
+  UPDATE_TIMESTAMP BIGINT NOT NULL,
   ALTITUDE DOUBLE NULL,
   SPEED FLOAT NULL,
   BEARING FLOAT NULL,
@@ -491,8 +513,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL (
   CPU_USAGE DECIMAL(5) NULL,
   TOTAL_RAM_MEMORY DECIMAL(30,3) NULL,
   AVAILABLE_RAM_MEMORY DECIMAL(30,3) NULL,
-  PLUGGED_IN INT(1) NULL,
-  UPDATE_TIMESTAMP BIGINT(15) NOT NULL,
+  PLUGGED_IN INT NULL,
+  UPDATE_TIMESTAMP BIGINT NOT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_DEVICE_DETAILS_DEVICE
     FOREIGN KEY (DEVICE_ID)
@@ -519,7 +541,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_HISTORY_LAST_SEVEN_DAYS
     LONGITUDE        DOUBLE                 NULL,
     SPEED            FLOAT                  NULL,
     HEADING          FLOAT                  NULL,
-    TIMESTAMP        BIGINT(15)             NOT NULL,
+    TIMESTAMP        BIGINT             NOT NULL,
     GEO_HASH         VARCHAR(45)            NULL,
     DEVICE_OWNER     VARCHAR(45)            NULL,
     DEVICE_ALTITUDE  DOUBLE                 NULL,
@@ -744,24 +766,6 @@ CREATE TABLE IF NOT EXISTS DM_EXT_DEVICE_MAPPING (
     STATUS INT DEFAULT 0,
     PRIMARY KEY (ID)
 );
-/*
- * Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
- *
- * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 -- END OF DM_EXT_DEVICE_MAPPING TABLE--
 
 -- END OF DM_EXT_PERMISSION_MAPPING TABLE--
@@ -773,23 +777,23 @@ CREATE TABLE IF NOT EXISTS DM_EXT_PERMISSION_MAPPING (
 
 -- DYNAMIC TASK TABLES--
 CREATE TABLE IF NOT EXISTS DYNAMIC_TASK (
-    DYNAMIC_TASK_ID INTEGER AUTO_INCREMENT NOT NULL,
-    NAME VARCHAR(300) DEFAULT NULL ,
-    CRON VARCHAR(8000) DEFAULT NULL,
-    IS_ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
-    TASK_CLASS_NAME VARCHAR(8000) DEFAULT NULL,
-    TENANT_ID INTEGER DEFAULT 0,
-    PRIMARY KEY (DYNAMIC_TASK_ID)
+     DYNAMIC_TASK_ID INTEGER AUTO_INCREMENT NOT NULL,
+     NAME VARCHAR(300) DEFAULT NULL ,
+     CRON VARCHAR(8000) DEFAULT NULL,
+     IS_ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
+     TASK_CLASS_NAME VARCHAR(8000) DEFAULT NULL,
+     TENANT_ID INTEGER DEFAULT 0,
+     PRIMARY KEY (DYNAMIC_TASK_ID)
 );
 
 CREATE TABLE IF NOT EXISTS DYNAMIC_TASK_PROPERTIES (
-    DYNAMIC_TASK_ID INTEGER NOT NULL,
-    PROPERTY_NAME VARCHAR(100) DEFAULT 0,
-    PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
-    TENANT_ID VARCHAR(100),
-    PRIMARY KEY (DYNAMIC_TASK_ID, PROPERTY_NAME, TENANT_ID),
-    CONSTRAINT FK_DYNAMIC_TASK_TASK_PROPERTIES FOREIGN KEY (DYNAMIC_TASK_ID) REFERENCES
-    DYNAMIC_TASK (DYNAMIC_TASK_ID) ON DELETE CASCADE ON UPDATE CASCADE
+     DYNAMIC_TASK_ID INTEGER NOT NULL,
+     PROPERTY_NAME VARCHAR(100) DEFAULT 0,
+     PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
+     TENANT_ID VARCHAR(100),
+     PRIMARY KEY (DYNAMIC_TASK_ID, PROPERTY_NAME, TENANT_ID),
+     CONSTRAINT FK_DYNAMIC_TASK_TASK_PROPERTIES FOREIGN KEY (DYNAMIC_TASK_ID) REFERENCES
+             DYNAMIC_TASK (DYNAMIC_TASK_ID) ON DELETE CASCADE ON UPDATE CASCADE
 );
 -- END OF DYNAMIC TASK TABLE--
 
@@ -802,5 +806,34 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
     TYPE_DEFINITION TEXT NOT NULL,
     PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
 );
+-- END OF  DM_DEVICE_SUB_TYPE  TABLE--
+
+-- DM_TRACCAR_UNSYNCED_DEVICES TABLE --
+CREATE TABLE IF NOT EXISTS DM_TRACCAR_UNSYNCED_DEVICES (
+     ID INT NOT NULL AUTO_INCREMENT,
+     DEVICE_NAME VARCHAR(100) NOT NULL,
+     IOTS_DEVICE_IDENTIFIER VARCHAR(300) DEFAULT NULL UNIQUE,
+     TRACCAR_DEVICE_UNIQUE_ID INT NOT NULL,
+     TRACCAR_USENAME VARCHAR(100) NULL,
+     STATUS VARCHAR(100) NULL,
+     TENANT_ID INTEGER DEFAULT 0,
+     PRIMARY KEY (ID)
+);
+-- END OF DM_TRACCAR_UNSYNCED_DEVICES TABLE --
+
+-- SUB_OPERATION_TEMPLATE TABLE--
+CREATE TABLE IF NOT EXISTS SUB_OPERATION_TEMPLATE (
+  SUB_OPERATION_TEMPLATE_ID INT NOT NULL AUTO_INCREMENT,
+  OPERATION_DEFINITION TEXT NOT NULL,
+  OPERATION_CODE VARCHAR(100) NOT NULL,
+  SUB_TYPE_ID INT NOT NULL,
+  DEVICE_TYPE VARCHAR(25) NOT NULL,
+  CREATE_TIMESTAMP TIMESTAMP NULL DEFAULT NULL,
+  UPDATE_TIMESTAMP TIMESTAMP NULL DEFAULT NULL,
+  PRIMARY KEY (SUB_OPERATION_TEMPLATE_ID),
+  CONSTRAINT uk_sub_operation_template UNIQUE (SUB_TYPE_ID, OPERATION_CODE, DEVICE_TYPE),
+--  UNIQUE KEY SUB_OPERATION_TEMPLATE (SUB_TYPE_ID, OPERATION_CODE, DEVICE_TYPE),
+  CONSTRAINT fk_SUB_OPERATION_TEMPLATE_DM_DEVICE_SUB_TYPE FOREIGN KEY (SUB_TYPE_ID, DEVICE_TYPE) REFERENCES DM_DEVICE_SUB_TYPE (SUB_TYPE_ID, DEVICE_TYPE)
+);
 
--- END OF  DM_DEVICE_SUB_TYPE  TABLE--
\ No newline at end of file
+-- END OF SUB_OPERATION_TEMPLATE TABLE--
diff --git a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml
index ad8165fc67..2e591b07c9 100644
--- a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml
+++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml
@@ -18,7 +18,7 @@
   -->
 
 <DataSourceConfig>
-    <Url>jdbc:h2:mem:smart-meter-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</Url>
+    <Url>jdbc:h2:mem:smart-meter-test-db;DB_CLOSE_ON_EXIT=FALSE</Url>
     <DriverClassName>org.h2.Driver</DriverClassName>
     <User>wso2carbon</User>
     <Password>wso2carbon</Password>
diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml
index 6476fc0aa6..f9972e1ef0 100644
--- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml
+++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml
@@ -273,7 +273,7 @@
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <artifactId>powermock-api-mockito2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>