diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 7dd17cbe..c163fb0a 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -1,24 +1,24 @@
 <?org.wso2.uesxml version="1.0" encoding="UTF-8"?>
 <!--
-~ Copyright (c) 2014, 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"
+  ~ Copyright (c) 2015, 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<parent>
@@ -104,31 +104,6 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 
-					<!--============ Added with ES Features ===============-->
-
-					<execution>
-						<id>social-h2-table-gen</id>
-						<phase>package</phase>
-						<configuration>
-							<target>
-								<echo message="########### Create Social Database ##############"/>
-								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social"
-									  overwrite="false">
-									<fileset
-											dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/">
-									</fileset>
-								</copy>
-								<path id="h2.classpath">
-									<path refid="maven.compile.classpath"/>
-								</path>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<!--============ End with ES Features ===============-->
-
 					<execution>
 						<!-- Creating Device Management schema -->
 						<id>create-device-mgt-schema</id>
@@ -315,56 +290,6 @@
 						</goals>
 					</execution>
 
-					<!--Install default samples-->
-					<execution>
-						<id>install_samples</id>
-						<phase>package</phase>
-						<configuration>
-							<tasks>
-								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>
-
-								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot"
-									  overwrite="true">
-									<fileset
-											file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml"/>
-								</copy>
-
-								<subant target="deploy">
-									<fileset
-											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino"
-											includes="build.xml"/>
-								</subant>
-								<subant target="deploy">
-									<fileset
-											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi"
-											includes="build.xml"/>
-								</subant>
-								<!--subant target="deploy">
-									<fileset
-											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm"
-											includes="build.xml"/>
-								</subant-->
-								<copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"
-									  overwrite="true">
-									<fileset
-											file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/iot-config.xml"/>
-								</copy>
-								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
-								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
-								<!--<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml"-->
-									  <!--toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml.disable"/>-->
-								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
-									  overwrite="true"/>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<!--Install default samples-->
 					<execution>
 						<id>install_libs</id>
 						<phase>package</phase>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index cb1fd111..beb2ca02 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1,20 +1,20 @@
 <!--
- ~ Copyright (c) 2015, 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.
- -->
+  ~ Copyright (c) 2015, 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>
     <id>bin</id>
     <formats>
@@ -349,106 +349,126 @@
                 <exclude>**/publisher/config/publisher-tenant.json</exclude>
                 <exclude>**/sso/jaggery.conf</exclude>
                 <exclude>**/sso/views/register_new_user.jag</exclude>
+                <exclude>**/devicemgt/*</exclude>
             </excludes>
         </fileSet>
-        <!--============ Added with ES Features ===============-->
 
-        <!-- copy the landing page webapp -->
+        <!-- Copying mdm app from devicemgt app-->
         <fileSet>
-            <directory>lib/home</directory>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/
+            </directory>
             <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/iotserver
             </outputDirectory>
         </fileSet>
-        <!--============ Added with ES Features ===============-->
 
-        <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/client</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-        </fileSet>
-        <!--============ Added with ES Features ===============-->
-
-        <!--copy jaxrs web app for OAuth feature-->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaxwebapps
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/
             </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaxwebapps
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/
             </outputDirectory>
-            <includes>
-                <include>oauth2endpoints.war</include>
-            </includes>
+            <filtered>false</filtered>
+            <fileMode>644</fileMode>
         </fileSet>
-        <!--============ Added with ES Features ===============-->
 
+        <!-- copy the landing page webapp -->
         <fileSet>
-            <directory>target/jaxwebapps</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaxwebapps
+            <directory>lib/home</directory>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT
             </outputDirectory>
-            <includes>
-                <include>**/**</include>
-            </includes>
         </fileSet>
         <!--============ Added with ES Features ===============-->
 
