diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/android/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/android/oracle.sql
index b8a522b905..08fa92f456 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/android/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/android/oracle.sql
@@ -15,8 +15,8 @@ CREATE TABLE AD_DEVICE (
   SERIAL VARCHAR(45) DEFAULT NULL,
   MAC_ADDRESS VARCHAR(45) DEFAULT NULL,
   DEVICE_NAME VARCHAR(100) DEFAULT NULL,
-  PRIMARY KEY (DEVICE_ID)
-);
+  CONSTRAINT PK_AD_DEVICE PRIMARY KEY (DEVICE_ID)
+)
 /
 
 -- -----------------------------------------------------
@@ -27,23 +27,73 @@ CREATE TABLE AD_FEATURE (
   CODE VARCHAR(45) NOT NULL,
   NAME VARCHAR(100) NOT NULL,
   DESCRIPTION VARCHAR(200) DEFAULT NULL,
-  PRIMARY KEY (ID)
-);
+  CONSTRAINT AD_FEATURE PRIMARY KEY (ID)
+)
 /
 
 -- -----------------------------------------------------
 -- Sequence `AD_FEATURE_ID_INC_SEQ`
 -- -----------------------------------------------------
-CREATE SEQUENCE AD_FEATURE_ID_INC_SEQ START WITH 1 INCREMENT BY 1 NOCACHE;
+CREATE SEQUENCE AD_FEATURE_ID_INC_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
 /
-
 -- -----------------------------------------------------
 -- Trigger `AD_FEATURE_ID_INC_TRIG`
 -- -----------------------------------------------------
 CREATE OR REPLACE TRIGGER AD_FEATURE_ID_INC_TRIG
-BEFORE INSERT ON AD_FEATURE
+BEFORE INSERT
+ON AD_FEATURE
+REFERENCING NEW AS NEW
 FOR EACH ROW
-BEGIN
+  BEGIN
     SELECT AD_FEATURE_ID_INC_SEQ.NEXTVAL INTO :NEW.ID FROM DUAL;
-END;
+  END;
+/-- -----------------------------------------------------
+-- Table `AD_DEVICE`
+-- -----------------------------------------------------
+CREATE TABLE AD_DEVICE (
+  DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_INFO VARCHAR(500) DEFAULT NULL,
+  GCM_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,
+  SERIAL VARCHAR(45) DEFAULT NULL,
+  MAC_ADDRESS VARCHAR(45) DEFAULT NULL,
+  DEVICE_NAME VARCHAR(100) DEFAULT NULL,
+  CONSTRAINT PK_AD_DEVICE PRIMARY KEY (DEVICE_ID)
+)
+/
+
+-- -----------------------------------------------------
+-- Table `AD_FEATURE`
+-- -----------------------------------------------------
+CREATE TABLE AD_FEATURE (
+  ID INT NOT NULL,
+  CODE VARCHAR(45) NOT NULL,
+  NAME VARCHAR(100) NOT NULL,
+  DESCRIPTION VARCHAR(200) DEFAULT NULL,
+  CONSTRAINT AD_FEATURE PRIMARY KEY (ID)
+)
 /
+
+-- -----------------------------------------------------
+-- Sequence `AD_FEATURE_ID_INC_SEQ`
+-- -----------------------------------------------------
+CREATE SEQUENCE AD_FEATURE_ID_INC_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+-- -----------------------------------------------------
+-- Trigger `AD_FEATURE_ID_INC_TRIG`
+-- -----------------------------------------------------
+CREATE OR REPLACE TRIGGER AD_FEATURE_ID_INC_TRIG
+BEFORE INSERT
+ON AD_FEATURE
+REFERENCING NEW AS NEW
+FOR EACH ROW
+  BEGIN
+    SELECT AD_FEATURE_ID_INC_SEQ.NEXTVAL INTO :NEW.ID FROM DUAL;
+  END;
+/
\ No newline at end of file
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql
index 3e129477f5..315402e181 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/oracle.sql
@@ -1,7 +1,7 @@
 -- -----------------------------------------------------
 -- Table `IOS_DEVICE`
 -- -----------------------------------------------------
