diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 78b795cf..482891f0 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -292,6 +292,11 @@
 									<output>../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources/master-datasources.xml</output>
 									<config>src/analytics/conf/datasource_config_change.xml</config>
 								</transformation>
+                                <transformation>
+                                    <input>${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml</input>
+                                    <output>../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml</output>
+                                    <config>src/analytics/conf/cdm_config_change.xml</config>
+                                </transformation>
 							</transformations>
 						</configuration>
 					</execution>
diff --git a/modules/distribution/src/analytics/conf/cdm_config_change.xml b/modules/distribution/src/analytics/conf/cdm_config_change.xml
new file mode 100644
index 00000000..1dd2d11b
--- /dev/null
+++ b/modules/distribution/src/analytics/conf/cdm_config_change.xml
@@ -0,0 +1,12 @@
+<processor>
+    <!-- Remove current PushNotificationProviders config -->
+    <remove>
+        <name>//DeviceMgtConfiguration/PushNotificationConfiguration/PushNotificationProviders</name>
+    </remove>
+
+    <!-- Add modified Carbon db and UM db config -->
+    <add>
+        <inside>//DeviceMgtConfiguration/PushNotificationConfiguration</inside>
+        <file>src/analytics/conf/push_notification_config.xml</file>
+    </add>
+</processor>
\ No newline at end of file
diff --git a/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml b/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml
new file mode 100644
index 00000000..15e7e407
--- /dev/null
+++ b/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml
@@ -0,0 +1,45 @@
+<!--
+  ~ Copyright (c) 2017, 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.
+  -->
+
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
+    <providers>
+        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
+    </providers>
+    <datasources>
+        <datasource>
+            <name>DM_DS</name>
+            <description>The datasource used for CDM</description>
+            <jndiConfig>
+                <name>jdbc/DM_DS</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:../../repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+    </datasources>
+</datasources-configuration>
diff --git a/modules/distribution/src/analytics/conf/push_notification_config.xml b/modules/distribution/src/analytics/conf/push_notification_config.xml
new file mode 100644
index 00000000..cfa47cb2
--- /dev/null
+++ b/modules/distribution/src/analytics/conf/push_notification_config.xml
@@ -0,0 +1,5 @@
+<config>
+    <PushNotificationProviders>
+
+    </PushNotificationProviders>
+</config>
\ No newline at end of file
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 85809762..9c1d6332 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -722,6 +722,13 @@
             </excludes>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                src/analytics/conf/datasources
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/conf/datasources</outputDirectory>
+        </fileSet>
+
         <fileSet>
             <directory>
                 src/analytics/conf/analytics/spark
@@ -1239,6 +1246,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/core/conf/etc/device-analytics-config.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/conf/etc</outputDirectory>
+            <destName>device-analytics-config.xml</destName>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!-- Copying synapse-handlers.xml file -->
         <file>
             <source>src/core/conf/synapse-handlers.xml</source>
diff --git a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml
index 8a4bb660..fa52911a 100755
--- a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml
+++ b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml
@@ -29,7 +29,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
+                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index 460aeb0a..33061356 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -94,6 +94,15 @@
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.basics.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version}
+                                </featureArtifactDef>
                                 <!-- START - Analytics Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.das.version}
@@ -387,6 +396,9 @@
                                 <!-- Siddhi extension feature -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.devicegroup.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
 								<featureArtifactDef>
 									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
@@ -443,6 +455,18 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.basics.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.email.sender.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.axis2.transport.mail.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
                                 <!-- START - Analytics Features -->
                                 <feature>
                                     <id>org.wso2.carbon.analytics.core.feature.group</id>
@@ -826,13 +850,16 @@
                                     <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.extension.siddhi.devicegroup.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
 
 								<!--android sense analytics feature-->
 								<feature>
 									<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
-                                
                                 <!-- GPL Siddhi Extension Script for Geo Fencing -->
                                 <feature>
                                     <id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>