diff --git a/modules/samples/droneanalyzer/component/analytics/build.xml b/modules/samples/droneanalyzer/component/analytics/build.xml
new file mode 100644
index 00000000..ea9894bc
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/build.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--/*
+* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+* WSO2 Inc. licenses this file to you under the Apache License,
+* Version 2.0 (the "License"); you may not use this file except
+* in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/-->
+<project name="create-sample-sensor-capps" default="zip" basedir=".">
+    <property name="project-name" value="${ant.project.name}"/>
+    <property name="target-dir" value="target/carbonapps"/>
+    <property name="src-dir" value="src/main/resources/carbonapps"/>
+    <property name="sensor_dir" value="droneStats"/>
+    <target name="clean">
+        <delete dir="${target-dir}" />
+    </target>
+    <target name="zip" depends="clean">
+        <mkdir dir="${target-dir}"/>
+        <zip destfile="${target-dir}/${sensor_dir}.car">
+            <zipfileset dir="${src-dir}/${sensor_dir}"/>
+        </zip>
+    </target>
+</project>
+
diff --git a/modules/samples/droneanalyzer/component/analytics/pom.xml b/modules/samples/droneanalyzer/component/analytics/pom.xml
new file mode 100644
index 00000000..fb4ce39e
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/pom.xml
@@ -0,0 +1,86 @@
+<!--/*
+* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+* WSO2 Inc. licenses this file to you under the Apache License,
+* Version 2.0 (the "License"); you may not use this file except
+* in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.homeautomation</groupId>
+        <artifactId>droneanalyzer-component</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>${groupId}.droneanalyzer.analytics</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <name> ${groupId}.droneanalyzer.analytics </name>
+    <url>http://wso2.org</url>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>${maven-clean-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>auto-clean</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>${wso2.maven.compiler.source}</version>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <target>
+                                <ant antfile="build.xml" target="zip"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>${maven-assembly-plugin.version}</version>
+                <configuration>
+                    <finalName>${project.artifactId}-1.0.0</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/assembly/src.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>create-archive</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/modules/samples/droneanalyzer/component/analytics/src/assembly/src.xml b/modules/samples/droneanalyzer/component/analytics/src/assembly/src.xml
new file mode 100644
index 00000000..a5a37501
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/assembly/src.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <baseDirectory>${basedir}/src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/target/carbonapps</directory>
+            <outputDirectory>/</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml
new file mode 100644
index 00000000..e69f305e
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<eventPublisher name="EventPublisher_droneStats" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
+    <from streamName="org.wso2.iot.devices.droneStats" version="1.0.0"/>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to eventAdapterType="iot-ui"/>
+</eventPublisher>
+
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml
new file mode 100644
index 00000000..2a5159af
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="Eventpublisher_droneStats" version="1.0.0" type="event/publisher" serverRole="DataAnalyticsServer">
+    <file>EventPublisher_droneStats.xml</file>
+</artifact>
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml
new file mode 100644
index 00000000..8da41ac5
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<eventReceiver name="droneStats-mqtt" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+    <from eventAdapterType="oauth-mqtt">
+        <property name="topic">carbon.super/drone/+/publisher</property>
+        <property name="username">admin</property>
+        <property name="contentValidatorParams">device_id_json_path:event.metaData.deviceId,device_id_topic_hierarchy_index:2</property>
+        <property name="contentValidator">org.wso2.carbon.device.mgt.iot.input.adapter.mqtt.util.MQTTContentValidator</property>
+        <property name="contentTransformer">default</property>
+        <property name="dcrUrl">https://localhost:${carbon.https.port}/dynamic-client-web/register</property>
+        <property name="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
+        <property name="cleanSession">true</property>
+    </from>
+    <mapping customMapping="disable" type="json"/>
+    <to streamName="org.wso2.iot.devices.droneStats" version="1.0.0"/>
+</eventReceiver>
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml
new file mode 100644
index 00000000..74cbd66a
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="Eventreceiver_mqtt_droneStats" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
+    <file>EventReceiver_mqtt_droneStats.xml</file>
+</artifact>
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml
new file mode 100644
index 00000000..724730c8
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="Eventstore_droneStats" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
+    <file>org_wso2_iot_devices_droneStats.xml</file>
+</artifact>
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml
new file mode 100644
index 00000000..a3159f6b
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<EventStoreConfiguration>
+    <Source>
+        <StreamId>org.wso2.iot.devices.droneStats:1.0.0</StreamId>
+    </Source>
+    <RecordStoreName>EVENT_STORE</RecordStoreName>
+    <TableSchema>
+		<ColumnDefinition>
+			<Name>meta_owner</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceType</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_deviceId</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>STRING</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>meta_time</Name>
+			<EnableIndexing>true</EnableIndexing>
+			<IsPrimaryKey>true</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>LONG</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>quatanium_val_q1</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>quatanium_val_q2</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>quatanium_val_q3</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>quatanium_val_q4</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>velocity_x</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>velocity_y</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>velocity_z</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>global_location_lat</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>global_location_alt</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>global_location_lon</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>battery_level</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>battery_voltage</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>pitch</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>roll</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+		<ColumnDefinition>
+			<Name>yaw</Name>
+			<EnableIndexing>false</EnableIndexing>
+			<IsPrimaryKey>false</IsPrimaryKey>
+			<EnableScoreParam>false</EnableScoreParam>
+			<Type>DOUBLE</Type>
+		</ColumnDefinition>
+    </TableSchema>
+</EventStoreConfiguration>
\ No newline at end of file
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml
new file mode 100644
index 00000000..b1855954
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="Eventstream_droneStats" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+	<file>org.wso2.iot.devices.droneStats_1.0.0.json</file>
+</artifact>
+
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/org.wso2.iot.devices.droneStats_1.0.0.json b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/org.wso2.iot.devices.droneStats_1.0.0.json
new file mode 100644
index 00000000..746e60d8
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/org.wso2.iot.devices.droneStats_1.0.0.json
@@ -0,0 +1,29 @@
+{
+  "name": "org.wso2.iot.devices.droneStats",
+  "version": "1.0.0",
+  "nickName": "droneStats",
+  "description": "droneStats data received from the Device",
+  "metaData": [
+    {"name":"owner","type":"STRING"},
+    {"name":"deviceType","type":"STRING"},
+    {"name":"deviceId","type":"STRING"},
+    {"name":"time","type":"LONG"}
+  ],
+  "payloadData": [
+    {"name": "quatanium_val_q1", "type": "DOUBLE"},
+    {"name": "quatanium_val_q2", "type": "DOUBLE"},
+    {"name": "quatanium_val_q3", "type": "DOUBLE"},
+    {"name": "quatanium_val_q4", "type": "DOUBLE"},
+    {"name": "velocity_x", "type": "DOUBLE"},
+    {"name": "velocity_y", "type": "DOUBLE"},
+    {"name": "velocity_z", "type": "DOUBLE"},
+    {"name": "global_location_lat", "type": "DOUBLE"},
+    {"name": "global_location_alt", "type": "DOUBLE"},
+    {"name": "global_location_lon", "type": "DOUBLE"},
+    {"name": "battery_level", "type": "DOUBLE"},
+    {"name": "battery_voltage", "type": "DOUBLE"},
+    {"name": "pitch", "type": "DOUBLE"},
+    {"name": "roll", "type": "DOUBLE"},
+    {"name": "yaw", "type": "DOUBLE"}
+  ]
+}
\ No newline at end of file
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml
new file mode 100644
index 00000000..6c34aea9
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
+    <file>droneStats_Script.xml</file>
+</artifact>
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml
new file mode 100644
index 00000000..7536c8e4
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<Analytics>
+  <Name>IoTServer_Sensor_Script</Name>
+  <Script>
+      CREATE TEMPORARY TABLE DevicedroneStatsData USING CarbonAnalytics OPTIONS(tableName "ORG_WSO2_IOT_DEVICES_droneStats");
+      CREATE TEMPORARY TABLE DevicedroneStatsSummaryData USING CarbonAnalytics OPTIONS (tableName "DEVICE_droneStats_SUMMARY", schema "quatanium_val_q1 DOUBLE -i,quatanium_val_q2  DOUBLE -i,quatanium_val_q3  DOUBLE -i,quatanium_val_q4  DOUBLE -i,velocity_x  DOUBLE -i,velocity_y  DOUBLE -i,velocity_z  DOUBLE -i,global_location_lat  DOUBLE -i,global_location_alt  DOUBLE -i,global_location_lon  DOUBLE -i,battery_level  DOUBLE -i,battery_voltage  DOUBLE -i,pitch  DOUBLE -i,roll  DOUBLE -i,yaw  DOUBLE -i, deviceType STRING -i, deviceId STRING -i, owner STRING -i, time LONG -i",primaryKeys "deviceType, deviceId, owner, time");
+      insert into table DevicedroneStatsSummaryData select quatanium_val_q1,quatanium_val_q2,quatanium_val_q3,quatanium_val_q4,velocity_x,velocity_y,velocity_z,global_location_lat,global_location_alt,global_location_lon,battery_level,battery_voltage,pitch,roll,yaw, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT) as time from DevicedroneStatsData group by meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT),quatanium_val_q1,quatanium_val_q2,quatanium_val_q3,quatanium_val_q4,velocity_x,velocity_y,velocity_z,global_location_lat,global_location_alt,global_location_lon,battery_level,battery_voltage,pitch,roll,yaw ;
+  </Script>
+  <CronExpression>0 * * * * ?</CronExpression>
+</Analytics>
diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml
new file mode 100644
index 00000000..76675ae7
--- /dev/null
+++ b/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<artifacts>
+    <artifact name="droneStats_CAPP" version="1.0.0" type="carbon/application">
+        <dependency artifact="Eventstream_droneStats" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventstore_droneStats" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="Eventreceiver_mqtt_droneStats" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="Eventpublisher_droneStats" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    </artifact>
+</artifacts>