-  CREATE TABLE IOS_DEVICE (
+CREATE TABLE IOS_DEVICE (
   MOBILE_DEVICE_ID VARCHAR(45) NOT NULL,
   APNS_PUSH_TOKEN VARCHAR(100) DEFAULT NULL,
   MAGIC_TOKEN VARCHAR(100) DEFAULT NULL,
@@ -18,8 +18,8 @@
   ICCID VARCHAR(45) DEFAULT NULL,
   LATITUDE VARCHAR(45) DEFAULT NULL,
   LONGITUDE VARCHAR(45) DEFAULT NULL,
-  PRIMARY KEY (MOBILE_DEVICE_ID)
-);
+  CONSTRAINT PK_IOS_DEVICE PRIMARY KEY (MOBILE_DEVICE_ID)
+)
 /
 
 -- -----------------------------------------------------
@@ -30,8 +30,8 @@ CREATE TABLE IOS_FEATURE (
   CODE VARCHAR(45) NOT NULL,
   NAME VARCHAR(100) NOT NULL,
   DESCRIPTION VARCHAR(200) NULL,
-  PRIMARY KEY (ID) 
-);
+  CONSTRAINT PK_IOS_FEATURE PRIMARY KEY (ID)
+)
 /
 
 -- Sequence `IOS_FEATURE_ID_INC_SEQ`
@@ -43,9 +43,11 @@ CREATE SEQUENCE IOS_FEATURE_ID_INC_SEQ START WITH 1 INCREMENT BY 1 NOCACHE;
 -- Trigger `IOS_FEATURE_ID_INC_TRIG`
 -- -----------------------------------------------------
 CREATE OR REPLACE TRIGGER IOS_FEATURE_ID_INC_TRIG
-BEFORE INSERT ON IOS_FEATURE
+BEFORE INSERT
+ON IOS_FEATURE
+REFERENCING NEW AS NEW
 FOR EACH ROW
-BEGIN
+  BEGIN
     SELECT IOS_FEATURE_ID_INC_SEQ.NEXTVAL INTO :NEW.ID FROM DUAL;
-END;
-/
+  END;
+/
\ No newline at end of file
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 7fc3f38d43..fee14fe86a 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
@@ -16,7 +16,7 @@ CREATE TABLE WIN_DEVICE (
   UNLOCK_TOKEN VARCHAR(2000) DEFAULT NULL,
   SERIAL VARCHAR(45) DEFAULT NULL,
   PRIMARY KEY (DEVICE_ID)
-);
+)
 /
 
 -- -----------------------------------------------------
@@ -28,22 +28,24 @@ CREATE TABLE WIN_FEATURE (
   NAME VARCHAR(100) NOT NULL,
   DESCRIPTION VARCHAR(200) NULL,
   PRIMARY KEY (ID)
-);
+)
 /
 
 -- -----------------------------------------------------
 -- Sequence `WIN_FEATURE_ID_INC_SEQ`
 -- -----------------------------------------------------
-CREATE SEQUENCE WIN_FEATURE_ID_INC_SEQ START WITH 1 INCREMENT BY 1 NOCACHE;
+CREATE SEQUENCE WIN_FEATURE_ID_INC_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
 /
 
 -- -----------------------------------------------------
 -- Trigger `WIN_FEATURE_ID_INC_TRIG`
 -- -----------------------------------------------------
 CREATE OR REPLACE TRIGGER WIN_FEATURE_ID_INC_TRIG
-BEFORE INSERT ON WIN_FEATURE
+BEFORE INSERT
+ON WIN_FEATURE
+REFERENCING NEW AS NEW
 FOR EACH ROW
-BEGIN
+  BEGIN
     SELECT WIN_FEATURE_ID_INC_SEQ.NEXTVAL INTO :NEW.ID FROM DUAL;
-END;
-/
+  END;
+/
\ No newline at end of file