-        <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
-            <includes>
-                <include>**/ciphertool.sh</include>
-                <include>**/ciphertool.bat</include>
-            </includes>
-        </fileSet>
+        <!--<fileSet>-->
+        <!--<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/client</directory>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>-->
+        <!--<includes>-->
+        <!--<include>*/**</include>-->
+        <!--</includes>-->
+        <!--</fileSet>-->
         <!--============ Added with ES Features ===============-->
 
-        <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/lib/</outputDirectory>
-            <includes>
-                <include>**/org.wso2.ciphertool-1.0.0-wso2v3.jar</include>
-            </includes>
-        </fileSet>
+        <!--copy jaxrs web app for OAuth feature-->
+        <!--<fileSet>-->
+        <!--<directory>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaxwebapps-->
+        <!--</directory>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaxwebapps-->
+        <!--</outputDirectory>-->
+        <!--<includes>-->
+        <!--<include>oauth2endpoints.war</include>-->
+        <!--</includes>-->
+        <!--</fileSet>-->
+        <!--============ Added with ES Features ===============-->
 
+        <!--<fileSet>-->
+        <!--<directory>target/jaxwebapps</directory>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaxwebapps-->
+        <!--</outputDirectory>-->
+        <!--<includes>-->
+        <!--<include>**/**</include>-->
+        <!--</includes>-->
+        <!--</fileSet>-->
+        <!--============ Added with ES Features ===============-->
 
+        <!--<fileSet>-->
+        <!--<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin</directory>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>-->
+        <!--<includes>-->
+        <!--<include>**/ciphertool.sh</include>-->
+        <!--<include>**/ciphertool.bat</include>-->
+        <!--</includes>-->
+        <!--</fileSet>-->
         <!--============ Added with ES Features ===============-->
 
-        <fileSet>
-            <directory>src/repository/conf/etc</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
-            <includes>
-                <include>**/**</include>
-            </includes>
-        </fileSet>
+        <!--<fileSet>-->
+        <!--<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib</directory>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/lib/</outputDirectory>-->
+        <!--<includes>-->
+        <!--<include>**/org.wso2.ciphertool-1.0.0-wso2v3.jar</include>-->
+        <!--</includes>-->
+        <!--</fileSet>-->
+
+
+        <!--============ Added with ES Features ===============-->
+
+        <!--<fileSet>-->
+        <!--<directory>src/repository/conf/etc</directory>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>-->
+        <!--<includes>-->
+        <!--<include>**/**</include>-->
+        <!--</includes>-->
+        <!--</fileSet>-->
 
 
 
         <!--============ Added with ES Features ===============-->
 
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/
-            </outputDirectory>
-            <includes>
-                <include>**/sso_redirect.html</include>
-            </includes>
-        </fileSet>
+        <!--<fileSet>-->
+        <!--<directory>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/-->
+        <!--</directory>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/-->
+        <!--</outputDirectory>-->
+        <!--<includes>-->
+        <!--<include>**/sso_redirect.html</include>-->
+        <!--</includes>-->
+        <!--</fileSet>-->
         <!--============ Added with ES Features ===============-->
 
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <includes>
-                <include>shindig.war</include>
-            </includes>
-        </fileSet>
+        <!--<fileSet>-->
+        <!--<directory>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps-->
+        <!--</directory>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
+        <!--</outputDirectory>-->
+        <!--<includes>-->
+        <!--<include>shindig.war</include>-->
+        <!--</includes>-->
+        <!--</fileSet>-->
 
         <!--============ Added with ES Features ===============-->
 
@@ -476,29 +496,6 @@
         <!--========================================================================================================-->
         <!-- End of Enterprise Store Features -->
 
-        <!--copy web app for devices-->
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
-            <includes>
-                <include>common.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- Copying Authentication Endpoint webapp -->
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
-            <includes>
-                <include>authenticationendpoint.war</include>
-                <include>oauth2.war</include>
-            </includes>
-        </fileSet>
-
         <!--============ Added with API Features ===============-->
         <fileSet>
             <directory>src/api-resource/customsequences</directory>
@@ -690,31 +687,31 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xsd
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+        <!--<source>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-type-config.xsd-->
+        <!--</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
+        <!--<file>-->
+        <!--<source>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xml-->
+        <!--</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xsd
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+        <!--<source>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xsd-->
+        <!--</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
         <file>
             <source>INSTALL.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@@ -818,14 +815,14 @@
         </file>
 
         <!--app management config file-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/app-management-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+        <!--<source>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/app-management-config.xml-->
+        <!--</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
         <!--License Config file-->
         <file>
