diff --git a/modules/samples/android_sense/artifact/android_sense_banner.png b/modules/samples/android_sense/artifact/android_sense_banner.png
new file mode 100644
index 00000000..d38a8d75
Binary files /dev/null and b/modules/samples/android_sense/artifact/android_sense_banner.png differ
diff --git a/modules/samples/android_sense/artifact/android_sense_thumbnail.png b/modules/samples/android_sense/artifact/android_sense_thumbnail.png
new file mode 100644
index 00000000..ee2be6f0
Binary files /dev/null and b/modules/samples/android_sense/artifact/android_sense_thumbnail.png differ
diff --git a/modules/samples/android_sense/artifact/deviceType.json b/modules/samples/android_sense/artifact/deviceType.json
new file mode 100644
index 00000000..f83f2baf
--- /dev/null
+++ b/modules/samples/android_sense/artifact/deviceType.json
@@ -0,0 +1,25 @@
+{
+  "name": "android_sense",
+  "tags": "WSO2, IoT, Android",
+  "rate": 3,
+  "attributes": {
+    "overview_status": "PUBLISHED",
+    "overview_provider":"admin",
+    "overview_version":"1.0.0",
+    "overview_name":"android_sense",
+    "overview_url":"http://www.google.lk",
+    "setupGuide_guideImage":"undefined",
+    "overview_actionLabel":"Download",
+    "sketches_Sketches":"android_sense",
+    "ingredients_ingredients":[
+      "Android device"
+    ],
+    "overview_description":"Connect your Android Sense to the WSO2 IoT server",
+    "setupGuide_description":"sfd",
+    "quickStartupSteps_stepDescription":["Copy downloaded apk in to device","Install apk in the device.","Open Android Sense application."],
+    "quickStartupSteps_stepLabel":["1","2","3"],
+    "images_thumbnail":"android_sense/android_sense_thumbnail.png",
+    "images_banner":"android_sense/android_sense_banner.png",
+    "overview_thumbnail": "images_thumbnail"
+  }
+}
\ No newline at end of file
diff --git a/modules/samples/android_sense/build.xml b/modules/samples/android_sense/build.xml
index dd7b7205..dcd93d1c 100644
--- a/modules/samples/android_sense/build.xml
+++ b/modules/samples/android_sense/build.xml
@@ -1,4 +1,4 @@
-<project name="Arduino" basedir="" default="deploy">
+<project name="AndroidSense" basedir="" default="deploy">
 
     <import file="../common.xml"/>
 
@@ -66,6 +66,11 @@
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <mkdir dir="${target.sample.device.dir}/${sample_type}"/>
+        <copy toDir="${target.sample.device.dir}/${sample_type}">
+            <fileset dir="artifact/"/>
+        </copy>
+
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
diff --git a/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
index f44732a0..8ac9c4bd 100644
--- a/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
+++ b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
@@ -113,8 +113,6 @@
 
 
 
-
-
 	</dependencies>
 
 
