diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index c21efb8a..d7d2d8a5 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -339,6 +339,8 @@
 									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
 								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
 									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
+								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml"
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml.disable"/>
 								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
 									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
 									  overwrite="true"/>
diff --git a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
index cbe014c7..75620dcb 100644
--- a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
+++ b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
@@ -103,12 +103,10 @@
 		<dependency>
 			<groupId>org.wso2.carbon.devicemgt</groupId>
 			<artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.wso2.carbon.devicemgt</groupId>
 			<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
diff --git a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
index e7bf5580..183d0ec0 100644
--- a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
+++ b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
@@ -62,6 +62,7 @@
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</artifactId>
+            <version>${carbon.iot.device.mgt.version}</version>
             <scope>provided</scope>
         </dependency>
         <!--JAX-RS -->
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 17040df8..7aacf6fd 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -471,9 +471,6 @@
 
     </properties>
 
-
-
-
     <build>
         <extensions>
             <extension>
diff --git a/modules/samples/sample_pom.xml b/modules/samples/sample_pom.xml
index 20b641a5..63193c3d 100644
--- a/modules/samples/sample_pom.xml
+++ b/modules/samples/sample_pom.xml
@@ -99,6 +99,13 @@
                 <scope>system</scope>
 				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.analytics_0.9.2.SNAPSHOT.jar</systemPath>
 			</dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+                <scope>system</scope>
+                <systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.policy.mgt.core_0.9.2.SNAPSHOT.jar</systemPath>
+            </dependency>
 			<dependency>
 				<groupId>org.wso2.carbon.devicemgt</groupId>
 				<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
@@ -197,13 +204,12 @@
 				<type>war</type>
 			</dependency>
 
-			<dependency>
-				<groupId>org.eclipse.paho</groupId>
-				<artifactId>mqtt-client</artifactId>
-				<version>${eclipse.paho.version}</version>
-				<scope>system</scope>
-				<systemPath>${basedir}/../../../../repository/components/lib/mqtt-push-1.0-SNAPSHOT-jar-with-dependencies.jar</systemPath>
-			</dependency>
+            <dependency>
+                <groupId>org.eclipse.paho</groupId>
+                <artifactId>mqtt-client</artifactId>
+                <version>${paho.mqtt.version}</version>
+                <scope>provided</scope>
+            </dependency>
 			<dependency>
 				<groupId>javax</groupId>
 				<artifactId>javaee-web-api</artifactId>
@@ -401,75 +407,84 @@
 				<groupId>com.google.code.gson</groupId>
 				<artifactId>gson</artifactId>
 				<version>${google.gson.version}</version>
-				<scope>system</scope>
-				<systemPath>${basedir}/../../../../repository/components/plugins/com.google.gson_2.3.1.jar</systemPath>
 			</dependency>
 
+			<!--Dependencies on XMPP Client Library-->
+			<dependency>
+				<groupId>org.igniterealtime.smack.wso2</groupId>
+				<artifactId>smack</artifactId>
+				<version>${smack.wso2.version}</version>
+                <scope>system</scope>
+                <systemPath>${basedir}/../../../../repository/components/plugins/smack_3.0.4.wso2v1.jar</systemPath>
+			</dependency>
+			<dependency>
+				<groupId>org.igniterealtime.smack.wso2</groupId>
+				<artifactId>smackx</artifactId>
+				<version>${smackx.wso2.version}</version>
+                <scope>system</scope>
+                <systemPath>${basedir}/../../../../repository/components/plugins/smackx_3.0.4.wso2v1.jar</systemPath>
+			</dependency>
 
 		</dependencies>
-	</dependencyManagement>
-
-	<properties>
-		<!-- IoT server version -->
-		<device.mgt.iot.feature.version>1.0.0</device.mgt.iot.feature.version>
-
-
-		<!--Carbon kernel versions-->
-		<carbon.kernel.version>4.4.0</carbon.kernel.version>
-		<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
-
-		<!--<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>-->
 
