diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/edit.js
index ac0c486791..94284ac016 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/edit.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/edit.js
@@ -43,7 +43,7 @@ function onRequest(context) {
 			if (restAPIResponse["status"] == 200 && restAPIResponse["responseText"]) {
 				var typeData = parse(restAPIResponse["responseText"]);
 				displayData.type = typeData;
-				
+
 			}
 		}
 	);
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 21db69eb43..28f2e10b46 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,8 +1,8 @@
 CREATE TABLE DM_DEVICE_TYPE (
   ID NUMBER(10) NOT NULL,
   NAME VARCHAR2(300) DEFAULT NULL,
-  DEVICE_TYPE_META VARCHAR2(20000) DEFAULT NULL,
-  LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
+  DEVICE_TYPE_META VARCHAR2(3000) DEFAULT NULL,
+  LAST_UPDATED_TIMESTAMP TIMESTAMP(0) NOT NULL,
   PROVIDER_TENANT_ID INTEGER DEFAULT 0,
   SHARED_WITH_ALL_TENANTS NUMBER(1) DEFAULT 0 NOT NULL,
   CONSTRAINT PK_DM_DEVICE_TYPE PRIMARY KEY (ID),
@@ -99,7 +99,7 @@ WHEN (NEW.ID IS NULL)
   END;
 /
 
-CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
+CREATE TABLE DM_DEVICE_PROPERTIES (
      DEVICE_TYPE_NAME VARCHAR2(300) NOT NULL,
      DEVICE_IDENTIFICATION VARCHAR2(300) NOT NULL,
      PROPERTY_NAME VARCHAR2(100) DEFAULT 0,