@@ -951,52 +948,52 @@
         <!--========================================================================================================-->
         <!-- Enterprise Store Features -->
 
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/email/email-admin-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/email</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+        <!--<source>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/email/email-admin-config.xml-->
+        <!--</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/email</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
 
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+        <!--<source>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml-->
+        <!--</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
-        <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+        <!--<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml-->
+        <!--</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
         <!--============ Added with ES Features ===============-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/social-datasources.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+        <!--<source>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/social-datasources.xml-->
+        <!--</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
 
         <!--============ Added with ES Features ===============-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/shindig.properties</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+        <!--<source>-->
+        <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/shindig.properties</source>-->
+        <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
+        <!--<filtered>true</filtered>-->
+        <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
         <!--========================================================================================================-->
         <!-- End of Enterprise Store Features -->
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index ad3b577f..03c6fa7b 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ~ Copyright (c) 2014, 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.
- -->
+  ~ Copyright (c) 2015, 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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
@@ -37,7 +38,7 @@
         <module>tests-integration</module>
         <!--<module>tests-ui-integration</module>-->
         <module>tests-platform</module>
-        <module>tests-samples</module>
+        <!--<module>tests-samples</module>-->
     </modules>
 
     <!--<build>-->
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 026931e9..d3730437 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
- ~ Copyright (c) 2014, 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"
+  ~ Copyright (c) 2015, 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
@@ -110,45 +111,44 @@
                                     org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
 
-
-                                <!--Device Cloud Features -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.device.mgt.iot:org.wso2.carbon.device.mgt.iot.feature:${carbon.iot.device.mgt.version}
-                                </featureArtifactDef>
-
-                                <!--=====================================================================================================-->
                                 <!-- Device Management Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.dynamic.client.registration.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.enterprise.store.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.devicemgt.ui.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-                                 <!--End of Device Management Features-->
