diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-DeviceInfo-Receiver_1.0.0/WSO2IoT-DeviceInfo-Receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-DeviceInfo-Receiver_1.0.0/WSO2IoT-DeviceInfo-Receiver.xml
new file mode 100644
index 0000000000..53cb45ec1f
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-DeviceInfo-Receiver_1.0.0/WSO2IoT-DeviceInfo-Receiver.xml
@@ -0,0 +1,27 @@
+<?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="WSO2IoT-DeviceInfo-Receiver"
+               trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+    <from eventAdapterType="iot-event">
+        <property name="events.duplicated.in.cluster">false</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="org.wso2.iot.DeviceInfoStream" version="1.0.0"/>
+</eventReceiver>
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-DeviceInfo-Receiver_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-DeviceInfo-Receiver_1.0.0/artifact.xml
new file mode 100644
index 0000000000..6515e8034b
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-DeviceInfo-Receiver_1.0.0/artifact.xml
@@ -0,0 +1,21 @@
+<?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="WSO2IoT-DeviceInfo-Receiver" version="1.0.0" type="event/receiver" serverRole="GeoDashboard">
+    <file>WSO2IoT-DeviceInfo-Receiver.xml</file>
+</artifact>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/artifacts.xml
index f0fdfa0660..04ee848f63 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/artifacts.xml
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/artifacts.xml
@@ -21,6 +21,7 @@
     <artifact name="org.wso2.carbon.iot.geo.dashboard" version="1.0.0" type="carbon/application">
         <!-- CEP Artifacts -->
         <dependency artifact="WSO2IoT-Geo-Event-Receiver" version="1.0.0" include="true" serverRole="GeoDashboard"/>
+        <dependency artifact="WSO2IoT-DeviceInfo-Receiver" version="1.0.0" include="true" serverRole="GeoDashboard"/>
         <dependency artifact="WSO2IoT-EventSink-FusedStream" version="1.0.0" include="true" serverRole="GeoDashboard"/>
         <dependency artifact="Geo-ExecutionPlan-EventsFusionGenerateNotifications" version="1.0.0" include="true" serverRole="GeoDashboard"/>
         <dependency artifact="Geo-ExecutionPlan-Pass_through" version="1.0.0" include="true" serverRole="GeoDashboard"/>
@@ -31,6 +32,7 @@
         <dependency artifact="iot.per.device.stream.geo.AlertNotifications" version="1.0.0" include="true" serverRole="GeoDashboard"/>
         <dependency artifact="iot.per.device.stream.geo.FusedSpatialEvent" version="1.0.0" include="true" serverRole="GeoDashboard"/>
         <dependency artifact="org.wso2.iot.LocationStream" version="1.0.0" include="true" serverRole="GeoDashboard"/>
+        <dependency artifact="org.wso2.iot.DeviceInfoStream" version="1.0.0" include="true" serverRole="GeoDashboard"/>
         <dependency artifact="org.wso2.geo.ProcessedSpatialEvents" version="1.0.0" include="true" serverRole="GeoDashboard"/>
         <dependency artifact="org.wso2.geo.StandardSpatialEvents" version="1.0.0" include="true" serverRole="GeoDashboard"/>
     </artifact>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.iot.DeviceInfoStream_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.iot.DeviceInfoStream_1.0.0/artifact.xml
new file mode 100644
index 0000000000..7071501ef4
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.iot.DeviceInfoStream_1.0.0/artifact.xml
@@ -0,0 +1,21 @@
+<?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="org.wso2.iot.DeviceInfoStream" version="1.0.0" type="event/stream" serverRole="GeoDashboard">
+    <file>org.wso2.iot.DeviceInfoStream-1.0.0.json</file>
+</artifact>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.iot.DeviceInfoStream_1.0.0/org.wso2.iot.DeviceInfoStream-1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.iot.DeviceInfoStream_1.0.0/org.wso2.iot.DeviceInfoStream-1.0.0.json
new file mode 100644
index 0000000000..129b96c725
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.iot.DeviceInfoStream_1.0.0/org.wso2.iot.DeviceInfoStream-1.0.0.json
@@ -0,0 +1,98 @@
+{
+  "name": "org.wso2.iot.DeviceInfoStream",
+  "version": "1.0.0",
+  "nickName": "",
+  "description": "IoT Server Device Info Stream",
+  "metaData": [
+    {
+      "name": "deviceId",
+      "type": "STRING"
+    },
+    {
+      "name": "deviceType",
+      "type": "STRING"
+    }
+  ],
+  "payloadData": [
+    {
+      "name": "timeStamp",
+      "type": "LONG"
+    },
+    {
+      "name": "imei",
+      "type": "STRING"
+    },
+    {
+      "name": "imsi",
+      "type": "STRING"
+    },
+    {
+      "name": "deviceModel",
+      "type": "STRING"
+    },
+    {
+      "name": "vendor",
+      "type": "STRING"
+    },
+    {
+      "name": "osVersion",
+      "type": "STRING"
+    },
+    {
+      "name": "osBuildDate",
+      "type": "STRING"
+    },
+    {
+      "name": "batteryLevel",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "totalInternalMemory",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "availableInternalMemory",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "totalExternalMemory",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "availableExternalMemory",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "operator",
+      "type": "STRING"
+    },
+    {
+      "name": "connectionType",
+      "type": "STRING"
+    },
+    {
+      "name": "mobileSignalStrength",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "ssid",
+      "type": "STRING"
+    },
+    {
+      "name": "cpuUsage",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "totalRAM",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "availableRAM",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "pluggedIn",
+      "type": "BOOL"
+    }
+  ]
+}
\ No newline at end of file