diff --git a/modules/samples/arduino/artifact/arduino_thumbnail.png b/modules/samples/arduino/artifact/arduino_thumbnail.png
index a59f3a70..07725a59 100644
Binary files a/modules/samples/arduino/artifact/arduino_thumbnail.png and b/modules/samples/arduino/artifact/arduino_thumbnail.png differ
diff --git a/modules/samples/digital_display/artifact/deviceType.json b/modules/samples/digital_display/artifact/deviceType.json
new file mode 100644
index 00000000..2621b5d7
--- /dev/null
+++ b/modules/samples/digital_display/artifact/deviceType.json
@@ -0,0 +1,26 @@
+{
+  "name": "digital_display",
+  "tags": "WSO2, IoT, Raspberry",
+  "rate": 3,
+  "attributes": {
+    "overview_status": "PUBLISHED",
+    "overview_provider":"admin",
+    "overview_version":"1.0.0",
+    "overview_name":"digital_display",
+    "overview_url":"http://www.google.lk",
+    "setupGuide_guideImage":"undefined",
+    "overview_actionLabel":"Download",
+    "sketches_Sketches":"digital_display",
+    "ingredients_ingredients":[
+      "Raspberry",
+      "Ethernet / WiFi Shield"
+    ],
+    "overview_description":"Connect your Arduino Uno device to the WSO2 IoT Server.This is a bare-board Arduino Device-Type. The board used here is Arduino Uno.",
+    "setupGuide_description":"sfd",
+    "quickStartupSteps_stepDescription":["Install the Sketch program","Install the Sketch program","Install the Sketch program"],
+    "quickStartupSteps_stepLabel":["1","2","3"],
+    "images_thumbnail":"digital_display/digital_display_thumbnail.png",
+    "images_banner":"digital_display/digital_display_banner.png",
+    "overview_thumbnail": "images_thumbnail"
+  }
+}
\ No newline at end of file
diff --git a/modules/samples/digital_display/artifact/digital_display_banner.png b/modules/samples/digital_display/artifact/digital_display_banner.png
new file mode 100644
index 00000000..1f98d73f
Binary files /dev/null and b/modules/samples/digital_display/artifact/digital_display_banner.png differ
diff --git a/modules/samples/digital_display/artifact/digital_display_thumbnail.png b/modules/samples/digital_display/artifact/digital_display_thumbnail.png
new file mode 100644
index 00000000..44131c19
Binary files /dev/null and b/modules/samples/digital_display/artifact/digital_display_thumbnail.png differ
diff --git a/modules/samples/digital_display/build.xml b/modules/samples/digital_display/build.xml
index fdd60784..2198c561 100644
--- a/modules/samples/digital_display/build.xml
+++ b/modules/samples/digital_display/build.xml
@@ -65,6 +65,11 @@
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <mkdir dir="${target.sample.device.dir}/${sample_type}"/>
+        <copy toDir="${target.sample.device.dir}/${sample_type}">
+            <fileset dir="artifact/"/>
+        </copy>
+
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
diff --git a/modules/samples/firealarm/artifact/deviceType.json b/modules/samples/firealarm/artifact/deviceType.json
new file mode 100644
index 00000000..fb8138e7
--- /dev/null
+++ b/modules/samples/firealarm/artifact/deviceType.json
@@ -0,0 +1,26 @@
+{
+  "name": "firealarm",
+  "tags": "WSO2, IoT, Raspberry, Fire Alarm",
+  "rate": 3,
+  "attributes": {
+    "overview_status": "PUBLISHED",
+    "overview_provider":"admin",
+    "overview_version":"1.0.0",
+    "overview_name":"firealarm",
+    "overview_url":"http://www.google.lk",
+    "setupGuide_guideImage":"undefined",
+    "overview_actionLabel":"Download",
+    "sketches_Sketches":"firealarm",
+    "ingredients_ingredients":[
+      "Raspberry Pi",
+      "Temperature Sensor / LED"
+    ],
+    "overview_description":"Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS",
+    "setupGuide_description":"sfd",
+    "quickStartupSteps_stepDescription":["Install the Sketch program","Install the Sketch program","Install the Sketch program"],
+    "quickStartupSteps_stepLabel":["1","2","3"],
+    "images_thumbnail":"firealarm/firealarm_thumbnail.png",
+    "images_banner":"firealarm/firealarm_banner.png",
+    "overview_thumbnail": "images_thumbnail"
+  }
+}
\ No newline at end of file
diff --git a/modules/samples/firealarm/artifact/firealarm_banner.png b/modules/samples/firealarm/artifact/firealarm_banner.png
new file mode 100644
index 00000000..aaf16925
Binary files /dev/null and b/modules/samples/firealarm/artifact/firealarm_banner.png differ
diff --git a/modules/samples/firealarm/artifact/firealarm_thumbnail.png b/modules/samples/firealarm/artifact/firealarm_thumbnail.png
new file mode 100644
index 00000000..bad3b1b6
Binary files /dev/null and b/modules/samples/firealarm/artifact/firealarm_thumbnail.png differ
diff --git a/modules/samples/firealarm/build.xml b/modules/samples/firealarm/build.xml
index 8c190e19..2680e19d 100644
--- a/modules/samples/firealarm/build.xml
+++ b/modules/samples/firealarm/build.xml
@@ -66,6 +66,11 @@
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
+        <mkdir dir="${target.sample.device.dir}/${sample_type}"/>
+        <copy toDir="${target.sample.device.dir}/${sample_type}">
+            <fileset dir="artifact/"/>
+        </copy>
+
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
diff --git a/modules/samples/sample_pom.xml b/modules/samples/sample_pom.xml
index f34b0ecd..6b66f871 100644
--- a/modules/samples/sample_pom.xml
+++ b/modules/samples/sample_pom.xml
@@ -80,30 +80,31 @@
 			<dependency>
 				<groupId>org.wso2.carbon.devicemgt</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-				<scope>system</scope>
 				<version>${carbon.device.mgt.version}</version>
-				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.core_0.9.2.SNAPSHOT.jar</systemPath>
+                <scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.wso2.carbon.devicemgt</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-				<scope>system</scope>
 				<version>${carbon.device.mgt.version}</version>
-				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.common_0.9.2.SNAPSHOT.jar</systemPath>
+                <scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.wso2.carbon.devicemgt</groupId>
+				<artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+				<version>${carbon.device.mgt.version}</version>
+                <scope>provided</scope>
 			</dependency>
 
 			<!--IOT dependencies-->
 
-
 			<dependency>
 				<groupId>org.wso2.carbon.device.mgt.iot</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
 				<version>${carbon.iot.device.mgt.version}</version>
-				<scope>system</scope>
-				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot.common_1.0.0.SNAPSHOT.jar</systemPath>
+                <scope>provided</scope>
 			</dependency>
 