-		<!--Maven build number plugin-->
-		<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
-
-		<!--Testing -->
-		<test.framework.version>4.3.1</test.framework.version>
-		<testng.version>6.8</testng.version>
-
-		<!--Eclipse Osgi-->
-		<eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
-		<eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
-
-		<!--Orbit versions-->
-		<orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
-		<orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version>
-		<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
-
-		<eclipse.paho.version>0.4.0</eclipse.paho.version>
+	</dependencyManagement>
 
+    <properties>
+        <!-- IoT server version -->
+        <device.mgt.iot.feature.version>1.0.0</device.mgt.iot.feature.version>
 
 
-		<!-- CXF version -->
-		<cxf.version>2.6.1</cxf.version>
-		<jackson.version>1.9.0</jackson.version>
-		<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
+        <!--Carbon kernel versions-->
+        <carbon.kernel.version>4.4.0</carbon.kernel.version>
+        <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
+        <!--<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>-->
 
+        <!--Maven build number plugin-->
+        <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
-		<!-- Device Management -->
+        <!--Testing -->
+        <test.framework.version>4.3.1</test.framework.version>
+        <testng.version>6.8</testng.version>
 
-		<carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
-		<carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range>
+        <!--Eclipse Osgi-->
+        <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
+        <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
 
-		<!-- IOT Device Management -->
-		<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
+        <!--Orbit versions-->
+        <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
+        <orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version>
+        <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
 
+        <google.gson.version>2.2.4</google.gson.version>
 
-		<commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
-		<commons-json.version>2.0.0.wso2v1</commons-json.version>
-		<google.gson.version>2.3.1</google.gson.version>
+        <!-- CXF version -->
+        <cxf.version>2.6.1</cxf.version>
+        <jackson.version>1.9.0</jackson.version>
+        <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
+        <!-- Device Management -->
+        <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range>
 
-		<!-- Source code -->
-		<wso2.maven.compiler.source>1.7</wso2.maven.compiler.source>
-		<wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
-		<carbon.analytics.version>1.0.3</carbon.analytics.version>
+        <!-- IOT Device Management -->
+        <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
 
-	</properties>
+        <commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
+        <commons-json.version>3.0.0.wso2v1</commons-json.version>
+        <jackson.fasterxml.version>2.6.1</jackson.fasterxml.version>
 
+        <!-- Source code -->
+        <wso2.maven.compiler.source>1.7</wso2.maven.compiler.source>
+        <wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
+        <carbon.analytics.version>1.0.3</carbon.analytics.version>
 
+        <!--XMPP/MQTT Version-->
+        <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
+        <smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>
+        <paho.mqtt.version>0.4.0</paho.mqtt.version>
 
+    </properties>
 
 	<build>
 		<extensions>
diff --git a/modules/samples/virtual_firealarm/artifact/deviceType.json b/modules/samples/virtual_firealarm/artifact/deviceType.json
index d9f36153..c9176222 100644
--- a/modules/samples/virtual_firealarm/artifact/deviceType.json
+++ b/modules/samples/virtual_firealarm/artifact/deviceType.json
@@ -8,8 +8,8 @@
     "overview_version":"1.0.0",
     "overview_name":"virtual_firealarm",
     "overview_url":"http://www.google.lk",
-    "setupGuide_guideImage":"undefined",
-    "overview_actionLabel":"Download Agent",
+    "setupGuide_guideImage":"virtual_firealarm/guide.png",
+    "overview_actionLabel":"Download a virtual device",
     "sketches_Sketches":"virtual_firealarm",
     "ingredients_ingredients":[
       "Virtual Agent that simulates an actual firealarm"
diff --git a/modules/samples/virtual_firealarm/artifact/guide.png b/modules/samples/virtual_firealarm/artifact/guide.png
new file mode 100644
index 00000000..7fbc6c18
Binary files /dev/null and b/modules/samples/virtual_firealarm/artifact/guide.png differ
diff --git a/modules/samples/virtual_firealarm/sketch/startservice.sh b/modules/samples/virtual_firealarm/sketch/startservice.sh
old mode 100644
new mode 100755