diff --git a/modules/samples/artifacts/0007/eventpublishers/LoggerEventPublisher.xml b/modules/samples/artifacts/0007/eventpublishers/LoggerEventPublisher.xml
deleted file mode 100644
index 38a76e27..00000000
--- a/modules/samples/artifacts/0007/eventpublishers/LoggerEventPublisher.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ Licensed 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="LoggerEventPublisher" statistics="disable"
-  trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
-  <from streamName="org.wso2.sample.service.data" version="1.0.0"/>
-  <mapping customMapping="disable" type="text"/>
-  <to eventAdapterType="logger">
-    <property name="uniqueId">Sample Service Data</property>
-  </to>
-</eventPublisher>
diff --git a/modules/samples/artifacts/0007/eventpublishers/wso2eventLogger.xml b/modules/samples/artifacts/0007/eventpublishers/wso2eventLogger.xml
new file mode 100644
index 00000000..dd2ebd8e
--- /dev/null
+++ b/modules/samples/artifacts/0007/eventpublishers/wso2eventLogger.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventPublisher name="wso2eventLogger" statistics="disable"
+  trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
+  <from streamName="org.wso2.event.sensor.stream" version="1.0.0"/>
+  <mapping customMapping="disable" type="text"/>
+  <to eventAdapterType="logger">
+    <property name="uniqueId">org.wso2.event.statistics</property>
+  </to>
+</eventPublisher>
diff --git a/modules/samples/artifacts/0007/eventreceivers/WSO2EventReceiver.xml b/modules/samples/artifacts/0007/eventreceivers/WSO2EventReceiver.xml
deleted file mode 100644
index 610d4a94..00000000
--- a/modules/samples/artifacts/0007/eventreceivers/WSO2EventReceiver.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ Licensed 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="WSO2EventReceiver" statistics="disable"
-    trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="wso2event"/>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="org.wso2.sample.service.data" version="1.0.0"/>
-</eventReceiver>
diff --git a/modules/samples/artifacts/0007/eventreceivers/wso2eventReceiver.xml b/modules/samples/artifacts/0007/eventreceivers/wso2eventReceiver.xml
new file mode 100644
index 00000000..62ac5bd1
--- /dev/null
+++ b/modules/samples/artifacts/0007/eventreceivers/wso2eventReceiver.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventReceiver name="wso2eventReceiver" statistics="disable"
+    trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+    <from eventAdapterType="wso2event"/>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="org.wso2.event.sensor.stream" version="1.0.0"/>
+</eventReceiver>
diff --git a/modules/samples/artifacts/0007/eventstreams/org.wso2.event.sensor.stream_1.0.0.json b/modules/samples/artifacts/0007/eventstreams/org.wso2.event.sensor.stream_1.0.0.json
new file mode 100644
index 00000000..7f2096b8
--- /dev/null
+++ b/modules/samples/artifacts/0007/eventstreams/org.wso2.event.sensor.stream_1.0.0.json
@@ -0,0 +1,44 @@
+{
+  "name": "org.wso2.event.sensor.stream",
+  "version": "1.0.0",
+  "nickName": "",
+  "description": "",
+  "metaData": [
+    {
+      "name": "timestamp",
+      "type": "LONG"
+    },
+    {
+      "name": "isPowerSaverEnabled",
+      "type": "BOOL"
+    },
+    {
+      "name": "sensorId",
+      "type": "INT"
+    },
+    {
+      "name": "sensorName",
+      "type": "STRING"
+    }
+  ],
+  "correlationData": [
+    {
+      "name": "longitude",
+      "type": "DOUBLE"
+    },
+    {
+      "name": "latitude",
+      "type": "DOUBLE"
+    }
+  ],
+  "payloadData": [
+    {
+      "name": "humidity",
+      "type": "FLOAT"
+    },
+    {
+      "name": "sensorValue",
+      "type": "DOUBLE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/modules/samples/artifacts/0007/org_wso2_event_sensor_stream_1_0_0.csv b/modules/samples/artifacts/0007/org_wso2_event_sensor_stream_1_0_0.csv
new file mode 100644
index 00000000..1f80cafc
--- /dev/null
+++ b/modules/samples/artifacts/0007/org_wso2_event_sensor_stream_1_0_0.csv
@@ -0,0 +1,3 @@
+19900813115534,false,501,temperature,90.34344,20.44345,2.3,20.44345
+19900813115534,false,502,temperature,90.34344,20.44345,2.3,20.44345
+19900813115534,false,503,temperature,90.34344,20.44345,2.3,20.44345
\ No newline at end of file
diff --git a/modules/samples/artifacts/0007/org_wso2_sample_service_data_1_0_0.csv b/modules/samples/artifacts/0007/org_wso2_sample_service_data_1_0_0.csv
deleted file mode 100644
index 0b0adfcf..00000000
--- a/modules/samples/artifacts/0007/org_wso2_sample_service_data_1_0_0.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-nasdaq.com,192.100.100.100,application/xml,sample-agent,nasdaq.com,google,123,StockQuoteService,getPrice,1429884020,20,1,1,0
-nasdaq.com,123.101.102.100,application/xml,sample-agent,nasdaq.com,google,124,StockQuoteService,getPrice,1429884234,21,1,1,0
-nasdaq.com,99.101.124.2,application/xml,sample-agent,nasdaq.com,google,125,StockQuoteService,getPrice,1429884236,12,1,1,0
-nasdaq.com,123.101.102.100,application/xml,sample-agent,nasdaq.com,google,126,StockQuoteService,getPrice,1429884666,23,1,1,0
\ No newline at end of file
diff --git a/modules/samples/artifacts/0102/eventreceivers/httpReceiver.xml b/modules/samples/artifacts/0102/eventreceivers/httpReceiver.xml
index 930bc5de..a7b3ead6 100644
--- a/modules/samples/artifacts/0102/eventreceivers/httpReceiver.xml
+++ b/modules/samples/artifacts/0102/eventreceivers/httpReceiver.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eventReceiver name="httpReceiver" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="http"/>
+    <from eventAdapterType="http">
+        <property name="transports">http</property>
+    </from>
     <mapping customMapping="disable" type="xml"/>
     <to streamName="org.wso2.sample.stock.trades" version="1.0.0"/>
 </eventReceiver>
diff --git a/modules/samples/artifacts/0105/eventreceivers/pizzaDeliveryHTTPReceiver.xml b/modules/samples/artifacts/0105/eventreceivers/pizzaDeliveryHTTPReceiver.xml
index c2744719..45af056f 100644
--- a/modules/samples/artifacts/0105/eventreceivers/pizzaDeliveryHTTPReceiver.xml
+++ b/modules/samples/artifacts/0105/eventreceivers/pizzaDeliveryHTTPReceiver.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eventReceiver name="packageDeliveryHTTPReceiver" statistics="disable"
     trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="http"/>
+    <from eventAdapterType="http">
+        <property name="transports">http</property>
+    </from>
     <mapping customMapping="disable" type="text"/>
     <to streamName="org.wso2.sample.package.deliveries" version="1.0.0"/>
 </eventReceiver>
diff --git a/modules/samples/artifacts/0105/eventreceivers/pizzaOrdersHTTPReceiver.xml b/modules/samples/artifacts/0105/eventreceivers/pizzaOrdersHTTPReceiver.xml
index 1023449b..ed2ee439 100644
--- a/modules/samples/artifacts/0105/eventreceivers/pizzaOrdersHTTPReceiver.xml
+++ b/modules/samples/artifacts/0105/eventreceivers/pizzaOrdersHTTPReceiver.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eventReceiver name="packageArrivalsHTTPReceiver" statistics="disable"
     trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="http"/>
+    <from eventAdapterType="http">
+        <property name="transports">http</property>
+    </from>
     <mapping customMapping="disable" type="text"/>
     <to streamName="org.wso2.sample.package.arrivals" version="1.0.0"/>
 </eventReceiver>