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 95a32302b1..42ee0a0df1 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
@@ -97,10 +97,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
---- POLICY RELATED TABLES ----
-
-
-
+-- POLICY RELATED TABLES --
 
 CREATE  TABLE IF NOT EXISTS DM_PROFILE (
   ID INT NOT NULL AUTO_INCREMENT ,
@@ -402,5 +399,5 @@ CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
 -- NOTIFICATION TABLE END --
 
 -- TO:DO - Remove this INSERT sql statement.
---Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
---Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
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 3e528bbbaa..b0962b5085 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
@@ -1,6 +1,3 @@
-/* SQLINES EVALUATION VERSION TRUNCATES VARIABLE NAMES AND COMMENTS. */
-/* OBTAIN A LICENSE AT WWW.SQLINES.COM FOR FULL CONVERSION. THANK YOU. */
-
 CREATE TABLE DM_DEVICE_TYPE (
      ID INT IDENTITY NOT NULL,
      NAME VARCHAR(300) DEFAULT NULL,
@@ -100,7 +97,7 @@ CREATE TABLE DM_DEVICE_OPERATION_RESPONSE (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
---- POLICY RELA... *** SQLINES FOR EVALUATION USE ONLY ***
+-- POLICY RELATED TABLES --
 
 
 
@@ -362,7 +359,7 @@ CREATE TABLE DM_ENROLMENT (
 CREATE TABLE DM_APPLICATION (
     ID INTEGER IDENTITY NOT NULL,
     NAME VARCHAR(50) NOT NULL,
-    APP_IDENTIFIER VARCHAR(50) NOT NULL,
+    APP_IDENTIFIER VARCHAR(150) NOT NULL,
     PLATFORM VARCHAR(50) DEFAULT NULL,
     CATEGORY VARCHAR(50) NULL,
     VERSION VARCHAR(50) NULL,
@@ -386,9 +383,9 @@ CREATE TABLE DM_DEVICE_APPLICATION_MAPPING (
     DM_APPLICATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
--- POLICY RELAT... *** SQLINES FOR EVALUATION USE ONLY ***
+-- POLICY RELATED TABLES  FINISHED --
 
--- NOTIFICATION... *** SQLINES FOR EVALUATION USE ONLY ***
+-- NOTIFICATION TABLE --
 CREATE TABLE DM_NOTIFICATION (
     NOTIFICATION_ID INTEGER IDENTITY NOT NULL,
     DEVICE_ID INTEGER NOT NULL,
@@ -402,8 +399,9 @@ CREATE TABLE DM_NOTIFICATION (
     CONSTRAINT fk_dm_operation_notification FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
--- NOTIFICATION... *** SQLINES FOR EVALUATION USE ONLY ***
+-- NOTIFICATION TABLE END --
+
+-- TO:DO - Remove this INSERT sql statement.
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
 
--- TO:DO - Remo... *** SQLINES FOR EVALUATION USE ONLY ***
---Insert into D... *** SQLINES FOR EVALUATION USE ONLY ***
---Insert into D... *** SQLINES FOR EVALUATION USE ONLY ***
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 56bf241c20..02cfd0d31e 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
@@ -1,30 +1,402 @@
--- -----------------------------------------------------
--- Table `DM_DEVICE_TYPE`
--- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `DM_DEVICE_TYPE` (
-  `ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `NAME` VARCHAR(300) NOT NULL ,
-  PRIMARY KEY (`ID`) )
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `DM_DEVICE`
--- -----------------------------------------------------
-CREATE  TABLE IF NOT EXISTS `DM_DEVICE` (
-  `ID` VARCHAR(20) NOT NULL AUTO_INCREMENT ,
-  `DESCRIPTION` TEXT DEFAULT NULL ,
-  `NAME` VARCHAR(100) NOT NULL ,
-  `DEVICE_TYPE_ID` INT(11) NOT NULL ,
-  `DEVICE_IDENTIFICATION` VARCHAR(300) NOT NULL ,
-  `TENANT_ID` INTEGER NOT NULL,
-  PRIMARY KEY (`ID`) ,
-  INDEX `fk_DM_DEVICE_DM_DEVICE_TYPE2_idx` (`DEVICE_TYPE_ID` ASC) ,
-  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)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
+CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
+     ID   INT auto_increment NOT NULL,
+     NAME VARCHAR(300) DEFAULT NULL,
+     PRIMARY KEY (ID)
+)ENGINE = InnoDB;
+
+
+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_IDENTIFICATION VARCHAR(300) DEFAULT 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
+)ENGINE = InnoDB;
+
+
+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,
+    OPERATION_CODE VARCHAR(1000) 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,
+    PRIMARY KEY (OPERATION_ID),
+    CONSTRAINT fk_dm_operation_config FOREIGN KEY (OPERATION_ID) REFERENCES
+    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,
+    PRIMARY KEY (OPERATION_ID),
+    CONSTRAINT fk_dm_operation_command FOREIGN KEY (OPERATION_ID) REFERENCES
+    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,
+    OPERATION_DETAILS BLOB DEFAULT NULL,
+    PRIMARY KEY (OPERATION_ID),
+    CONSTRAINT fk_dm_operation_policy FOREIGN KEY (OPERATION_ID) REFERENCES
+    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,
+    OPERATION_DETAILS BLOB DEFAULT NULL,
+    PRIMARY KEY (OPERATION_ID),
+    CONSTRAINT fk_dm_operation_profile FOREIGN KEY (OPERATION_ID) REFERENCES
+    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,
+    OWNER VARCHAR(50) NOT NULL,
+    OWNERSHIP VARCHAR(45) DEFAULT NULL,
+    STATUS VARCHAR(50) NULL,
+    DATE_OF_ENROLMENT TIMESTAMP NULL DEFAULT NULL,
+    DATE_OF_LAST_UPDATE TIMESTAMP NULL DEFAULT NULL,
+    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
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OPERATION_MAPPING (
+    ID INTEGER AUTO_INCREMENT NOT NULL,
+    ENROLMENT_ID INTEGER NOT NULL,
+    OPERATION_ID INTEGER NOT NULL,
+    STATUS VARCHAR(50) NULL,
+    PRIMARY KEY (ID),
+    CONSTRAINT fk_dm_device_operation_mapping_device FOREIGN KEY (ENROLMENT_ID) REFERENCES
+    DM_ENROLMENT (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+    CONSTRAINT fk_dm_device_operation_mapping_operation FOREIGN KEY (OPERATION_ID) REFERENCES
+    DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
+    ID INTEGER AUTO_INCREMENT NOT NULL,
+    DEVICE_ID INTEGER NOT NULL,
+    OPERATION_ID INTEGER NOT NULL,
+    OPERATION_RESPONSE BLOB DEFAULT NULL,
+    PRIMARY KEY (ID),
+    CONSTRAINT fk_dm_device_operation_response_device FOREIGN KEY (DEVICE_ID) REFERENCES
+    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+    CONSTRAINT fk_dm_device_operation_response_operation FOREIGN KEY (OPERATION_ID) REFERENCES
+    DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+-- POLICY RELATED TABLES ---
+
+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_ID INT NOT NULL ,
+  CREATED_TIME DATETIME NOT NULL ,
+  UPDATED_TIME DATETIME NOT NULL ,
+  PRIMARY KEY (ID) ,
+  CONSTRAINT DM_PROFILE_DEVICE_TYPE
+    FOREIGN KEY (DEVICE_TYPE_ID )
+    REFERENCES DM_DEVICE_TYPE (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE  TABLE IF NOT EXISTS DM_POLICY (
+  ID INT(11) NOT NULL AUTO_INCREMENT ,
+  NAME VARCHAR(45) DEFAULT NULL ,
+  DESCRIPTION VARCHAR(1000) NULL,
+  TENANT_ID INT(11) NOT NULL ,
+  PROFILE_ID INT(11) NOT NULL ,
+  OWNERSHIP_TYPE VARCHAR(45) NULL,
+  COMPLIANCE VARCHAR(100) NULL,
+  PRIORITY INT NOT NULL,
+  ACTIVE INT(2) NOT NULL,
+  UPDATED INT(1) NULL,
+  PRIMARY KEY (ID) ,
+  CONSTRAINT FK_DM_PROFILE_DM_POLICY
+    FOREIGN KEY (PROFILE_ID )
+    REFERENCES DM_PROFILE (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+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,
+  DEVICE BLOB NOT NULL,
+  POLICY_ID INT(11) NOT NULL ,
+  PRIMARY KEY (ID) ,
+  CONSTRAINT FK_POLICY_DEVICE_POLICY
+    FOREIGN KEY (POLICY_ID )
+    REFERENCES DM_POLICY (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT FK_DEVICE_DEVICE_POLICY
+    FOREIGN KEY (DEVICE_ID )
+    REFERENCES DM_DEVICE (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
+  ID INT(11) NOT NULL ,
+  DEVICE_TYPE_ID INT(11) NOT NULL ,
+  POLICY_ID INT(11) 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_ID )
+    REFERENCES DM_DEVICE_TYPE (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
+  ID INT(11) NOT NULL AUTO_INCREMENT,
+  PROFILE_ID INT(11) NOT NULL,
+  FEATURE_CODE VARCHAR(30) NOT NULL,
+  DEVICE_TYPE_ID INT NOT NULL,
+  TENANT_ID INT(11) NOT NULL ,
+  CONTENT BLOB NULL DEFAULT NULL,
+  PRIMARY KEY (ID),
+  CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES
+    FOREIGN KEY (PROFILE_ID)
+    REFERENCES DM_PROFILE (ID)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE  TABLE IF NOT EXISTS DM_ROLE_POLICY (
+  ID INT(11) NOT NULL AUTO_INCREMENT ,
+  ROLE_NAME VARCHAR(45) NOT NULL ,
+  POLICY_ID INT(11) NOT NULL ,
+  PRIMARY KEY (ID) ,
+  CONSTRAINT FK_ROLE_POLICY_POLICY
+    FOREIGN KEY (POLICY_ID )
+    REFERENCES DM_POLICY (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE  TABLE IF NOT EXISTS DM_USER_POLICY (
+  ID INT NOT NULL AUTO_INCREMENT ,
+  POLICY_ID INT NOT NULL ,
+  USERNAME VARCHAR(45) NOT NULL ,
+  PRIMARY KEY (ID) ,
+  CONSTRAINT DM_POLICY_USER_POLICY
+    FOREIGN KEY (POLICY_ID )
+    REFERENCES DM_POLICY (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+ 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,
+  POLICY_ID INT NOT NULL ,
+  POLICY_CONTENT BLOB NULL ,
+  TENANT_ID INT NOT NULL,
+  APPLIED TINYINT(1) NULL ,
+  CREATED_TIME TIMESTAMP NULL ,
+  UPDATED_TIME TIMESTAMP NULL ,
+  APPLIED_TIME TIMESTAMP NULL ,
+  PRIMARY KEY (ID) ,
+  CONSTRAINT FK_DM_POLICY_DEVCIE_APPLIED
+    FOREIGN KEY (DEVICE_ID )
+    REFERENCES DM_DEVICE (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT FK_DM_POLICY_DEVICE_APPLIED_POLICY
+    FOREIGN KEY (POLICY_ID )
+    REFERENCES DM_POLICY (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_CRITERIA (
+  ID INT NOT NULL AUTO_INCREMENT,
+  TENANT_ID INT NOT NULL,
+  NAME VARCHAR(50) NULL,
+  PRIMARY KEY (ID)
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA (
+  ID INT NOT NULL AUTO_INCREMENT,
+  CRITERIA_ID INT NOT NULL,
+  POLICY_ID INT NOT NULL,
+  PRIMARY KEY (ID),
+  CONSTRAINT FK_CRITERIA_POLICY_CRITERIA
+    FOREIGN KEY (CRITERIA_ID)
+    REFERENCES DM_CRITERIA (ID)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT FK_POLICY_POLICY_CRITERIA
+    FOREIGN KEY (POLICY_ID)
+    REFERENCES DM_POLICY (ID)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA_PROPERTIES (
+  ID INT NOT NULL AUTO_INCREMENT,
+  POLICY_CRITERION_ID INT NOT NULL,
+  PROP_KEY VARCHAR(45) NULL,
+  PROP_VALUE VARCHAR(100) NULL,
+  CONTENT BLOB NULL COMMENT 'This is used to ',
+  PRIMARY KEY (ID),
+  CONSTRAINT FK_POLICY_CRITERIA_PROPERTIES
+    FOREIGN KEY (POLICY_CRITERION_ID)
+    REFERENCES DM_POLICY_CRITERIA (ID)
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+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,
+  POLICY_ID INT NOT NULL,
+  TENANT_ID INT NOT NULL,
+  STATUS INT NULL,
+  LAST_SUCCESS_TIME TIMESTAMP NULL,
+  LAST_REQUESTED_TIME TIMESTAMP NULL,
+  LAST_FAILED_TIME TIMESTAMP NULL,
+  ATTEMPTS INT NULL,
+  PRIMARY KEY (ID),
+  UNIQUE INDEX DEVICE_ID_UNIQUE (DEVICE_ID ASC),
+  CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
+    FOREIGN KEY (POLICY_ID)
+    REFERENCES DM_POLICY (ID)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT (
+  ID INT NOT NULL AUTO_INCREMENT,
+  POLICY_ID INT NOT NULL,
+  DEVICE_TYPE_ID INT NOT NULL,
+  TENANT_ID INT(11) NOT NULL,
+  PRIMARY KEY (ID)
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_FEATURES (
+  ID INT NOT NULL AUTO_INCREMENT,
+  COMPLIANCE_STATUS_ID INT NOT NULL,
+  TENANT_ID INT NOT NULL,
+  FEATURE_CODE VARCHAR(15) NOT NULL,
+  STATUS INT NULL,
+  PRIMARY KEY (ID),
+  CONSTRAINT FK_COMPLIANCE_FEATURES_STATUS
+    FOREIGN KEY (COMPLIANCE_STATUS_ID)
+    REFERENCES DM_POLICY_COMPLIANCE_STATUS (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,
+    OWNER VARCHAR(50) NOT NULL,
+    OWNERSHIP VARCHAR(45) DEFAULT NULL,
+    STATUS VARCHAR(50) NULL,
+    DATE_OF_ENROLMENT TIMESTAMP NULL DEFAULT NULL,
+    DATE_OF_LAST_UPDATE TIMESTAMP NULL DEFAULT NULL,
+    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
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_APPLICATION (
+    ID INTEGER AUTO_INCREMENT NOT NULL,
+    NAME VARCHAR(50) NOT NULL,
+    APP_IDENTIFIER VARCHAR(150) NOT NULL,
+    PLATFORM VARCHAR(50) DEFAULT NULL,
+    CATEGORY VARCHAR(50) NULL,
+    VERSION VARCHAR(50) NULL,
+    TYPE VARCHAR(50) NULL,
+    LOCATION_URL VARCHAR(100) DEFAULT NULL,
+    IMAGE_URL VARCHAR(100) DEFAULT NULL,
+    APP_PROPERTIES BLOB NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY (ID)
+)ENGINE = InnoDB;
+
+
+CREATE TABLE IF NOT EXISTS DM_DEVICE_APPLICATION_MAPPING (
+    ID INTEGER AUTO_INCREMENT NOT NULL,
+    DEVICE_ID INTEGER NOT NULL,
+    APPLICATION_ID INTEGER NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY (ID),
+    CONSTRAINT fk_dm_device FOREIGN KEY (DEVICE_ID) REFERENCES
+    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+    CONSTRAINT fk_dm_application FOREIGN KEY (APPLICATION_ID) REFERENCES
+    DM_APPLICATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+)ENGINE = InnoDB;
+
+-- POLICY RELATED TABLES  FINISHED --
+
+-- NOTIFICATION TABLE --
+CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
+    NOTIFICATION_ID INTEGER AUTO_INCREMENT NOT NULL,
+    DEVICE_ID INTEGER NOT NULL,
+    OPERATION_ID INTEGER NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    STATUS VARCHAR(10) NULL,
+    DESCRIPTION VARCHAR(100) 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
+)ENGINE = InnoDB;
+-- NOTIFICATION TABLE END --
+
+-- TO:DO - Remove this INSERT sql statement.
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
+
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 ef8909f917..c369bf0149 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
@@ -1,6 +1,3 @@
-/* SQLINES EVALUATION VERSION TRUNCATES VARIABLE NAMES AND COMMENTS. */
-/* OBTAIN A LICENSE AT WWW.SQLINES.COM FOR FULL CONVERSION. THANK YOU. */
-
 CREATE TABLE DM_DEVICE_TYPE (
      ID NUMBER(10) NOT NULL,
      NAME VARCHAR2(300) DEFAULT NULL,
@@ -166,7 +163,7 @@ BEGIN
 END;
 /
 
---- POLICY RELA... *** SQLINES FOR EVALUATION USE ONLY ***
+-- POLICY RELATED TABLES ---
 
 
 
@@ -555,7 +552,7 @@ END;
 CREATE TABLE DM_APPLICATION (
     ID NUMBER(10) NOT NULL,
     NAME VARCHAR2(50) NOT NULL,
-    APP_IDENTIFIER VARCHAR2(50) NOT NULL,
+    APP_IDENTIFIER VARCHAR2(150) NOT NULL,
     PLATFORM VARCHAR2(50) DEFAULT NULL,
     CATEGORY VARCHAR2(50) NULL,
     VERSION VARCHAR2(50) NULL,
@@ -601,9 +598,9 @@ BEGIN
 END;
 /
 
--- POLICY RELAT... *** SQLINES FOR EVALUATION USE ONLY ***
+-- POLICY RELATED TABLES  FINISHED --
 
--- NOTIFICATION... *** SQLINES FOR EVALUATION USE ONLY ***
+-- NOTIFICATION TABLE --
 CREATE TABLE DM_NOTIFICATION (
     NOTIFICATION_ID NUMBER(10) NOT NULL,
     DEVICE_ID NUMBER(10) NOT NULL,
@@ -628,8 +625,9 @@ BEGIN
  SELECT DM_NOTIFICATION_seq.NEXTVAL INTO :NEW.NOTIFICATION_ID FROM DUAL;
 END;
 /
--- NOTIFICATION... *** SQLINES FOR EVALUATION USE ONLY ***
+-- NOTIFICATION TABLE END --
+
+-- TO:DO - Remove this INSERT sql statement.
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
 
--- TO:DO - Remo... *** SQLINES FOR EVALUATION USE ONLY ***
---Insert into D... *** SQLINES FOR EVALUATION USE ONLY ***
---Insert into D... *** SQLINES FOR EVALUATION USE ONLY ***
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 2b3436ec5d..2eeef9d8d8 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
@@ -1,455 +1,349 @@
-/* SQLINES EVALUATION VERSION TRUNCATES VARIABLE NAMES AND COMMENTS. */
-/* OBTAIN A LICENSE AT WWW.SQLINES.COM FOR FULL CONVERSION. THANK YOU. */
-
-CREATE SEQUENCE CREATE SEQUENCE ;
-
 CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
-     ID   INT default nextval ('DM_DEVICE_TYPE_seq') NOT NULL,
-     NAME VARCHAR(300) DEFAULT NULL,
-     PRIMARY KEY (ID)
+  ID BIGSERIAL PRIMARY KEY,
+  NAME VARCHAR(300) DEFAULT NULL
 );
 
-CREATE SEQUENCE CREATE SEQUEN;
-
 CREATE TABLE IF NOT EXISTS DM_DEVICE (
-     ID                    INTEGER default nextval ('DM_DEVICE_seq') NOT NULL,
-     DESCRIPTION           TEXT DEFAULT NULL,
-     NAME                  VARCHAR(100) DEFAULT NULL,
-     DEVICE_TYPE_ID        INT DEFAULT NULL,
-     DEVICE_IDENTIFICATION VARCHAR(300) DEFAULT 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
+  ID                    BIGSERIAL NOT NULL PRIMARY KEY,
+  DESCRIPTION           TEXT DEFAULT NULL,
+  NAME                  VARCHAR(100) DEFAULT NULL,
+  DEVICE_TYPE_ID        INTEGER DEFAULT NULL,
+  DEVICE_IDENTIFICATION VARCHAR(300) DEFAULT NULL,
+  TENANT_ID INTEGER DEFAULT 0,
+  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
 );
 
-CREATE SEQUENCE CREATE SEQUENCE ;
-
 CREATE TABLE IF NOT EXISTS DM_OPERATION (
-    ID INTEGER DEFAULT NEXTVAL ('DM_OPERATION_seq') NOT NULL,
-    TYPE VARCHAR(50) NOT NULL,
-    CREATED_TIMESTAMP TIMESTAMP(0) NOT NULL,
-    RECEIVED_TIMESTAMP TIMESTAMP(0) NULL,
-    OPERATION_CODE VARCHAR(1000) NOT NULL,
-    PRIMARY KEY (ID)
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  TYPE VARCHAR(50) NOT NULL,
+  CREATED_TIMESTAMP TIMESTAMP NOT NULL,
+  RECEIVED_TIMESTAMP TIMESTAMP NULL,
+  OPERATION_CODE VARCHAR(1000) NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS DM_CONFIG_OPERATION (
-    OPERATION_ID INTEGER NOT NULL,
-    OPERATION_CONFIG  BYTEA DEFAULT NULL,
-    PRIMARY KEY (OPERATION_ID),
-    CONSTRAINT fk_dm_operation_config FOREIGN KEY (OPERATION_ID) REFERENCES
+  OPERATION_ID INTEGER NOT NULL,
+  OPERATION_CONFIG BYTEA DEFAULT NULL,
+  PRIMARY KEY (OPERATION_ID),
+  CONSTRAINT fk_dm_operation_config FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
 CREATE TABLE IF NOT EXISTS DM_COMMAND_OPERATION (
-    OPERATION_ID INTEGER NOT NULL,
-    ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (OPERATION_ID),
-    CONSTRAINT fk_dm_operation_command FOREIGN KEY (OPERATION_ID) REFERENCES
+  OPERATION_ID INTEGER NOT NULL,
+  ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
+  PRIMARY KEY (OPERATION_ID),
+  CONSTRAINT fk_dm_operation_command FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
 CREATE TABLE IF NOT EXISTS DM_POLICY_OPERATION (
-    OPERATION_ID INTEGER NOT NULL,
-    ENABLED INTEGER NOT NULL DEFAULT 0,
-    OPERATION_DETAILS BYTEA DEFAULT NULL,
-    PRIMARY KEY (OPERATION_ID),
-    CONSTRAINT fk_dm_operation_policy FOREIGN KEY (OPERATION_ID) REFERENCES
+  OPERATION_ID INTEGER NOT NULL,
+  ENABLED INTEGER NOT NULL DEFAULT 0,
+  OPERATION_DETAILS BYTEA DEFAULT NULL,
+  PRIMARY KEY (OPERATION_ID),
+  CONSTRAINT fk_dm_operation_policy FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
 CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
-    OPERATION_ID INTEGER NOT NULL,
-    ENABLED INTEGER NOT NULL DEFAULT 0,
-    OPERATION_DETAILS BYTEA DEFAULT NULL,
-    PRIMARY KEY (OPERATION_ID),
-    CONSTRAINT fk_dm_operation_profile FOREIGN KEY (OPERATION_ID) REFERENCES
+  OPERATION_ID INTEGER NOT NULL,
+  ENABLED INTEGER NOT NULL DEFAULT 0,
+  OPERATION_DETAILS BYTEA DEFAULT NULL,
+  PRIMARY KEY (OPERATION_ID),
+  CONSTRAINT fk_dm_operation_profile FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE SEQUENCE CREATE SEQUENCE ;
-
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
-    ID INTEGER DEFAULT NEXTVAL ('DM_ENROLMENT_seq') NOT NULL,
-    DEVICE_ID INTEGER NOT NULL,
-    OWNER VARCHAR(50) NOT NULL,
-    OWNERSHIP VARCHAR(45) DEFAULT NULL,
-    STATUS VARCHAR(50) NULL,
-    DATE_OF_ENROLMENT TIMESTAMP(0) DEFAULT NULL,
-    DATE_OF_LAST_UPDATE TIMESTAMP(0) DEFAULT NULL,
-    TENANT_ID INT NOT NULL,
-    PRIMARY KEY (ID),
-    CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  DEVICE_ID INTEGER NOT NULL,
+  OWNER VARCHAR(50) NOT NULL,
+  OWNERSHIP VARCHAR(45) DEFAULT NULL,
+  STATUS VARCHAR(50) NULL,
+  DATE_OF_ENROLMENT TIMESTAMP NULL DEFAULT NULL,
+  DATE_OF_LAST_UPDATE TIMESTAMP NULL DEFAULT NULL,
+  TENANT_ID INTEGER NOT NULL,
+  CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE SEQUENCE ;
-
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OPERATION_MAPPING (
-    ID INTEGER DEFAULT NEXTVAL ('DM_ENROLMENT_OPERATION_MAPPING_seq') NOT NULL,
-    ENROLMENT_ID INTEGER NOT NULL,
-    OPERATION_ID INTEGER NOT NULL,
-    STATUS VARCHAR(50) NULL,
-    PRIMARY KEY (ID),
-    CONSTRAINT fk_dm_device_operation_mapping_device FOREIGN KEY (ENROLMENT_ID) REFERENCES
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  ENROLMENT_ID INTEGER NOT NULL,
+  OPERATION_ID INTEGER NOT NULL,
+  STATUS VARCHAR(50) NULL,
+  CONSTRAINT fk_dm_device_operation_mapping_device FOREIGN KEY (ENROLMENT_ID) REFERENCES
     DM_ENROLMENT (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
-    CONSTRAINT fk_dm_device_operation_mapping_operation FOREIGN KEY (OPERATION_ID) REFERENCES
+  CONSTRAINT fk_dm_device_operation_mapping_operation FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE SEQUENCE ;
-
 CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
-    ID INTEGER DEFAULT NEXTVAL ('DM_DEVICE_OPERATION_RESPONSE_seq') NOT NULL,
-    DEVICE_ID INTEGER NOT NULL,
-    OPERATION_ID INTEGER NOT NULL,
-    OPERATION_RESPONSE BYTEA DEFAULT NULL,
-    PRIMARY KEY (ID),
-    CONSTRAINT fk_dm_device_operation_response_device FOREIGN KEY (DEVICE_ID) REFERENCES
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  DEVICE_ID INTEGER NOT NULL,
+  OPERATION_ID INTEGER NOT NULL,
+  OPERATION_RESPONSE BYTEA DEFAULT NULL,
+  CONSTRAINT fk_dm_device_operation_response_device FOREIGN KEY (DEVICE_ID) REFERENCES
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
-    CONSTRAINT fk_dm_device_operation_response_operation FOREIGN KEY (OPERATION_ID) REFERENCES
+  CONSTRAINT fk_dm_device_operation_response_operation FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
---- POLICY RELA... *** SQLINES FOR EVALUATION USE ONLY ***
-
-
-
-
-CREATE SEQUENCE CREATE SEQUENC;
+-- POLICY RELATED TABLES ---
 
 CREATE  TABLE IF NOT EXISTS DM_PROFILE (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_PROFILE_seq') ,
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
   PROFILE_NAME VARCHAR(45) NOT NULL ,
-  TENANT_ID INT NOT NULL ,
-  DEVICE_TYPE_ID INT NOT NULL ,
-  CREATED_TIME TIMESTAMP(0) NOT NULL ,
-  UPDATED_TIME TIMESTAMP(0) NOT NULL ,
-  PRIMARY KEY (ID) ,
+  TENANT_ID INTEGER NOT NULL ,
+  DEVICE_TYPE_ID INTEGER NOT NULL ,
+  CREATED_TIME TIMESTAMP NOT NULL ,
+  UPDATED_TIME TIMESTAMP NOT NULL ,
   CONSTRAINT DM_PROFILE_DEVICE_TYPE
-    FOREIGN KEY (DEVICE_TYPE_ID )
-    REFERENCES DM_DEVICE_TYPE (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (DEVICE_TYPE_ID )
+  REFERENCES DM_DEVICE_TYPE (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
 
-
-
-
-CREATE SEQUENCE CREATE SEQUEN;
-
 CREATE  TABLE IF NOT EXISTS DM_POLICY (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_POLICY_seq') ,
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
   NAME VARCHAR(45) DEFAULT NULL ,
   DESCRIPTION VARCHAR(1000) NULL,
-  TENANT_ID INT NOT NULL ,
-  PROFILE_ID INT NOT NULL ,
+  TENANT_ID INTEGER NOT NULL ,
+  PROFILE_ID INTEGER NOT NULL ,
   OWNERSHIP_TYPE VARCHAR(45) NULL,
   COMPLIANCE VARCHAR(100) NULL,
-  PRIORITY INT NOT NULL,
-  ACTIVE INT NOT NULL,
-  UPDATED INT NULL,
-  PRIMARY KEY (ID) ,
+  PRIORITY INTEGER NOT NULL,
+  ACTIVE INTEGER NOT NULL,
+  UPDATED INTEGER NULL,
   CONSTRAINT FK_DM_PROFILE_DM_POLICY
-    FOREIGN KEY (PROFILE_ID )
-    REFERENCES DM_PROFILE (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (PROFILE_ID )
+  REFERENCES DM_PROFILE (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-
-
-
-CREATE SEQUENCE DEFAULT ;
-
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_DEVICE_POLICY_seq') ,
-  DEVICE_ID INT NOT NULL ,
-  ENROLMENT_ID INT NOT NULL,
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  DEVICE_ID INTEGER NOT NULL ,
+  ENROLMENT_ID INTEGER NOT NULL,
   DEVICE BYTEA NOT NULL,
-  POLICY_ID INT NOT NULL ,
-  PRIMARY KEY (ID) ,
+  POLICY_ID INTEGER NOT NULL ,
   CONSTRAINT FK_POLICY_DEVICE_POLICY
-    FOREIGN KEY (POLICY_ID )
-    REFERENCES DM_POLICY (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
+  FOREIGN KEY (POLICY_ID )
+  REFERENCES DM_POLICY (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION,
   CONSTRAINT FK_DEVICE_DEVICE_POLICY
-    FOREIGN KEY (DEVICE_ID )
-    REFERENCES DM_DEVICE (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (DEVICE_ID )
+  REFERENCES DM_DEVICE (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-
-
-
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
-  ID INT NOT NULL ,
-  DEVICE_TYPE_ID INT NOT NULL ,
-  POLICY_ID INT NOT NULL ,
+  ID INTEGER NOT NULL,
+  DEVICE_TYPE_ID INTEGER NOT NULL ,
+  POLICY_ID INTEGER 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,
+  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_ID )
-    REFERENCES DM_DEVICE_TYPE (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (DEVICE_TYPE_ID )
+  REFERENCES DM_DEVICE_TYPE (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-
-
-
-
-CREATE SEQUENCE DEFAULT ;
-
 CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_PROFILE_FEATURES_seq'),
-  PROFILE_ID INT NOT NULL,
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  PROFILE_ID INTEGER NOT NULL,
   FEATURE_CODE VARCHAR(30) NOT NULL,
   DEVICE_TYPE_ID INT NOT NULL,
-  TENANT_ID INT NOT NULL ,
+  TENANT_ID INTEGER NOT NULL ,
   CONTENT BYTEA NULL DEFAULT NULL,
-  PRIMARY KEY (ID),
   CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES
-    FOREIGN KEY (PROFILE_ID)
-    REFERENCES DM_PROFILE (ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (PROFILE_ID)
+  REFERENCES DM_PROFILE (ID)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-
-
-
-CREATE SEQUENCE CREATE SEQUENCE ;
-
 CREATE  TABLE IF NOT EXISTS DM_ROLE_POLICY (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_ROLE_POLICY_seq') ,
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
   ROLE_NAME VARCHAR(45) NOT NULL ,
-  POLICY_ID INT NOT NULL ,
-  PRIMARY KEY (ID) ,
+  POLICY_ID INTEGER NOT NULL,
   CONSTRAINT FK_ROLE_POLICY_POLICY
-    FOREIGN KEY (POLICY_ID )
-    REFERENCES DM_POLICY (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (POLICY_ID )
+  REFERENCES DM_POLICY (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-
-
-
-CREATE SEQUENCE CREATE SEQUENCE ;
-
 CREATE  TABLE IF NOT EXISTS DM_USER_POLICY (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_USER_POLICY_seq') ,
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
   POLICY_ID INT NOT NULL ,
-  USERNAME VARCHAR(45) NOT NULL ,
-  PRIMARY KEY (ID) ,
+  USERNAME VARCHAR(45) NOT NULL,
   CONSTRAINT DM_POLICY_USER_POLICY
-    FOREIGN KEY (POLICY_ID )
-    REFERENCES DM_POLICY (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (POLICY_ID )
+  REFERENCES DM_POLICY (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-
- CREATE SEQUENCE ;
-
- CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY_APPLIED (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_DEVICE_POLICY_APPLIED_seq') ,
-  DEVICE_ID INT NOT NULL ,
-  ENROLMENT_ID INT NOT NULL,
-  POLICY_ID INT NOT NULL ,
+CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY_APPLIED (
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  DEVICE_ID INTEGER NOT NULL ,
+  ENROLMENT_ID INTEGER NOT NULL,
+  POLICY_ID INTEGER NOT NULL ,
   POLICY_CONTENT BYTEA NULL ,
-  TENANT_ID INT NOT NULL,
-  APPLIED SMALLINT NULL ,
-  CREATED_TIME TIMESTAMP(0) NULL ,
-  UPDATED_TIME TIMESTAMP(0) NULL ,
-  APPLIED_TIME TIMESTAMP(0) NULL ,
-  PRIMARY KEY (ID) ,
+  TENANT_ID INTEGER NOT NULL,
+  APPLIED INTEGER[1] NULL ,
+  CREATED_TIME TIMESTAMP NULL ,
+  UPDATED_TIME TIMESTAMP NULL ,
+  APPLIED_TIME TIMESTAMP NULL ,
   CONSTRAINT FK_DM_POLICY_DEVCIE_APPLIED
-    FOREIGN KEY (DEVICE_ID )
-    REFERENCES DM_DEVICE (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
+  FOREIGN KEY (DEVICE_ID )
+  REFERENCES DM_DEVICE (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION,
   CONSTRAINT FK_DM_POLICY_DEVICE_APPLIED_POLICY
-    FOREIGN KEY (POLICY_ID )
-    REFERENCES DM_POLICY (ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (POLICY_ID )
+  REFERENCES DM_POLICY (ID )
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-
-
-CREATE SEQUENCE CREATE SEQUENCE;
-
 CREATE TABLE IF NOT EXISTS DM_CRITERIA (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_CRITERIA_seq'),
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
   TENANT_ID INT NOT NULL,
-  NAME VARCHAR(50) NULL,
-  PRIMARY KEY (ID)
+  NAME VARCHAR(50) NULL
 );
 
-
-
-CREATE SEQUENCE DEFAULT ;
-
 CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_POLICY_CRITERIA_seq'),
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
   CRITERIA_ID INT NOT NULL,
   POLICY_ID INT NOT NULL,
-  PRIMARY KEY (ID),
   CONSTRAINT FK_CRITERIA_POLICY_CRITERIA
-    FOREIGN KEY (CRITERIA_ID)
-    REFERENCES DM_CRITERIA (ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
+  FOREIGN KEY (CRITERIA_ID)
+  REFERENCES DM_CRITERIA (ID)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION,
   CONSTRAINT FK_POLICY_POLICY_CRITERIA
-    FOREIGN KEY (POLICY_ID)
-    REFERENCES DM_POLICY (ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (POLICY_ID)
+  REFERENCES DM_POLICY (ID)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-CREATE SEQUENCE ;
-
 CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA_PROPERTIES (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_POLICY_CRITERIA_PROPERTIES_seq'),
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
   POLICY_CRITERION_ID INT NOT NULL,
   PROP_KEY VARCHAR(45) NULL,
   PROP_VALUE VARCHAR(100) NULL,
-  CONTENT BYTEA NULL ,
-  PRIMARY KEY (ID),
+  CONTENT BYTEA NULL,
   CONSTRAINT FK_POLICY_CRITERIA_PROPERTIES
-    FOREIGN KEY (POLICY_CRITERION_ID)
-    REFERENCES DM_POLICY_CRITERIA (ID)
-    ON DELETE CASCADE
-    ON UPDATE NO ACTION
+  FOREIGN KEY (POLICY_CRITERION_ID)
+  REFERENCES DM_POLICY_CRITERIA (ID)
+  ON DELETE CASCADE
+  ON UPDATE NO ACTION
 );
+COMMENT ON COLUMN DM_POLICY_CRITERIA_PROPERTIES.CONTENT IS 'This is used to ';
 
-CREATE SEQUENCE ;
 
 CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_POLICY_COMPLIANCE_STATUS_seq'),
-  DEVICE_ID INT NOT NULL,
-  ENROLMENT_ID INT NOT NULL,
-  POLICY_ID INT NOT NULL,
-  TENANT_ID INT NOT NULL,
-  STATUS INT NULL,
-  LAST_SUCCESS_TIME TIMESTAMP(0) NULL,
-  LAST_REQUESTED_TIME TIMESTAMP(0) NULL,
-  LAST_FAILED_TIME TIMESTAMP(0) NULL,
-  ATTEMPTS INT NULL,
-  PRIMARY KEY (ID),
-  CONSTRAINT DEVICE_ID_UNIQUE UNIQUE (DEVICE_ID ASC),
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  DEVICE_ID INTEGER NOT NULL,
+  ENROLMENT_ID INTEGER NOT NULL,
+  POLICY_ID INTEGER NOT NULL,
+  TENANT_ID INTEGER NOT NULL,
+  STATUS INTEGER NULL,
+  LAST_SUCCESS_TIME TIMESTAMP NULL,
+  LAST_REQUESTED_TIME TIMESTAMP NULL,
+  LAST_FAILED_TIME TIMESTAMP NULL,
+  ATTEMPTS INTEGER NULL,
   CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
-    FOREIGN KEY (POLICY_ID)
-    REFERENCES DM_POLICY (ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (POLICY_ID)
+  REFERENCES DM_POLICY (ID)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
+CREATE UNIQUE INDEX DEVICE_ID_UNIQUE ON DM_POLICY_COMPLIANCE_STATUS (DEVICE_ID ASC);
 
 
-CREATE SEQUENCE DEFAULT ;
-
 CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_POLICY_CHANGE_MGT_seq'),
-  POLICY_ID INT NOT NULL,
-  DEVICE_TYPE_ID INT NOT NULL,
-  TENANT_ID INT NOT NULL,
-  PRIMARY KEY (ID)
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  POLICY_ID INTEGER NOT NULL,
+  DEVICE_TYPE_ID INTEGER NOT NULL,
+  TENANT_ID INTEGER NOT NULL
 );
 
 
-CREATE SEQUENCE ;
-
 CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_FEATURES (
-  ID INT NOT NULL DEFAULT NEXTVAL ('DM_POLICY_COMPLIANCE_FEATURES_seq'),
-  COMPLIANCE_STATUS_ID INT NOT NULL,
-  TENANT_ID INT NOT NULL,
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  COMPLIANCE_STATUS_ID INTEGER NOT NULL,
+  TENANT_ID INTEGER NOT NULL,
   FEATURE_CODE VARCHAR(15) NOT NULL,
-  STATUS INT NULL,
-  PRIMARY KEY (ID),
+  STATUS INTEGER NULL,
   CONSTRAINT FK_COMPLIANCE_FEATURES_STATUS
-    FOREIGN KEY (COMPLIANCE_STATUS_ID)
-    REFERENCES DM_POLICY_COMPLIANCE_STATUS (ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  FOREIGN KEY (COMPLIANCE_STATUS_ID)
+  REFERENCES DM_POLICY_COMPLIANCE_STATUS (ID)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION
 );
 
-CREATE SEQUENCE CREATE SEQUENCE ;
 
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
-    ID INTEGER DEFAULT NEXTVAL ('DM_ENROLMENT_seq') NOT NULL,
-    DEVICE_ID INTEGER NOT NULL,
-    OWNER VARCHAR(50) NOT NULL,
-    OWNERSHIP VARCHAR(45) DEFAULT NULL,
-    STATUS VARCHAR(50) NULL,
-    DATE_OF_ENROLMENT TIMESTAMP(0) DEFAULT NULL,
-    DATE_OF_LAST_UPDATE TIMESTAMP(0) DEFAULT NULL,
-    TENANT_ID INT NOT NULL,
-    PRIMARY KEY (ID),
-    CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  DEVICE_ID INTEGER NOT NULL,
+  OWNER VARCHAR(50) NOT NULL,
+  OWNERSHIP VARCHAR(45) DEFAULT NULL,
+  STATUS VARCHAR(50) NULL,
+  DATE_OF_ENROLMENT TIMESTAMP NULL DEFAULT NULL,
+  DATE_OF_LAST_UPDATE TIMESTAMP NULL DEFAULT NULL,
+  TENANT_ID INT NOT NULL,
+  CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE SEQUENCE CREATE SEQUENCE ;
 
 CREATE TABLE IF NOT EXISTS DM_APPLICATION (
-    ID INTEGER DEFAULT NEXTVAL ('DM_APPLICATION_seq') NOT NULL,
-    NAME VARCHAR(50) NOT NULL,
-    APP_IDENTIFIER VARCHAR(50) NOT NULL,
-    PLATFORM VARCHAR(50) DEFAULT NULL,
-    CATEGORY VARCHAR(50) NULL,
-    VERSION VARCHAR(50) NULL,
-    TYPE VARCHAR(50) NULL,
-    LOCATION_URL VARCHAR(100) DEFAULT NULL,
-    IMAGE_URL VARCHAR(100) DEFAULT NULL,
-    APP_PROPERTIES BYTEA NULL,
-    TENANT_ID INTEGER NOT NULL,
-    PRIMARY KEY (ID)
-);
-
-CREATE SEQUENCE ;
-
-CREATE TABLE IF NOT EXISTS DM_DEVICE_APPLICATION_MAPPING (
-    ID INTEGER DEFAULT NEXTVAL ('DM_DEVICE_APPLICATION_MAPPING_seq') NOT NULL,
-    DEVICE_ID INTEGER NOT NULL,
-    APPLICATION_ID INTEGER NOT NULL,
-    TENANT_ID INTEGER NOT NULL,
-    PRIMARY KEY (ID),
-    CONSTRAINT fk_dm_device FOREIGN KEY (DEVICE_ID) REFERENCES
-    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
-    CONSTRAINT fk_dm_application FOREIGN KEY (APPLICATION_ID) REFERENCES
-    DM_APPLICATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+  ID BIGSERIAL NOT NULL PRIMARY KEY,
+  NAME VARCHAR(50) NOT NULL,
+  APP_IDENTIFIER VARCHAR(150) NOT NULL,
+  PLATFORM VARCHAR(50) DEFAULT NULL,
+  CATEGORY VARCHAR(50) NULL,
+  VERSION VARCHAR(50) NULL,
+  TYPE VARCHAR(50) NULL,
+  LOCATION_URL VARCHAR(100) DEFAULT NULL,
+  IMAGE_URL VARCHAR(100) DEFAULT NULL,
+  APP_PROPERTIES BYTEA NULL,
+  TENANT_ID INTEGER NOT NULL
 );
 
--- POLICY RELAT... *** SQLINES FOR EVALUATION USE ONLY ***
-
--- NOTIFICATION... *** SQLINES FOR EVALUATION USE ONLY ***
-CREATE SEQUENCE P���������DM_O;
+-- POLICY RELATED TABLES  FINISHED --
 
+-- NOTIFICATION TABLE --
 CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
-    NOTIFICATION_ID INTEGER DEFAULT NEXTVAL ('DM_NOTIFICATION_seq') NOT NULL,
-    DEVICE_ID INTEGER NOT NULL,
-    OPERATION_ID INTEGER NOT NULL,
-    TENANT_ID INTEGER NOT NULL,
-    STATUS VARCHAR(10) NULL,
-    DESCRIPTION VARCHAR(100) NULL,
-    PRIMARY KEY (NOTIFICATION_ID),
-    CONSTRAINT fk_dm_device_notification FOREIGN KEY (DEVICE_ID) REFERENCES
+  NOTIFICATION_ID BIGSERIAL NOT NULL PRIMARY KEY,
+  DEVICE_ID INTEGER NOT NULL,
+  OPERATION_ID INTEGER NOT NULL,
+  TENANT_ID INTEGER NOT NULL,
+  STATUS VARCHAR(10) NULL,
+  DESCRIPTION VARCHAR(100) NULL,
+  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
+  CONSTRAINT fk_dm_operation_notification FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
--- NOTIFICATION... *** SQLINES FOR EVALUATION USE ONLY ***
+-- NOTIFICATION TABLE END --
 
--- TO:DO - Remo... *** SQLINES FOR EVALUATION USE ONLY ***
---Insert into D... *** SQLINES FOR EVALUATION USE ONLY ***
---Insert into D... *** SQLINES FOR EVALUATION USE ONLY ***
\ No newline at end of file
+-- TO:DO - Remove this INSERT sql statement.
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
+Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
\ No newline at end of file