diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 919a9d25..484cb5cb 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -96,7 +96,6 @@
                 <exclude>**/axis2-transport-mail_1.1.0.wso2v13.jar</exclude>
                 <exclude>**/commons-digester_1.8.1.wso2v1.jar</exclude>
                 <exclude>**/org.apache.commons.configuration_1.10.0.jar</exclude>
-                <exclude>**/apache-zookeeper_3.3.4.wso2v1.jar</exclude>
                 <exclude>**/commons-configuration_1.6.0.wso2v1.jar</exclude>
                 <exclude>**/net.minidev.json-smart_1.2.0.jar</exclude>
                 <exclude>**/libthrift_0.7.0.wso2v2.jar</exclude>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index b0680b24..afd8bf27 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -140,10 +140,10 @@
                              	<featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-				<featureArtifactDef>
+				                <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-				<featureArtifactDef>
+                                <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
 			        <!-- End of Device Management Features -->
@@ -170,7 +170,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.devicetypes.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <!-- IoT Device Management Features -->
 
                                 <!-- Carbon Deployment Features -->
@@ -588,10 +590,7 @@
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.feature:${carbon.analytics.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.hbase.server.feature:${carbon.analytics.version}
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.rdbms.server.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.version}
@@ -621,9 +620,6 @@
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.restapi.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
                                 <!-- END - Analytics features -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.data:org.wso2.carbon.datasource.reader.hadoop.server.feature:${carbon.data.version}
-                                </featureArtifactDef>
 
                                 <!-- ************** START - Capp Management ********* -->
                                 <featureArtifactDef>
@@ -793,18 +789,22 @@
                                     <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-				<feature>
+				                <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-				<feature>
+				                <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-				<feature>
+				                <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <!-- End of Device Management Features -->
 
                                 <feature>
@@ -1338,13 +1338,9 @@
                                 <feature>
                                     <id>org.wso2.carbon.analytics.core.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.analytics.datasource.feature.group</id>
-                                    <version>${carbon.analytics.version}</version>
                                 </feature>
 				                <feature>
-                                    <id>org.wso2.carbon.analytics.datasource.hbase.server.feature.group</id>
+                                    <id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
                                 </feature>
                                 <feature>