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 45e0ac4dd98..1e645d25544 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
@@ -1,20 +1,15 @@
 CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
      ID   INT auto_increment NOT NULL,
-     NAME VARCHAR(300) NULL DEFAULT NULL,
+     NAME VARCHAR(300) DEFAULT NULL,
      PRIMARY KEY (ID)
 );
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE (
      ID                    INTEGER auto_increment NOT NULL,
-     DESCRIPTION           TEXT NULL DEFAULT NULL,
-     NAME                  VARCHAR(100) NULL DEFAULT NULL,
-     DATE_OF_ENROLLMENT    BIGINT NULL DEFAULT NULL,
-     DATE_OF_LAST_UPDATE   BIGINT NULL DEFAULT NULL,
-     OWNERSHIP             VARCHAR(45) NULL DEFAULT NULL,
-     STATUS                VARCHAR(15) NULL DEFAULT NULL,
-     DEVICE_TYPE_ID        INT(11) NULL DEFAULT NULL,
-     DEVICE_IDENTIFICATION VARCHAR(300) NULL DEFAULT NULL,
-     OWNER                 VARCHAR(45) NULL DEFAULT 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 )
@@ -68,10 +63,10 @@ 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) NULL DEFAULT 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,
+    DATE_OF_ENROLMENT TIMESTAMP DEFAULT NULL,
+    DATE_OF_LAST_UPDATE TIMESTAMP DEFAULT NULL,
     TENANT_ID INT NOT NULL,
     PRIMARY KEY (ID),
     CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES
@@ -128,7 +123,7 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE (
 
 CREATE  TABLE IF NOT EXISTS DM_POLICY (
   ID INT(11) NOT NULL AUTO_INCREMENT ,
-  NAME VARCHAR(45) NULL DEFAULT NULL ,
+  NAME VARCHAR(45) DEFAULT NULL ,
   TENANT_ID INT(11) NOT NULL ,
   PROFILE_ID INT(11) NOT NULL ,
   OWNERSHIP_TYPE VARCHAR(45) NULL,
@@ -351,10 +346,10 @@ 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) NULL DEFAULT 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,
+    DATE_OF_ENROLMENT TIMESTAMP DEFAULT NULL,
+    DATE_OF_LAST_UPDATE TIMESTAMP DEFAULT NULL,
     TENANT_ID INT NOT NULL,
     PRIMARY KEY (ID),
     CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES
@@ -365,12 +360,12 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     NAME VARCHAR(50) NOT NULL,
     APP_IDENTIFIER VARCHAR(50) NOT NULL,
-    PLATFORM VARCHAR(50) NULL DEFAULT NULL,
+    PLATFORM VARCHAR(50) DEFAULT NULL,
     CATEGORY VARCHAR(50) NULL,
     VERSION VARCHAR(50) NULL,
     TYPE VARCHAR(50) NULL,
-    LOCATION_URL VARCHAR(100) NULL DEFAULT NULL,
-    IMAGE_URL VARCHAR(100) NULL DEFAULT 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)
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 bc04de8732b..eb887f68c66 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
@@ -3,7 +3,7 @@
 -- -----------------------------------------------------
 CREATE  TABLE IF NOT EXISTS `DM_DEVICE_TYPE` (
   `ID` INT(11) NOT NULL ,
-  `NAME` VARCHAR(300) NULL DEFAULT NULL ,
+  `NAME` VARCHAR(300) DEFAULT NULL ,
   PRIMARY KEY (`ID`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1;
@@ -14,16 +14,11 @@ DEFAULT CHARACTER SET = latin1;
 -- -----------------------------------------------------
 CREATE  TABLE IF NOT EXISTS `DM_DEVICE` (
   `ID` VARCHAR(20) NOT NULL ,
-  `DESCRIPTION` TEXT NULL DEFAULT NULL ,
-  `NAME` VARCHAR(100) NULL DEFAULT NULL ,
-  `DATE_OF_ENROLLMENT` DATETIME NULL DEFAULT NULL ,
-  `DATE_OF_LAST_UPDATE` DATETIME NULL DEFAULT NULL ,
-  `OWNERSHIP` VARCHAR(45) NULL DEFAULT NULL ,
-  `STATUS` VARCHAR(15) NULL DEFAULT NULL ,
-  `DEVICE_TYPE_ID` INT(11) NULL DEFAULT NULL ,
-  `DEVICE_IDENTIFICATION` VARCHAR(300) NULL DEFAULT NULL ,
-  `OWNER` VARCHAR(45) NULL DEFAULT NULL ,
-  TENANT_ID INTEGER DEFAULT 0,
+  `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`) ,
   INDEX `fk_DM_DEVICE_DM_DEVICE_TYPE2_idx` (`DEVICE_TYPE_ID` ASC) ,
   CONSTRAINT `fk_DM_DEVICE_DM_DEVICE_TYPE2`