diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmManagerService.java b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmManagerService.java
index 9ff48d931..8057ec45d 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmManagerService.java
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmManagerService.java
@@ -68,4 +68,4 @@ public interface VirtualFireAlarmManagerService {
     Response generateSketchLink(@QueryParam("deviceName") String deviceName,
                                 @QueryParam("sketchType") String sketchType);
 
-}
+}
\ No newline at end of file
diff --git a/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/h2.sql b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/h2.sql
index 218cdbf05..ee3bfa73a 100644
--- a/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/h2.sql
+++ b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/h2.sql
@@ -6,6 +6,3 @@ CREATE  TABLE IF NOT EXISTS `ANDROID_SENSE_DEVICE` (
   `ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL ,
   `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (`ANDROID_DEVICE_ID`) );
-
-
-
diff --git a/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/mssql.sql b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/mssql.sql
new file mode 100644
index 000000000..cf677ff07
--- /dev/null
+++ b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/mssql.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `ANDROID_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS ANDROID_SENSE_DEVICE (
+  ANDROID_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (ANDROID_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/oracle.sql b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/oracle.sql
new file mode 100644
index 000000000..cf677ff07
--- /dev/null
+++ b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/oracle.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `ANDROID_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS ANDROID_SENSE_DEVICE (
+  ANDROID_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (ANDROID_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/postgresql.sql b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/postgresql.sql
new file mode 100644
index 000000000..987f4992b
--- /dev/null
+++ b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/postgresql.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `ANDROID_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS ANDROID_SENSE_DEVICE (
+  ANDROID_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (ANDROID_DEVICE_ID));
diff --git a/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/h2.sql b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/h2.sql
index 2e9bc926b..7d5b98b72 100644
--- a/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/h2.sql
+++ b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/h2.sql
@@ -6,6 +6,3 @@ CREATE  TABLE IF NOT EXISTS `ARDUINO_DEVICE` (
   `ARDUINO_DEVICE_ID` VARCHAR(45) NOT NULL ,
   `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (`ARDUINO_DEVICE_ID`) );
-
-
-
diff --git a/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/mssql.sql b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/mssql.sql
new file mode 100644
index 000000000..e966d462a
--- /dev/null
+++ b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/mssql.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table for `ARDUINO_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS ARDUINO_DEVICE (
+  ARDUINO_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (ARDUINO_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/oracle.sql b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/oracle.sql
new file mode 100644
index 000000000..e966d462a
--- /dev/null
+++ b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/oracle.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table for `ARDUINO_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS ARDUINO_DEVICE (
+  ARDUINO_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (ARDUINO_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/postgresql.sql b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/postgresql.sql
new file mode 100644
index 000000000..e966d462a
--- /dev/null
+++ b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/dbscripts/postgresql.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table for `ARDUINO_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS ARDUINO_DEVICE (
+  ARDUINO_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (ARDUINO_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/h2.sql b/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/h2.sql
index 5bf6884c5..ab31bf6e1 100644
--- a/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/h2.sql
+++ b/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/h2.sql
@@ -6,6 +6,3 @@ CREATE  TABLE IF NOT EXISTS `DIGITAL_DISPLAY_DEVICE` (
   `DIGITAL_DISPLAY_DEVICE_ID` VARCHAR(45) NOT NULL ,
   `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (`DIGITAL_DISPLAY_DEVICE_ID`) );
-
-
-
diff --git a/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/mssql.sql b/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/mssql.sql
new file mode 100644
index 000000000..3828224d0
--- /dev/null
+++ b/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/mssql.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `DIGITAL_DISPLAY_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS DIGITAL_DISPLAY_DEVICE (
+  DIGITAL_DISPLAY_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (DIGITAL_DISPLAY_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/oracle.sql b/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/oracle.sql
new file mode 100644
index 000000000..3828224d0
--- /dev/null
+++ b/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/oracle.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `DIGITAL_DISPLAY_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS DIGITAL_DISPLAY_DEVICE (
+  DIGITAL_DISPLAY_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (DIGITAL_DISPLAY_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/postgresql.sql b/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/postgresql.sql
new file mode 100644
index 000000000..3828224d0
--- /dev/null
+++ b/features/iot-plugins-feature/digital-display-plugin-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/dbscripts/postgresql.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `DIGITAL_DISPLAY_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS DIGITAL_DISPLAY_DEVICE (
+  DIGITAL_DISPLAY_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (DIGITAL_DISPLAY_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/h2.sql b/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/h2.sql
index f7dac408b..5dc50ce21 100644
--- a/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/h2.sql
+++ b/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/h2.sql
@@ -7,5 +7,3 @@ CREATE  TABLE IF NOT EXISTS `DRONE_DEVICE` (
   `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (`DRONE_DEVICE_ID`) );
 
-
-
diff --git a/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/mssql.sql b/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/mssql.sql
new file mode 100644
index 000000000..4dca78f70
--- /dev/null
+++ b/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/mssql.sql
@@ -0,0 +1,9 @@
+
+-- -----------------------------------------------------
+-- Table `DRONE_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS DRONE_DEVICE (
+  DRONE_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (DRONE_DEVICE_ID) );
+
diff --git a/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/oracle.sql b/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/oracle.sql
new file mode 100644
index 000000000..4dca78f70
--- /dev/null
+++ b/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/oracle.sql
@@ -0,0 +1,9 @@
+
+-- -----------------------------------------------------
+-- Table `DRONE_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS DRONE_DEVICE (
+  DRONE_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (DRONE_DEVICE_ID) );
+
diff --git a/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/postgresql.sql b/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/postgresql.sql
new file mode 100644
index 000000000..4dca78f70
--- /dev/null
+++ b/features/iot-plugins-feature/drone-analyzer-plugin-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/dbscripts/postgresql.sql
@@ -0,0 +1,9 @@
+
+-- -----------------------------------------------------
+-- Table `DRONE_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS DRONE_DEVICE (
+  DRONE_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (DRONE_DEVICE_ID) );
+
diff --git a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/h2.sql b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/h2.sql
index aead055a4..67e702ec9 100644
--- a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/h2.sql
+++ b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/h2.sql
@@ -7,5 +7,3 @@ CREATE  TABLE IF NOT EXISTS `RASPBERRYPI_DEVICE` (
   `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (`RASPBERRYPI_DEVICE_ID`) );
 
-
-
diff --git a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/mssql.sql b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/mssql.sql
new file mode 100644
index 000000000..a944f4cb2
--- /dev/null
+++ b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/mssql.sql
@@ -0,0 +1,9 @@
+
+-- -----------------------------------------------------
+-- Table `RASPBERRYPI_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS RASPBERRYPI_DEVICE (
+  RASPBERRYPI_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (RASPBERRYPI_DEVICE_ID) );
+
diff --git a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/oracle.sql b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/oracle.sql
new file mode 100644
index 000000000..a944f4cb2
--- /dev/null
+++ b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/oracle.sql
@@ -0,0 +1,9 @@
+
+-- -----------------------------------------------------
+-- Table `RASPBERRYPI_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS RASPBERRYPI_DEVICE (
+  RASPBERRYPI_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (RASPBERRYPI_DEVICE_ID) );
+
diff --git a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/postgresql.sql b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/postgresql.sql
new file mode 100644
index 000000000..a944f4cb2
--- /dev/null
+++ b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/dbscripts/postgresql.sql
@@ -0,0 +1,9 @@
+
+-- -----------------------------------------------------
+-- Table `RASPBERRYPI_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS RASPBERRYPI_DEVICE (
+  RASPBERRYPI_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (RASPBERRYPI_DEVICE_ID) );
+
diff --git a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/h2.sql b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/h2.sql
index 340ba6a70..160b437cb 100644
--- a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/h2.sql
+++ b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/h2.sql
@@ -6,6 +6,3 @@ CREATE  TABLE IF NOT EXISTS `VIRTUAL_FIREALARM_DEVICE` (
   `VIRTUAL_FIREALARM_DEVICE_ID` VARCHAR(45) NOT NULL ,
   `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
   PRIMARY KEY (`VIRTUAL_FIREALARM_DEVICE_ID`) );
-
-
-
diff --git a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/mssql.sql b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/mssql.sql
new file mode 100644
index 000000000..41b7e4848
--- /dev/null
+++ b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/mssql.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `FIREALARM_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS VIRTUAL_FIREALARM_DEVICE (
+  VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/oracle.sql b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/oracle.sql
new file mode 100644
index 000000000..41b7e4848
--- /dev/null
+++ b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/oracle.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `FIREALARM_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS VIRTUAL_FIREALARM_DEVICE (
+  VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) );
diff --git a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/postgresql.sql b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/postgresql.sql
new file mode 100644
index 000000000..41b7e4848
--- /dev/null
+++ b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/dbscripts/postgresql.sql
@@ -0,0 +1,8 @@
+
+-- -----------------------------------------------------
+-- Table `FIREALARM_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS VIRTUAL_FIREALARM_DEVICE (
+  VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL ,
+  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) );