-
 			<dependency>
 				<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</artifactId>
@@ -207,6 +208,16 @@
 				<version>${jackson.version}</version>
 			</dependency>
 
+			<!--Analytics dependencies-->
+
+			<dependency>
+				<groupId>org.wso2.carbon.analytics</groupId>
+				<artifactId>org.wso2.carbon.analytics.datasource.commons</artifactId>
+				<version>${carbon.analytics.version}</version>
+                <scope>provided</scope>
+			</dependency>
+
+
 			<!--Osgi dependencies-->
 			<dependency>
 				<groupId>org.eclipse.osgi</groupId>
@@ -266,25 +277,25 @@
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-frontend-jaxws</artifactId>
 				<version>${cxf.version}</version>
-				<scope>provided</scope>
+				<!--<scope>provided</scope>-->
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-frontend-jaxrs</artifactId>
 				<version>${cxf.version}</version>
-				<scope>provided</scope>
+				<!--<scope>provided</scope>-->
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-transports-http</artifactId>
 				<version>${cxf.version}</version>
-				<scope>provided</scope>
+				<!--<scope>provided</scope>-->
 			</dependency>
 			<dependency>
 				<groupId>javax.ws.rs</groupId>
 				<artifactId>jsr311-api</artifactId>
 				<version>${javax.ws.rs.version}</version>
-				<scope>provided</scope>
+				<!--<scope>provided</scope>-->
 			</dependency>
 
 
@@ -431,6 +442,7 @@
 		<!-- 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>
 
 	</properties>
 
diff --git a/modules/samples/sensebot/artifact/deviceType.json b/modules/samples/sensebot/artifact/deviceType.json
new file mode 100644
index 00000000..a16e3c45
--- /dev/null
+++ b/modules/samples/sensebot/artifact/deviceType.json
@@ -0,0 +1,26 @@
+{
+  "name": "sensebot",
+  "tags": "WSO2, IoT, Arduino, ArduinoUno",
+  "rate": 3,
+  "attributes": {
+    "overview_status": "PUBLISHED",
+    "overview_provider":"admin",
+    "overview_version":"1.0.0",
+    "overview_name":"sensebot",
+    "overview_url":"http://www.google.lk",
+    "setupGuide_guideImage":"undefined",
+    "overview_actionLabel":"Download",
+    "sketches_Sketches":"sensebot",
+    "ingredients_ingredients":[
+      "Arduino Uno",
+      "Arduino Ethernet / WiFi Shield"
+    ],
+    "overview_description":"Connect your Arduino Uno device to the WSO2 IoT Server.This is a bare-board Arduino Device-Type. The board used here is Arduino Uno.",
+    "setupGuide_description":"sfd",
+    "quickStartupSteps_stepDescription":["Install the Sketch program","Install the Sketch program","Install the Sketch program"],
+    "quickStartupSteps_stepLabel":["1","2","3"],
+    "images_thumbnail":"sensebot/sensebot_thumbnail.png",
+    "images_banner":"sensebot/sensebot_banner.png",
+    "overview_thumbnail": "images_thumbnail"
+  }
+}
\ No newline at end of file
diff --git a/modules/samples/sensebot/artifact/sensebot_banner.png b/modules/samples/sensebot/artifact/sensebot_banner.png
new file mode 100644
index 00000000..3bf66c35
Binary files /dev/null and b/modules/samples/sensebot/artifact/sensebot_banner.png differ
diff --git a/modules/samples/sensebot/artifact/sensebot_thumbnail.png b/modules/samples/sensebot/artifact/sensebot_thumbnail.png
new file mode 100644
index 00000000..1a2c8f9e
Binary files /dev/null and b/modules/samples/sensebot/artifact/sensebot_thumbnail.png differ
diff --git a/modules/samples/sensebot/build.xml b/modules/samples/sensebot/build.xml
index 463b3192..896679a1 100644
--- a/modules/samples/sensebot/build.xml
+++ b/modules/samples/sensebot/build.xml
@@ -1,4 +1,4 @@
-<project name="Arduino" basedir="" default="deploy">
+<project name="Sensebot" basedir="" default="deploy">
 
     <import file="../common.xml"/>
 
@@ -7,6 +7,7 @@
     <property name="package" value="org.wso2.carbon.device.mgt.iot.sample.sensebot"/>
 
     <target name="create-db" depends="clean">
+        <mkdir dir="${db.dir}"/>
         <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
 
         <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}"  autocommit="true" onerror="continue">
@@ -67,6 +68,11 @@
         <copy toDir="${target.sketch.dir}/${sample_type}_wifi">
             <fileset dir="sketch_wifi"/>
         </copy>
+        <mkdir dir="${target.sample.device.dir}/${sample_type}"/>
+        <copy toDir="${target.sample.device.dir}/${sample_type}">
+            <fileset dir="artifact/"/>
+        </copy>
+
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
         <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>