diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/h2.sql
index 87f8da20a..f1749a8a8 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/h2.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/h2.sql
@@ -4,7 +4,7 @@
   CREATE TABLE IF NOT EXISTS `WIN_DEVICE` (
   `DEVICE_ID` VARCHAR(45) NOT NULL,
   `CHANNEL_URI` VARCHAR(100) NULL DEFAULT NULL,
-  `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL,
+  `DEVICE_INFO` TEXT NULL DEFAULT NULL,
   `IMEI` VARCHAR(45) NULL DEFAULT NULL,
   `IMSI` VARCHAR(45) NULL DEFAULT NULL,
   `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mssql.sql
index 4bcd1e3db..593515185 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mssql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mssql.sql
@@ -15,7 +15,7 @@ CREATE TABLE WIN_FEATURE (
   CREATE  TABLE WIN_DEVICE (
   DEVICE_ID VARCHAR(45) NOT NULL,
   CHANNEL_URI VARCHAR(100) NULL DEFAULT NULL,
-  DEVICE_INFO VARCHAR(8000) NULL DEFAULT NULL,
+  DEVICE_INFO TEXT NULL DEFAULT NULL,
   IMEI VARCHAR(45) NULL DEFAULT NULL,
   IMSI VARCHAR(45) NULL DEFAULT NULL,
   OS_VERSION VARCHAR(45) NULL DEFAULT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql
index 9ebf6519f..2ebcc80f7 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql
@@ -3,7 +3,8 @@
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `WIN_DEVICE` (
   `DEVICE_ID` VARCHAR(45) NOT NULL,
-  `PUSH_TOKEN` VARCHAR(45) NULL DEFAULT NULL,
+  `CHANNEL_URI` VARCHAR(100) NULL DEFAULT NULL,
+  `DEVICE_INFO` TEXT NULL DEFAULT NULL,
   `IMEI` VARCHAR(45) NULL DEFAULT NULL,
   `IMSI` VARCHAR(45) NULL DEFAULT NULL,
   `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL,
@@ -11,10 +12,9 @@ CREATE TABLE IF NOT EXISTS `WIN_DEVICE` (
   `VENDOR` VARCHAR(45) NULL DEFAULT NULL,
   `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
   `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
-  `CHALLENGE` VARCHAR(45) NULL DEFAULT NULL,
-  `TOKEN` VARCHAR(50) NULL DEFAULT NULL,
-  `UNLOCK_TOKEN` VARCHAR(2000) NULL DEFAULT NULL,
   `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
+  `MAC_ADDRESS` VARCHAR(45) NULL DEFAULT NULL,
+  `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (`DEVICE_ID`))
 ENGINE = InnoDB;
 
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/oracle.sql
index fee14fe86..91a26bd3a 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/oracle.sql
@@ -3,18 +3,18 @@
 -- -----------------------------------------------------
 CREATE TABLE WIN_DEVICE (
   DEVICE_ID VARCHAR(45) NOT NULL,
-  PUSH_TOKEN VARCHAR(45) DEFAULT NULL,
-  IMEI VARCHAR(45) DEFAULT NULL,
-  IMSI VARCHAR(45) DEFAULT NULL,
-  OS_VERSION VARCHAR(45) DEFAULT NULL,
-  DEVICE_MODEL VARCHAR(45) DEFAULT NULL,
-  VENDOR VARCHAR(45) DEFAULT NULL,
-  LATITUDE VARCHAR(45) DEFAULT NULL,
-  LONGITUDE VARCHAR(45) DEFAULT NULL,
-  CHALLENGE VARCHAR(45) DEFAULT NULL,
-  TOKEN VARCHAR(50) DEFAULT NULL,
-  UNLOCK_TOKEN VARCHAR(2000) DEFAULT NULL,
-  SERIAL VARCHAR(45) DEFAULT NULL,
+  CHANNEL_URI VARCHAR(100) NULL DEFAULT NULL,
+  DEVICE_INFO TEXT NULL DEFAULT NULL,
+  IMEI VARCHAR(45) NULL DEFAULT NULL,
+  IMSI VARCHAR(45) NULL DEFAULT NULL,
+  OS_VERSION VARCHAR(45) NULL DEFAULT NULL,
+  DEVICE_MODEL VARCHAR(45) NULL DEFAULT NULL,
+  VENDOR VARCHAR(45) NULL DEFAULT NULL,
+  LATITUDE VARCHAR(45) NULL DEFAULT NULL,
+  LONGITUDE VARCHAR(45) NULL DEFAULT NULL,
+  SERIAL VARCHAR(45) NULL DEFAULT NULL,
+  MAC_ADDRESS VARCHAR(45) NULL DEFAULT NULL,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (DEVICE_ID)
 )
 /
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/postgresql.sql
index ae9ddb615..d7444757d 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/postgresql.sql
@@ -3,7 +3,8 @@
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS WIN_DEVICE (
   DEVICE_ID VARCHAR(45) NOT NULL,
-  PUSH_TOKEN VARCHAR(45) NULL DEFAULT NULL,
+  CHANNEL_URI VARCHAR(100) NULL DEFAULT NULL,
+  DEVICE_INFO TEXT NULL DEFAULT NULL,
   IMEI VARCHAR(45) NULL DEFAULT NULL,
   IMSI VARCHAR(45) NULL DEFAULT NULL,
   OS_VERSION VARCHAR(45) NULL DEFAULT NULL,
@@ -11,10 +12,9 @@ CREATE TABLE IF NOT EXISTS WIN_DEVICE (
   VENDOR VARCHAR(45) NULL DEFAULT NULL,
   LATITUDE VARCHAR(45) NULL DEFAULT NULL,
   LONGITUDE VARCHAR(45) NULL DEFAULT NULL,
-  CHALLENGE VARCHAR(45) NULL DEFAULT NULL,
-  TOKEN VARCHAR(50) NULL DEFAULT NULL,
-  UNLOCK_TOKEN VARCHAR(2000) NULL DEFAULT NULL,
   SERIAL VARCHAR(45) NULL DEFAULT NULL,
+  MAC_ADDRESS VARCHAR(45) NULL DEFAULT NULL,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (DEVICE_ID)
  );