+                                <!--<featureArtifactDef>-->
+                                <!--org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                <!--org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common.api.feature:${carbon.device.mgt.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
                                 <featureArtifactDef>
@@ -440,61 +440,8 @@
 								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<!-- End of Carbon Deployment Features -->
 
-
-								<!-- Store Features -->
-								<featureArtifactDef>
-									org.wso2.carbon.store:org.wso2.carbon.store.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:event.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:login.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:permission.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:registration.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:bampublisher.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:store.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:ues.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:account-management.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:rxt.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:utils.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:lifecycle.feature:${carbon.store.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.social.version}
-								</featureArtifactDef>
-								<feaureArtifactDef>
-									org.wso2.carbon.store:org.wso2.carbon.store.extensions.assets.gadget.feature:${carbon.store.version}
-								</feaureArtifactDef>
-								<feaureArtifactDef>
-									org.wso2.carbon.store:org.wso2.carbon.store.extensions.assets.site.feature:${carbon.store.version}
-								</feaureArtifactDef>
-
+                                <!-- Registry Features -->
 								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-								<!-- End of Store Features -->
-
-
-								<!--&lt;!&ndash; Registry Features &ndash;&gt;-->
-								<!--&lt;!&ndash;+++++++++++++++++++++++++++++++++++++++++++++++&ndash;&gt;-->
-
 								<!--<featureArtifactDef>-->
 									<!--org.wso2.carbon.registry:org.wso2.carbon.registry.task.feature:${carbon.registry.version}-->
 								<!--</featureArtifactDef>-->
@@ -520,8 +467,6 @@
 									org.wso2.ciphertool:org.wso2.ciphertool.feature:${ciphertool.version}
 								</feaureArtifactDef>
 
-
-								<!-- End of Enterprise Store Features -->
 								<!--=====================================================================================================-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
@@ -614,8 +559,6 @@
                                     org.wso2.carbon.data:org.wso2.carbon.datasource.reader.hadoop.server.feature:${carbon.data.version}
                                 </featureArtifactDef>
 
-
-
                                 <!-- ************** START - Capp Management ********* -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
@@ -732,12 +675,6 @@
                                     <version>${carbon.kernel.version}</version>
                                 </feature>
 
-                                <!-- IoT Features -->
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
-                                    <version>${carbon.iot.device.mgt.version}</version>
-                                </feature>
-
                                 <!--========================================================================================================-->
                                 <!-- Device Management Features -->
                                 <feature>
@@ -769,13 +706,28 @@
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id>
+                                    <id>
+                                        org.wso2.carbon.dynamic.client.registration.server.feature.group
+                                    </id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group
+                                    </id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
+                                    <id>org.wso2.carbon.devicemgt.ui.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <!--<feature>-->
+                                <!--<id>org.wso2.carbon.device.mgt.common.api.feature.group</id>-->
+                                <!--<version>${carbon.device.mgt.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                <!--<id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id>-->
+                                <!--<version>${carbon.device.mgt.version}</version>-->
+                                <!--</feature>-->
                                 <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
@@ -1163,74 +1115,6 @@
                                 </feature>
                                 <!-- End of Carbon Deployment Features -->
 
-
-                                <!-- Store Features -->
-                                <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-
-                                <feature>
-                                    <id>org.wso2.carbon.store.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.event.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.login.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.permission.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.registration.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.bampublisher.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.store.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.ues.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.account-management.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.rxt.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.utils.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.store.modules.lifecycle.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.social.feature.group</id>
-                                    <version>${carbon.social.version}</version>
-                                </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.store.extensions.assets.gadget.feature.group</id>-->
-                                    <!--<version>${carbon.store.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.store.extensions.assets.site.feature.group</id>-->
-                                    <!--<version>${carbon.store.version}</version>-->
-                                <!--</feature>-->
-
-                                <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-                                <!-- End of Store Features -->
-
                                 <!-- Commons Features -->
                                 <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
                                 <feature>
diff --git a/pom.xml b/pom.xml
index c1bf1500..f8069e79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ~ Copyright (c) 2014, 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"
+  ~ Copyright (c) 2015, 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -412,27 +413,6 @@
                 <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
-
-
-            <!--IOT dependencies-->
-
-
-            <dependency>
-                <groupId>org.wso2.carbon.iot</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-                <version>${carbon.iot.device.mgt.version}</version>
-            </dependency>
-
 
             <!--Osgi dependencies-->
             <dependency>
@@ -834,7 +814,7 @@
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
         <!--Jaggery -->
-        <jaggery.version>0.12.0-M1</jaggery.version>
+        <jaggery.version>0.12.0</jaggery.version>
         <jaggery.extensions.version>1.5.0-M1</jaggery.extensions.version>
         <jaggery.extensions.sso.version>1.5.0-M1</jaggery.extensions.sso.version>
         <jaggery.extensions.carbon.version>1.5.0-M1</jaggery.extensions.carbon.version>
@@ -845,17 +825,13 @@
         <handlebars.feature.version>1.5.0-M1</handlebars.feature.version>
         <markdown.feature.version>1.5.0-M1</markdown.feature.version>
 
-        <!-- Store Features -->
-        <carbon.store.version>2.3.9-SNAPSHOT</carbon.store.version>
-        <carbon.social.version>2.3.9-SNAPSHOT</carbon.social.version>
-
         <!-- Additional Stuff from ES Features -->
         <carbon.dashboard.version>1.0.5</carbon.dashboard.version>
         <ciphertool.version>1.0.0-wso2v3</ciphertool.version>
         <el.api.version>2.2</el.api.version>
 
         <!--Testing -->
-        <test.framework.version>4.4.1</test.framework.version>
+        <test.framework.version>4.4.2</test.framework.version>
         <testng.version>6.8.5</testng.version>
         <automation.utils.version>4.4.1</automation.utils.version>
         <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
@@ -879,10 +855,10 @@
         <carbon.deployment.version>4.6.0</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>4.6.0-SNAPSHOT</carbon.identity.version>
+        <carbon.identity.version>5.0.2</carbon.identity.version>
 
         <!-- Carbon Multi-tenancy -->
-        <carbon.multitenancy.version>4.5.0-m1</carbon.multitenancy.version>
+        <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
         <carbon.registry.version>4.4.8</carbon.registry.version>
@@ -899,10 +875,10 @@
         <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
 
         <!-- carbon mediation -->
-        <carbon.mediation.version>4.4.11-SNAPSHOT</carbon.mediation.version>
+        <carbon.mediation.version>4.4.11</carbon.mediation.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
+        <carbon.api.mgt.version>4.3.0</carbon.api.mgt.version>
 
         <!-- Tomcat -->
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>