diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java
index 61135c58a..fdb271e79 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java
@@ -199,8 +199,11 @@ public class VirtualHardwareManager {
         try {
             sequence = MidiSystem.getSequence(audioSrc);
             sequencer = MidiSystem.getSequencer();
-            sequencer.open();
-            sequencer.setSequence(sequence);
+            if(sequencer != null) {
+                sequencer.open();
+                sequencer.setSequence(sequence);
+                sequencer.setLoopCount(Clip.LOOP_CONTINUOUSLY);
+            }
         } catch (InvalidMidiDataException e) {
             log.error("AudioReader: Error whilst setting MIDI Audio reader sequence");
         } catch (IOException e) {
@@ -208,8 +211,6 @@ public class VirtualHardwareManager {
         } catch (MidiUnavailableException e) {
             log.error("AudioReader: Error whilst openning MIDI Audio reader sequencer");
         }
-
-        sequencer.setLoopCount(Clip.LOOP_CONTINUOUSLY);
     }
 
 }
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/receiver/virtualfirealarm_receiver.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/receiver/virtualfirealarm_receiver.xml
index 98ee47d86..b1951058e 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/receiver/virtualfirealarm_receiver.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/receiver/virtualfirealarm_receiver.xml
@@ -21,5 +21,5 @@
         <property name="topic">${tenant-domain}/virtual_firealarm/+/temperature</property>
     </from>
     <mapping customMapping="disable" type="json"/>
-    <to streamName="org.wso2.iot.virtualfirealarm" version="1.0.0"/>
+    <to streamName="iot.per.device.stream.virtualfirealarm" version="1.0.0"/>
 </eventReceiver>
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/streams/org.wso2.iot.virtualfirealarm_1.0.0.json b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/streams/org.wso2.iot.virtualfirealarm_1.0.0.json
deleted file mode 100644
index 0ba70911e..000000000
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/streams/org.wso2.iot.virtualfirealarm_1.0.0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "org.wso2.iot.virtualfirealarm",
-  "version": "1.0.0",
-  "nickName": "virtual_firealarm",
-  "description": "Temperature data received from the virtual_firealarm",
-  "metaData": [
-    {"name":"owner","type":"STRING"},
-    {"name":"deviceId","type":"STRING"},
-    {"name":"time","type":"LONG"}
-  ],
-  "payloadData": [
-    {
-      "name": "temperature","type": "FLOAT"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 38d88d3db..00084f14f 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -338,13 +338,13 @@
             <Description>Unlock the device</Description>
         </Feature>
     </Features>
-    <TaskConfiguration> //Name needs to be decided <!--DeviceMonitoring-->
+    <TaskConfiguration>
         <Enable>true</Enable>
-        <Frequency>60000</Frequency> //Name needs to be decided <!--Period-->
+        <Frequency>60000</Frequency>
         <Operations>
             <Operation>
                 <Name>DEVICE_INFO</Name>
-                <RecurrentTimes>1</RecurrentTimes> //Name needs to be decided <!--PeriodFactor-->
+                <RecurrentTimes>1</RecurrentTimes>
             </Operation>
             <Operation>
                 <Name>APPLICATION_LIST</Name>