diff --git a/modules/p2-profile-gen/carbon.product b/modules/p2-profile-gen/carbon.product
index a5166f4..96ef3ca 100755
--- a/modules/p2-profile-gen/carbon.product
+++ b/modules/p2-profile-gen/carbon.product
@@ -2,7 +2,7 @@
 <?pde version="3.5"?>
 
 <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
-version="5.1.0" useFeatures="true" includeLaunchers="true">
+version="5.2.0.SNAPSHOT" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,7 +14,7 @@ version="5.1.0" useFeatures="true" includeLaunchers="true">
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.4.3"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.9"/>
    </features>
 
   <configurations>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 1c8f634..aa90869 100755
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.wso2telco.product.ids</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.3.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -95,22 +95,66 @@
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
-				
-				<featureArtifactDef>com.wso2telco.core:com.wso2telco.core.dbutils.feature:${com.wso2telco.core.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.core:com.wso2telco.core.mncresolver.feature:${com.wso2telco.core.version}</featureArtifactDef>
-
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.sign.ui.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.portal.ui.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.dashboard.ui.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.authenticateselector.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.authenticationendpoint.ui.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.gsmaauthenticator.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.openidtokenbuilder.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.operatorproxyservice.ui.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.sessionupdater.ui.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.urlshorten.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.userclaimretriever.feature:${com.wso2telco.ids.version}</featureArtifactDef>
-				<featureArtifactDef>com.wso2telco.ids:com.wso2telco.ids.userregistration.ui.feature:${com.wso2telco.ids.version}</featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.core:com.wso2telco.core.pcrservice.feature:${com.wso2telco.core.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.core:com.wso2telco.core.dbutils.feature:${com.wso2telco.core.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.core:com.wso2telco.core.mncresolver.feature:${com.wso2telco.core.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.core:com.wso2telco.core.config.feature:${com.wso2telco.core.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.core:com.wso2telco.core.spconfig.feature:${com.wso2telco.core.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.sign.ui.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.portal.ui.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.dashboard.ui.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.authenticateselector.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.authenticationendpoint.ui.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.gsmaauthenticator.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.datapublisher.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.openidtokenbuilder.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.authproxyservice.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.sessionupdater.ui.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.saaserver.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.urlshorten.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.userclaimretriever.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.datapublisher.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.tokenintrospection.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
 
 
                                 <!--jaggery features-->
@@ -150,9 +194,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.commons:org.wso2.carbon.databridge.datapublisher.feature:${carbon.commons.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
                                 </featureArtifactDef>
@@ -160,10 +201,19 @@
                                     org.wso2.carbon.commons:org.wso2.carbon.soaptracer.feature:${carbon.commons.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.datapublisher.feature:${carbon.analytics-common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.aggregate.feature:${carbon.analytics-common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.security.mgt.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.sts.feature:${identity.inbound.auth.sts.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.sts.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.mex.server.feature:${identity.inbound.auth.sts.version}
                                 </featureArtifactDef>
 
                                 <!-- registry related features -->
@@ -184,87 +234,76 @@
                                 </featureArtifactDef>
                                 <!-- Directory server related features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.directory.service.mgr.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.directory.service.mgr.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <!-- identity related features -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.core.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${identity.inbound.auth.openid.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.idp.mgt.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.mgt.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.registration.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.profile.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.profile.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.xacml.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.claim.mgt.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${identity.inbound.auth.saml.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.identity.version}
-                                </featureArtifactDef>
-                                <!-- Authenticators -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${carbon.identity.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${carbon.identity.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${carbon.identity.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.samlsso.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.oidc.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.data.publisher.application.authentication.server.feature:${identity.data.publisher.authentication.version}
                                 </featureArtifactDef>
+                                <!-- Authenticators -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.social.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${identity.outbound.auth.requestpath.basicauth.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.fido.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${identity.outbound.auth.requestpath.oauth.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.openid.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${identity.local.auth.basicauth.version}
                                 </featureArtifactDef>
+
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.iwa.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.fido.server.feature:${identity.local.auth.fido.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.passive.sts.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.iwa.server.feature:${identity.local.auth.iwa.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${identity.carbon.auth.saml2.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.feature:${identity.user.ws.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
@@ -275,27 +314,30 @@
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${identity.inbound.auth.oauth.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.iwa.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.iwa.feature:${identity.carbon.auth.iwa.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.sts.passive.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.sts.passive.feature:${identity.inbound.auth.sts.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.sts.mgt.feature:${identity.inbound.auth.sts.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.sts.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.ldap.server.feature:${identity.userstore.ldap.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.ldap.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.store.remote.feature:${identity.userstore.remote.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.scim.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.scim.feature:${identity.inbound.provisioning.scim.version}
                                 </featureArtifactDef>
                                 <!-- Features related to Cloud Identity -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.user.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.user.mgt.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version}
@@ -327,35 +369,41 @@
 
                                 <!-- Identity Provisioning Feature -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.provisioning.server.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.connector.salesforce.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.connector.salesforce.server.feature:${identity.outbound.provisioning.salesforce.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.connector.spml.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.connector.spml.server.feature:${identity.outbound.provisioning.spml.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.connector.google.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.connector.google.server.feature:${identity.outbound.provisioning.google.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.connector.scim.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provisioning.connector.scim.server.feature:${identity.outbound.provisioning.scim.version}
                                 </featureArtifactDef>
                                 <!-- SAML Request/Response Validator Toolkit Feature -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.tools.saml.validator.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.tool.validator.sso.saml2:org.wso2.carbon.identity.tools.saml.validator.feature:${identity.tool.samlsso.validator.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.notification.mgt.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.notification.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.notification.mgt.json.feature:${identity.notification.json.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.notification.mgt.email.feature:${identity.notification.email.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.version}
                                 </featureArtifactDef>
                                 <!-- User Account Association Feature -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.account.association.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.account.association.feature:${identity.user.account.association.version}
                                 </featureArtifactDef>
                                 <!-- Cipher tool feature -->
                                 <featureArtifactDef>
@@ -367,10 +415,19 @@
 
                                 <!-- Workflow mgt Feature -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.workflow.mgt.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.workflow.mgt.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+<!--                                <featureArtifactDef>-->
+<!--                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.workflow.mgt.stub:${carbon.identity.framework.version}-->
+<!--                                </featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.user.mgt.workflow.feature:${identity.user.workflow.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.workflow.impl.feature:${identity.workflow.impl.bps.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.user.mgt.workflow.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.workflow.template.server.feature:${identity.workflow.template.multisteps.version}
                                 </featureArtifactDef>
 
                                 <!--BPEL and HumanTask features -->
@@ -392,6 +449,12 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics-common.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.sms.server.feature:${carbon.analytics-common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.email.server.feature:${carbon.analytics-common.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
@@ -403,7 +466,6 @@
                     </execution>
 
 
-
                     <!-- Default Profile (IS Front-End + IS Back-End) -->
                     <execution>
                         <id>3-p2-profile-generation</id>
@@ -421,7 +483,7 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
- 				 <feature>
+                                <feature>
                                     <id>org.jaggeryjs.server.feature.group</id>
                                     <version>${jaggeryjs.version}</version>
                                 </feature>
@@ -490,11 +552,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.publisher.aggregate.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ldap.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.userstore.ldap.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.store.remote.feature.group</id>
+                                    <version>${identity.userstore.remote.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.system.statistics.feature.group</id>
@@ -506,11 +576,11 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.security.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.sts.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.registry.core.feature.group</id>
@@ -530,59 +600,59 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.core.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.openid.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.idp.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.registration.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.profile.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.xacml.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.saml.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.claim.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.saml2.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.mutualssl.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.mutual.ssl.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.um.ws.service.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.ws.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.directory.service.mgr.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.identity.styles.feature.group</id>
@@ -590,11 +660,11 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sts.passive.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sts.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.identity.utils.feature.group</id>
@@ -602,15 +672,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.oauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.iwa.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.iwa.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.scim.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.provisioning.scim.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mex.server.feature.group</id>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
 
                                 <!-- Features required for Cloud Identity -->
@@ -632,7 +706,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.event.server.feature.group</id>
@@ -643,100 +717,90 @@
                                     <version>${carbon.commons.version}</version>
                                 </feature>
 
+
+
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.application.authentication.framework.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
+                                        org.wso2.carbon.identity.data.publisher.application.authentication.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.data.publisher.authentication.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>
-                                        org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
+                                        org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.basicauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group
+                                        org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.auth.requestpath.basicauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.passive.sts.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.oidc.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.social.server.feature.group
+                                        org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.auth.requestpath.oauth.version}</version>
                                 </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.fido.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.fido.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.spml.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.spml.version}</version>
                                 </feature>
 
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.google.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.google.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.provisioning.connector.salesforce.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.salesforce.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.scim.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.tools.saml.validator.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.scim.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.openid.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <id>org.wso2.carbon.identity.tool.validator.sso.saml2</id>
+                                    <version>${identity.tool.samlsso.validator.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.iwa.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.iwa.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.notification.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.json.feature.group</id>
+                                    <version>${identity.notification.json.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.email.feature.group</id>
+                                    <version>${identity.notification.email.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.axis2.transport.mail.feature.group</id>
@@ -744,11 +808,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.account.association.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.account.association.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.workflow.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.workflow.impl.feature.group</id>
+                                    <version>${identity.workflow.impl.bps.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.workflow.template.server.feature.group</id>
+                                    <version>${identity.workflow.template.multisteps.version}</version>
                                 </feature>
 
                                 <feature>
@@ -757,7 +829,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.workflow.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.workflow.version}</version>
                                 </feature>
 
                                 <!--BPEL and HumanTask features -->
@@ -785,6 +857,14 @@
                                     <id>org.wso2.carbon.event.output.adapter.server.feature.group</id>
                                     <version>${carbon.analytics-common.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.output.adapter.sms.server.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.output.adapter.email.server.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.module.mgt.server.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
@@ -794,73 +874,97 @@
                                     <version>${carbon.metrics.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
                                 </feature>
 
-
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.core.config.feature.group</id>
+                                    <version>${com.wso2telco.core.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>com.wso2telco.core.spconfig.feature.group</id>
+                                    <version>${com.wso2telco.core.version}</version>
+                                </feature>
+                                <feature>
                                     <id>com.wso2telco.core.mncresolver.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.sign.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
-                                </feature>	
+                                </feature>
 
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.portal.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
-                                </feature>	
-				<feature>
+                                </feature>
+                                <feature>
                                     <id>com.wso2telco.ids.dashboard.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.authenticateselector.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.authenticationendpoint.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.gsmaauthenticator.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.datapublisher.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
                                     <id>com.wso2telco.ids.openidtokenbuilder.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
-                                    <id>com.wso2telco.ids.operatorproxyservice.ui.feature.group</id>
+                                <feature>
+                                    <id>com.wso2telco.ids.authproxyservice.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.saaserver.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.urlshorten.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.userclaimretriever.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-				<feature>
-                                    <id>com.wso2telco.ids.userregistration.ui.feature.group</id>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.datapublisher.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.tokenintrospection.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
+
+
                             </features>
                         </configuration>
                     </execution>
@@ -883,9 +987,6 @@
                     </execution>
 
 
-
-
-
                     <!-- Only IS Profile (IS Front-End + IS Back-End) -->
                     <execution>
                         <id>creating-is-profile</id>
@@ -920,75 +1021,97 @@
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
 
-<feature>
+                                <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
                                 </feature>
-
-
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.core.config.feature.group</id>
+                                    <version>${com.wso2telco.core.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>com.wso2telco.core.spconfig.feature.group</id>
+                                    <version>${com.wso2telco.core.version}</version>
+                                </feature>
+                                <feature>
                                     <id>com.wso2telco.core.mncresolver.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.sign.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
-                                </feature>	
+                                </feature>
 
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.portal.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
-                                </feature>	
-				<feature>
+                                </feature>
+                                <feature>
                                     <id>com.wso2telco.ids.dashboard.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.authenticateselector.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.authenticationendpoint.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.gsmaauthenticator.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.datapublisher.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
                                     <id>com.wso2telco.ids.openidtokenbuilder.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
-                                    <id>com.wso2telco.ids.operatorproxyservice.ui.feature.group</id>
+                                <feature>
+                                    <id>com.wso2telco.ids.authproxyservice.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.saaserver.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
                                     <id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.urlshorten.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.userclaimretriever.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-				<feature>
-                                    <id>com.wso2telco.ids.userregistration.ui.feature.group</id>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.datapublisher.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.tokenintrospection.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>org.jaggeryjs.server.feature.group</id>
                                     <version>${jaggeryjs.version}</version>
                                 </feature>
@@ -1057,11 +1180,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.publisher.aggregate.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ldap.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.userstore.ldap.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.store.remote.feature.group</id>
+                                    <version>${identity.userstore.remote.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.system.statistics.feature.group</id>
@@ -1073,11 +1204,11 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.security.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.sts.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.registry.core.feature.group</id>
@@ -1097,59 +1228,59 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.core.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.openid.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.idp.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.registration.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.profile.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.xacml.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.saml.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.claim.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.saml2.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.mutualssl.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.mutual.ssl.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.um.ws.service.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.ws.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.directory.service.mgr.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.identity.styles.feature.group</id>
@@ -1157,11 +1288,11 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sts.passive.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sts.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.identity.utils.feature.group</id>
@@ -1169,15 +1300,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.oauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.iwa.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.iwa.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.scim.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.provisioning.scim.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mex.server.feature.group</id>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
 
                                 <!-- Features required for Cloud Identity -->
@@ -1199,7 +1334,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.event.server.feature.group</id>
@@ -1214,96 +1349,83 @@
                                     <id>
                                         org.wso2.carbon.identity.application.authentication.framework.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.basicauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>
-                                        org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
+                                        org.wso2.carbon.identity.data.publisher.application.authentication.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.data.publisher.authentication.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group
+                                        org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.auth.requestpath.basicauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.passive.sts.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.oidc.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.social.server.feature.group
+                                        org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.auth.requestpath.oauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.fido.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.fido.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.spml.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.spml.version}</version>
                                 </feature>
 
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.google.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.google.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.provisioning.connector.salesforce.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.salesforce.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.scim.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.tools.saml.validator.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.scim.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.openid.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <id>org.wso2.carbon.identity.tool.validator.sso.saml2</id>
+                                    <version>${identity.tool.samlsso.validator.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.iwa.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.iwa.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.notification.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.json.feature.group</id>
+                                    <version>${identity.notification.json.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.email.feature.group</id>
+                                    <version>${identity.notification.email.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.axis2.transport.mail.feature.group</id>
@@ -1311,11 +1433,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.account.association.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.account.association.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.workflow.mgt.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.workflow.impl.feature.group</id>
+                                    <version>${identity.workflow.impl.bps.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.workflow.template.server.feature.group</id>
+                                    <version>${identity.workflow.template.multisteps.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.ciphertool.feature.group</id>
@@ -1327,13 +1457,13 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.workflow.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.workflow.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.metrics.feature.group</id>
                                     <version>${carbon.metrics.version}</version>
                                 </feature>
-                            
+
                             </features>
                         </configuration>
                     </execution>
@@ -1372,71 +1502,91 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
-<feature>
+                                <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
                                 </feature>
-
-
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.core.config.feature.group</id>
+                                    <version>${com.wso2telco.core.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>com.wso2telco.core.spconfig.feature.group</id>
+                                    <version>${com.wso2telco.core.version}</version>
+                                </feature>
+                                <feature>
                                     <id>com.wso2telco.core.mncresolver.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.sign.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
-                                </feature>	
+                                </feature>
 
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.portal.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
-                                </feature>	
-				<feature>
+                                </feature>
+                                <feature>
                                     <id>com.wso2telco.ids.dashboard.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.authenticateselector.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.authenticationendpoint.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.gsmaauthenticator.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.datapublisher.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
                                     <id>com.wso2telco.ids.openidtokenbuilder.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
-                                    <id>com.wso2telco.ids.operatorproxyservice.ui.feature.group</id>
+                                <feature>
+                                    <id>com.wso2telco.ids.authproxyservice.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.saaserver.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
                                     <id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.urlshorten.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.userclaimretriever.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-				<feature>
-                                    <id>com.wso2telco.ids.userregistration.ui.feature.group</id>
+                                <feature>
+                                    <id>com.wso2telco.ids.datapublisher.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.tokenintrospection.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
                                 <feature>
@@ -1508,11 +1658,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.publisher.aggregate.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ldap.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.userstore.ldap.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.store.remote.feature.group</id>
+                                    <version>${identity.userstore.remote.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.system.statistics.server.feature.group</id>
@@ -1524,11 +1682,11 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.security.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.sts.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.registry.core.server.feature.group</id>
@@ -1544,67 +1702,67 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.core.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.openid.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.idp.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.profile.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sso.saml.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.saml.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.claim.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.saml2.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.mutualssl.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.mutual.ssl.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.ws.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.directory.service.mgr.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sts.passive.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.sts.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.sts.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.identity.utils.feature.group</id>
@@ -1612,15 +1770,15 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.auth.oauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.iwa.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.carbon.auth.iwa.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.scim.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.inbound.provisioning.scim.version}</version>
                                 </feature>
 
                                 <!-- Features required for Cloud Identity -->
@@ -1638,7 +1796,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.event.server.feature.group</id>
@@ -1653,96 +1811,84 @@
                                     <id>
                                         org.wso2.carbon.identity.application.authentication.framework.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
+                                        org.wso2.carbon.identity.data.publisher.application.authentication.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.data.publisher.authentication.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>
-                                        org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
+                                        org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.basicauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group
+                                        org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.auth.requestpath.basicauth.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
-                                        org.wso2.carbon.identity.application.authenticator.passive.sts.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.oidc.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.social.server.feature.group
+                                        org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.auth.requestpath.oauth.version}</version>
                                 </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.fido.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.fido.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.spml.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.spml.version}</version>
                                 </feature>
 
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.google.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.google.version}</version>
                                 </feature>
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.provisioning.connector.salesforce.server.feature.group
                                     </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.salesforce.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provisioning.connector.scim.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.outbound.provisioning.scim.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.tools.saml.validator.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.application.authenticator.openid.server.feature.group
-                                    </id>
-                                    <version>${carbon.identity.version}</version>
+                                    <id>org.wso2.carbon.identity.tool.validator.sso.saml2</id>
+                                    <version>${identity.tool.samlsso.validator.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.iwa.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.local.auth.iwa.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.notification.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.email.feature.group</id>
+                                    <version>${identity.notification.email.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.json.feature.group</id>
+                                    <version>${identity.notification.json.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.axis2.transport.mail.feature.group</id>
@@ -1750,11 +1896,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.account.association.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.account.association.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.workflow.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.workflow.impl.feature.group</id>
+                                    <version>${identity.workflow.impl.bps.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.workflow.template.server.feature.group</id>
+                                    <version>${identity.workflow.template.multisteps.version}</version>
                                 </feature>
 
                                 <feature>
@@ -1763,7 +1917,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.workflow.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.user.workflow.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.metrics.server.feature.group</id>
@@ -1811,71 +1965,91 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
-<feature>
+                                <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
                                 </feature>
-
-
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.core.config.feature.group</id>
+                                    <version>${com.wso2telco.core.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>com.wso2telco.core.spconfig.feature.group</id>
+                                    <version>${com.wso2telco.core.version}</version>
+                                </feature>
+                                <feature>
                                     <id>com.wso2telco.core.mncresolver.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.sign.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
-                                </feature>	
+                                </feature>
 
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.portal.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
-                                </feature>	
-				<feature>
+                                </feature>
+                                <feature>
                                     <id>com.wso2telco.ids.dashboard.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.authenticateselector.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.authenticationendpoint.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.gsmaauthenticator.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.datapublisher.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
                                     <id>com.wso2telco.ids.openidtokenbuilder.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
-                                    <id>com.wso2telco.ids.operatorproxyservice.ui.feature.group</id>
+                                <feature>
+                                    <id>com.wso2telco.ids.authproxyservice.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.saaserver.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.urlshorten.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
-				<feature>
+                                <feature>
                                     <id>com.wso2telco.ids.userclaimretriever.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-				<feature>
-                                    <id>com.wso2telco.ids.userregistration.ui.feature.group</id>
+                                <feature>
+                                    <id>com.wso2telco.ids.datapublisher.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.tokenintrospection.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
                                 <!-- 1 Carbon Kernel -->
@@ -1963,22 +2137,6 @@
                                     <id>org.wso2.carbon.logging.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.databridge.agent.thrift.server.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.databridge.commons.server.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.system.statistics.server.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2007,23 +2165,52 @@
                                 <!-- 8 Carbon Identity -->
                                 <feature>
                                     <id>org.wso2.carbon.security.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ldap.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
+                                    <version>${identity.userstore.ldap.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.store.remote.feature.group</id>
+                                    <version>${identity.userstore.remote.version}</version>
                                 </feature>
 
 
-                                <!-- 10 Carbon Analytics Common -->
+                                <!-- 6 Carbon Analytics Common -->
                                 <feature>
                                     <id>org.wso2.carbon.event.output.adapter.server.feature.group</id>
                                     <version>${carbon.analytics-common.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.output.adapter.sms.server.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.output.adapter.email.server.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.publisher.aggregate.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.commons.server.feature.group</id>
+                                    <version>${carbon.analytics-common.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
                                     <version>${carbon.registry.version}</version>
diff --git a/pom.xml b/pom.xml
index 7d4a5c8..aaef952 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,12 +28,17 @@
     <artifactId>identity-server-parent</artifactId>
     <packaging>pom</packaging>
     <description>WSO2 Identity Server</description>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.3.0</version>
     <name>WSO2Telco Identity Server</name>
     <url>http://wso2.org/projects/identity</url>
 
     <modules>
+        <module>modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client</module>
+        <module>modules/features</module>
         <module>modules/p2-profile-gen</module>
+        <module>modules/connectors</module>
+        <module>modules/authenticators</module>
+        <module>modules/social-authenticators</module>
         <module>modules/distribution</module>
         <module>modules/styles</module>
         <!--module>modules/samples</module>
@@ -255,6 +260,12 @@
             <email>indunil AT wso2.com</email>
             <organization>WSO2</organization>
         </developer>
+        <developer>
+            <name>Hasanthi Dissanayake</name>
+            <id>hasanthi</id>
+            <email>hasanthi AT wso2.com</email>
+            <organization>WSO2</organization>
+        </developer>
         <developer>
             <name>Maduranga Siriwardena</name>
             <id>maduranga</id>
@@ -285,9 +296,53 @@
             <email>damiths AT wso2.com</email>
             <organization>WSO2</organization>
         </developer>
+        <developer>
+            <name>Jayanga Kaushalya</name>
+            <id>jayangak</id>
+            <email>jayangak AT wso2.com</email>
+            <organization>WSO2</organization>
+        </developer>
     </developers>
 
 
+    <!--<pluginRepositories>-->
+        <!--<pluginRepository>-->
+            <!--<id>wso2-maven2-repository</id>-->
+            <!--<url>http://dist.wso2.org/maven2</url>-->
+        <!--</pluginRepository>-->
+        <!--<pluginRepository>-->
+            <!--<id>wso2.releases</id>-->
+            <!--<name>WSO2 internal Repository</name>-->
+            <!--<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>-->
+            <!--<releases>-->
+                <!--<enabled>true</enabled>-->
+                <!--<updatePolicy>daily</updatePolicy>-->
+                <!--<checksumPolicy>ignore</checksumPolicy>-->
+            <!--</releases>-->
+        <!--</pluginRepository>-->
+        <!--<pluginRepository>-->
+            <!--<id>wso2.snapshots</id>-->
+            <!--<name>Apache Snapshot Repository</name>-->
+            <!--<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>-->
+            <!--<snapshots>-->
+                <!--<enabled>true</enabled>-->
+                <!--<updatePolicy>daily</updatePolicy>-->
+            <!--</snapshots>-->
+            <!--<releases>-->
+                <!--<enabled>false</enabled>-->
+            <!--</releases>-->
+        <!--</pluginRepository>-->
+        <!--<pluginRepository>-->
+            <!--<id>wso2-nexus</id>-->
+            <!--<name>WSO2 internal Repository</name>-->
+            <!--<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>-->
+            <!--<releases>-->
+                <!--<enabled>true</enabled>-->
+                <!--<updatePolicy>daily</updatePolicy>-->
+                <!--<checksumPolicy>ignore</checksumPolicy>-->
+            <!--</releases>-->
+        <!--</pluginRepository>-->
+    <!--</pluginRepositories>-->
 
     <build>
         <plugins>
@@ -297,6 +352,7 @@
                 <configuration>
                     <preparationGoals>clean install</preparationGoals>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
+ 		    <arguments>-Dmaven.javadoc.skip=true</arguments>
                 </configuration>
             </plugin>
             <plugin>
@@ -378,6 +434,12 @@
 
     <dependencyManagement>
         <dependencies>
+         <dependency>
+              <groupId>org.wso2.carbon.identity.tool.validator.sso.saml2</groupId>
+              <artifactId>org.wso2.carbon.identity.tools.saml.validator.feature</artifactId>
+              <version>${identity.tool.samlsso.validator.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ui</artifactId>
@@ -489,9 +551,9 @@
                 <version>${axiom.wso2.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.core</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -511,14 +573,14 @@
                 <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.oauth</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.inbound.auth.oauth.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.inbound.auth.oauth.version}</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -612,20 +674,25 @@
                 <version>${xml.apis.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.sso.agent</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.agent.sso.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.neethi.wso2</groupId>
+                <groupId>org.wso2.orbit.org.apache.neethi</groupId>
                 <artifactId>neethi</artifactId>
                 <version>${neethi.wso2.version}</version>
             </dependency>
             <dependency>
-                <groupId>opensaml.wso2</groupId>
-                <artifactId>opensaml2</artifactId>
+                <groupId>org.wso2.orbit.org.opensaml</groupId>
+                <artifactId>opensaml</artifactId>
                 <version>${opensaml2.wso2.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.orbit.joda-time</groupId>
+                <artifactId>joda-time</artifactId>
+                <version>${joda.wso2.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.addressing</artifactId>
@@ -651,35 +718,30 @@
                 <artifactId>wss4j</artifactId>
                 <version>${wss4j.wso2.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.rampart</groupId>
-                <artifactId>rampart-trust</artifactId>
-                <version>${rampart.wso2.version.1}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents.wso2</groupId>
                 <artifactId>httpcore</artifactId>
                 <version>${httpcore.wso2.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.um.ws.api.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.user.ws.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.um.ws.api</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.user.ws.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.authenticator.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.entitlement.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.securevault</groupId>
@@ -724,14 +786,14 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.user.mgt.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.sts.passive.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.inbound.auth.sts.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -756,15 +818,15 @@
                 <version>${rampart.wso2.version.1}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.idp.mgt.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
@@ -780,15 +842,21 @@
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.scim.common.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.inbound.provisioning.scim.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.user.store.configuration.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.user.store.count.stub</artifactId>
+                <version>${carbon.identity.framework.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
@@ -798,33 +866,33 @@
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.mgt.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.sso.saml.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.inbound.auth.saml.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.claim.mgt.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.provider.openid.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.inbound.auth.openid.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.user.account.association.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.user.account.association.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.deployment</groupId>
@@ -926,24 +994,24 @@
                 <version>${commons-codec.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.user.registration.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.user.profile.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.workflow.mgt.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
             </dependency>
 	    <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.workflow.impl.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.workflow.impl.bps.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.jacoco</groupId>
@@ -1003,105 +1071,244 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${carbon.identity.framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
                 <version>${xercesImpl.version}</version>
             </dependency>
- 	   <dependency>
-                  <groupId>com.wso2telco.core</groupId>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.workflow.mgt</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons.codec.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.schema.wso2</groupId>
+                <artifactId>XmlSchema</artifactId>
+                <version>${XmlSchema.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>wsdl4j.wso2</groupId>
+                <artifactId>wsdl4j</artifactId>
+                <version>${wsdl4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.analytics-common</groupId>
+                <artifactId>org.wso2.carbon.databridge.commons</artifactId>
+                <version>${carbon.analytics-common.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.analytics-common</groupId>
+                <artifactId>org.wso2.carbon.databridge.core</artifactId>
+                <version>${carbon.analytics-common.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.analytics-common</groupId>
+                <artifactId>org.wso2.carbon.databridge.receiver.thrift</artifactId>
+                <version>${carbon.analytics-common.version}</version>
+            </dependency>
+
+            <!-- Telco dependencies-->
+            <dependency>
+                <groupId>com.wso2telco.core</groupId>
                 <artifactId>com.wso2telco.core.dbutils.feature</artifactId>
                 <version>${com.wso2telco.core.version}</version>
             </dependency>
-
-
-  <dependency>
-                  <groupId>com.wso2telco.core</groupId>
+            <dependency>
+                <groupId>com.wso2telco.core</groupId>
+                <artifactId>com.wso2telco.core.config.feature</artifactId>
+                <version>${com.wso2telco.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.wso2telco.core</groupId>
+                <artifactId>com.wso2telco.core.spconfig.feature</artifactId>
+                <version>${com.wso2telco.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.wso2telco.core</groupId>
                 <artifactId>com.wso2telco.core.mncresolver.feature</artifactId>
                 <version>${com.wso2telco.core.version}</version>
             </dependency>
-
-
-
-  <dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.sign.ui.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-
-
-
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.portal.ui.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-
-
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.dashboard.ui.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-
-
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.authenticateselector.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-
-
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.authenticationendpoint.ui.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-
-
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.gsmaauthenticator.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
-                <artifactId>om.wso2telco.ids.openidtokenbuilder.feature</artifactId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
+                <artifactId>com.wso2telco.ids.datapublisher.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
-                <artifactId>com.wso2telco.ids.operatorproxyservice.ui.feature</artifactId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
+                <artifactId>com.wso2telco.ids.openidtokenbuilder.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
+                <artifactId>com.wso2telco.ids.authproxyservice.feature</artifactId>
+                <version>${com.wso2telco.ids.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.sessionupdater.ui.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
- <dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.urlshorten.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.userclaimretriever.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
-<dependency>
-                  <groupId>com.wso2telco.ids</groupId>
-                <artifactId>com.wso2telco.ids.userregistration.ui.feature</artifactId>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
+                <artifactId>om.wso2telco.ids.datapublisher.feature</artifactId>
+                <version>${com.wso2telco.ids.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
+                <artifactId>com.wso2telco.ids.saaserver.feature</artifactId>
+                <version>${com.wso2telco.ids.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
+                <artifactId>com.wso2telco.ids.tokenintrospection</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
 
+            <!--custom webapps' runtime environment dependencies -->
+            <dependency>
+                <groupId>dom4j</groupId>
+                <artifactId>dom4j</artifactId>
+                <version>${dom4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons-logging.version.1.1.1}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                <version>${javax.servelet.jstl.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <type>jar</type>
+                <version>${com.google.code.gson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpasyncclient</artifactId>
+                <version>${httpasyncclient.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <type>jar</type>
+                <version>${httpclient.version.4.3.1}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.ibm.icu</groupId>
+                <artifactId>icu4j</artifactId>
+                <version>${com.ibm.icu.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-json</artifactId>
+                <version>${com.sun.jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-client</artifactId>
+                <version>${com.sun.jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-server</artifactId>
+                <version>${com.sun.jersey.server.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+                <version>${com.sun.jersey.server.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-servlet</artifactId>
+                <version>${com.sun.jersey.server.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+
+            <!--repository/components/lib jars-->
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore-nio</artifactId>
+                <version>${http.core.nio.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${http.client.version.4.0}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jettison</groupId>
+                <artifactId>jettison</artifactId>
+                <version>${jettison.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hashids</groupId>
+                <artifactId>hashids</artifactId>
+                <version>${hash.ids.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -1165,29 +1372,73 @@
     </profiles>
 
     <properties>
-       <com.wso2telco.ids.version>2.0.13</com.wso2telco.ids.version>
-	<com.wso2telco.core.version>2.0.02</com.wso2telco.core.version>
-        <carbon.identity.version>5.0.7</carbon.identity.version>
-        <carbon.identity.jar.version>5.0.7</carbon.identity.jar.version>
-        <product.identity.version>5.1.0</product.identity.version>
+
+        <!-- Telco dependency's version-->
+        <com.wso2telco.ids.version>2.3.0</com.wso2telco.ids.version>
+        <com.wso2telco.core.version>2.3.2</com.wso2telco.core.version>
+
+        <!--Carbon Identity Framework Version-->
+        <carbon.identity.framework.version>5.11.256</carbon.identity.framework.version>
+
+        <!--Identity Repo Versions-->
+        <identity.local.auth.basicauth.version>5.1.2</identity.local.auth.basicauth.version>
+        <identity.carbon.auth.saml2.version>5.1.4</identity.carbon.auth.saml2.version>
+        <identity.inbound.auth.saml.version>5.1.2</identity.inbound.auth.saml.version>
+        <identity.inbound.auth.oauth.version>5.1.3</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version>
+        <identity.agent.sso.version>5.1.2</identity.agent.sso.version>
+        <identity.inbound.auth.sts.version>5.1.2</identity.inbound.auth.sts.version>
+        <identity.local.auth.fido.version>5.1.2</identity.local.auth.fido.version>
+        <identity.outbound.auth.requestpath.basicauth.version>5.1.2</identity.outbound.auth.requestpath.basicauth.version>
+        <identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version>
+        <identity.notification.email.version>5.1.1</identity.notification.email.version>
+        <identity.notification.json.version>5.1.1</identity.notification.json.version>
+        <identity.outbound.provisioning.google.version>5.1.1</identity.outbound.provisioning.google.version>
+        <identity.outbound.provisioning.salesforce.version>5.1.1</identity.outbound.provisioning.salesforce.version>
+        <identity.outbound.provisioning.spml.version>5.1.1</identity.outbound.provisioning.spml.version>
+        <identity.user.account.association.version>5.1.1</identity.user.account.association.version>
+        <identity.user.workflow.version>5.1.1</identity.user.workflow.version>
+        <identity.user.ws.version>5.1.2</identity.user.ws.version>
+        <identity.userstore.ldap.version>5.1.1</identity.userstore.ldap.version>
+        <identity.userstore.remote.version>5.1.1</identity.userstore.remote.version>
+        <identity.workflow.impl.bps.version>5.1.2</identity.workflow.impl.bps.version>
+        <identity.local.auth.iwa.version>5.1.2</identity.local.auth.iwa.version>
+        <identity.carbon.auth.iwa.version>5.1.2</identity.carbon.auth.iwa.version>
+        <identity.workflow.template.multisteps.version>5.1.1</identity.workflow.template.multisteps.version>
+        <identity.outbound.auth.requestpath.oauth.version>5.1.2</identity.outbound.auth.requestpath.oauth.version>
+        <identity.inbound.provisioning.scim.version>5.1.2</identity.inbound.provisioning.scim.version>
+        <identity.outbound.provisioning.scim.version>5.1.1</identity.outbound.provisioning.scim.version>
+        <identity.tool.samlsso.validator.version>5.1.6</identity.tool.samlsso.validator.version>
+        <identity.data.publisher.authentication.version>5.1.2</identity.data.publisher.authentication.version>
+        <identity.carbon.auth.thrift.version>5.1.1</identity.carbon.auth.thrift.version>
+        <identity.application.auth.oidc.version>5.1.2</identity.application.auth.oidc.version>
+        <!--<identity.agent.entitlement.proxy.version>5.1.1</identity.agent.entitlement.proxy.version>-->
+        <!--<identity.carbon.auth.signedjwt.version>5.1.1</identity.carbon.auth.signedjwt.version>-->
+        <!--<identity.userstore.cassandra.version>5.1.1</identity.userstore.cassandra.version>-->
+        <!--<identity.agent-entitlement-filter.version>5.1.1</identity.agent-entitlement-filter.version>-->
+        <!--Identity Repo Versions End-->
+
+        <product.identity.version>5.2.0</product.identity.version>
         <bcprov.jdk13.version>140</bcprov.jdk13.version>
         <bcprov.jdk15.version>132</bcprov.jdk15.version>
         <sevlet.api.version>2.5</sevlet.api.version>
-        <neethi.wso2.version>2.0.4.wso2v3</neethi.wso2.version>
+        <neethi.wso2.version>2.0.4.wso2v5</neethi.wso2.version>
         <axiom.impl.version>1.2.12</axiom.impl.version>
         <axiom.version>1.2.11-wso2v6</axiom.version>
         <gdata.core.wso2.version>1.47.0.wso2v1</gdata.core.wso2.version>
         <json.simple.version>1.1</json.simple.version>
         <openid4java.consumer.version>1.0.0</openid4java.consumer.version>
-        <opensaml.version>2.4.1</opensaml.version>
-        <opensaml2.wso2.version>2.4.1.wso2v1</opensaml2.wso2.version>
-        <wss4j.wso2.version>1.5.11.wso2v11</wss4j.wso2.version>
-        <openws.version>1.4.1</openws.version>
-        <charon.version>2.0.4</charon.version>
+        <opensaml.version>2.6.4</opensaml.version>
+        <opensaml2.wso2.version>2.6.4.wso2v3</opensaml2.wso2.version>
+        <joda.version>2.9.4</joda.version>
+        <joda.wso2.version>2.9.4.wso2v1</joda.wso2.version>
+        <wss4j.wso2.version>1.5.11.wso2v17</wss4j.wso2.version>
+        <openws.version>1.5.4</openws.version>
+        <charon.version>2.1.5</charon.version>
         <xalan.version>2.7.1</xalan.version>
         <xalan.wso2.version>2.7.0.wso2v1</xalan.wso2.version>
-        <rampart.wso2.version>1.6.1.wso2v16</rampart.wso2.version>
-        <rampart.wso2.version.1>1.6.1-wso2v16</rampart.wso2.version.1>
+        <rampart.wso2.version>1.6.1-wso2v26</rampart.wso2.version>
+        <rampart.wso2.version.1>1.6.1-wso2v26</rampart.wso2.version.1>
         <orbit.version.commons.httpclient>4.2.5.wso2v1</orbit.version.commons.httpclient>
         <commons.httpclient.version>3.1</commons.httpclient.version>
         <httpcore.wso2.version>4.3.3.wso2v1</httpcore.wso2.version>
@@ -1197,11 +1448,10 @@
         <taglibs.version>1.1.2</taglibs.version>
         <google.collect.wso2.version>1.0.0.wso2v2</google.collect.wso2.version>
         <junit.version>3.8.1</junit.version>
-        <carbon.kernel.version>4.4.3</carbon.kernel.version>
-        <carbon.commons.version>4.4.8</carbon.commons.version>
-        <carbon.dashboards.version>1.0.8</carbon.dashboards.version>
+        <carbon.kernel.version>4.4.32</carbon.kernel.version>
+        <carbon.commons.version>4.5.4</carbon.commons.version>
+        <carbon.dashboards.version>1.0.18</carbon.dashboards.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
-        <orbit.version.axiom>1.2.11.wso2v5</orbit.version.axiom>
         <oauth2.client.version>1.0.0</oauth2.client.version>
         <orbit.version.axis2>1.6.1.wso2v11</orbit.version.axis2>
         <stratos.version.221>2.2.1</stratos.version.221>
@@ -1218,7 +1468,7 @@
         <version.commons.logging>1.1.1</version.commons.logging>
         <commons.lang.version>2.6</commons.lang.version>
         <emma.version>2.1.5320</emma.version>
-        <jaggeryjs.version>0.12.1</jaggeryjs.version>
+        <jaggeryjs.version>0.12.6</jaggeryjs.version>
         <stratos.version>2.2.0</stratos.version>
         <ws.module.version>${jaggery.extensions.version}</ws.module.version>
         <oauth.module.version>${jaggery.extensions.version}</oauth.module.version>
@@ -1233,30 +1483,29 @@
         <gadget.module.version>${jaggery.extensions.version}</gadget.module.version>
         <i18n.module.version>${jaggery.extensions.version}</i18n.module.version>
         <wso2.store.version>2.0.0</wso2.store.version>
-        <test.framework.version>4.4.2</test.framework.version>
         <operadriver.version>0.8.1</operadriver.version>
         <selenium.version>2.40.0</selenium.version>
         <testng.version>6.1.1</testng.version>
-        <carbon.deployment.version>4.5.3</carbon.deployment.version>
-        <carbon.registry.version>4.4.8</carbon.registry.version>
-        <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>
-        <jaggery.extensions.version>1.5.0</jaggery.extensions.version>
+        <carbon.deployment.version>4.7.0</carbon.deployment.version>
+        <carbon.registry.version>4.5.4</carbon.registry.version>
+        <carbon.multitenancy.version>4.6.0</carbon.multitenancy.version>
+        <jaggery.extensions.version>1.5.5</jaggery.extensions.version>
         <axis2.jibx.wso2.version>1.6.1.wso2v11</axis2.jibx.wso2.version>
         <axis2.jaxb.wso2.version>1.6.1.wso2v11</axis2.jaxb.wso2.version>
-        <axiom.wso2.version>1.2.11.wso2v6</axiom.wso2.version>
-        <carbon.automation.version>4.4.1</carbon.automation.version>
+        <axiom.wso2.version>1.2.11.wso2v10</axiom.wso2.version>
+        <carbon.automation.version>4.4.3</carbon.automation.version>
         <carbon.automationutils.version>4.4.1</carbon.automationutils.version>
-        <charon.orbit.version>2.0.4</charon.orbit.version>
+        <charon.orbit.version>2.0.7</charon.orbit.version>
         <apache.wink.version>1.1.3-incubating</apache.wink.version>
         <apache.ws.security.version>1.6.9</apache.ws.security.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <javax.servlet.version>2.5</javax.servlet.version>
         <slf4j.version>1.7.0</slf4j.version>
         <apache.openejb.version>4.5.2</apache.openejb.version>
-        <axis2.client.version>1.6.1.wso2v12</axis2.client.version>
-        <axis2.wso2.version>1.6.1.wso2v12</axis2.wso2.version>
-        <axis2-transports.version>1.1.0-wso2v13</axis2-transports.version>
-        <nimbusds.version>2.26.1</nimbusds.version>
+        <axis2.client.version>1.6.1-wso2v27</axis2.client.version>
+        <axis2.wso2.version>1.6.1-wso2v27</axis2.wso2.version>
+        <axis2-transports.version>2.0.0-wso2v23</axis2-transports.version>
+        <nimbusds.version>5.8.0.wso2v1</nimbusds.version>
         <commons-codec.version>1.4.0.wso2v1</commons-codec.version>
         <h2database.wso2.version>1.2.140.wso2v3</h2database.wso2.version>
         <felix.framework.version>1.0.3</felix.framework.version>
@@ -1266,113 +1515,146 @@
         <equinox.jsp.jasper.version>1.0.1.R33x_v20070816</equinox.jsp.jasper.version>
         <javax.servlet.jsp.version>2.0.0.v200706191603</javax.servlet.jsp.version>
         <cipher-tool.version>1.0.0-wso2v3</cipher-tool.version>
-        <jacoco.agent.version>0.7.4.201502262128</jacoco.agent.version>
+        <jacoco.agent.version>0.7.5.201505241946</jacoco.agent.version>
         <project.scm.id>my-scm-server</project.scm.id>
-        <carbon.business-process.version>4.4.4</carbon.business-process.version>
-	    <carbon.analytics-common.version>1.0.0</carbon.analytics-common.version>
+        <carbon.business-process.version>4.4.9</carbon.business-process.version>
+        <carbon.analytics-common.version>5.1.1</carbon.analytics-common.version>
         <osgi.framework.imp.pkg.version.range>[1.7.0, 2.0.0)</osgi.framework.imp.pkg.version.range>
         <osgi.service.component.imp.pkg.version.range>[1.2.0, 2.0.0)</osgi.service.component.imp.pkg.version.range>
         <org.apache.tomcat.wso2.version>7.0.52.wso2v5</org.apache.tomcat.wso2.version>
         <xmlsec.version>1.4.4</xmlsec.version>
         <xmltooling.version>1.3.1</xmltooling.version>
-        <carbon.metrics.version>1.1.1</carbon.metrics.version>
+        <carbon.metrics.version>1.2.2</carbon.metrics.version>
         <xercesImpl.version>2.8.1</xercesImpl.version>
+        <commons.codec.version>1.8</commons.codec.version>
+        <XmlSchema.version>1.4.7.wso2v3</XmlSchema.version>
+        <wsdl4j.version>1.6.2.wso2v2</wsdl4j.version>
+
+        <!--webapps runtime dependency versions-->
+        <com.google.code.gson.version>2.5</com.google.code.gson.version>
+        <com.atlassian.httpclient.version>0.17.3</com.atlassian.httpclient.version>
+        <httpclient.version.4.3.1>4.3.1</httpclient.version.4.3.1>
+        <com.ibm.icu.version>2.6.1</com.ibm.icu.version>
+        <com.sun.jersey.version>1.8</com.sun.jersey.version>
+        <com.sun.jersey.server.version>1.17.1</com.sun.jersey.server.version>
+        <commons-logging.version.1.2>1.2</commons-logging.version.1.2>
+        <javax.servelet.jstl.version>1.2</javax.servelet.jstl.version>
+        <dom4j.version>1.6.1</dom4j.version>
+        <log4j.version>1.2.13</log4j.version>
+        <http.client.version.4.0>4.0</http.client.version.4.0>
+
+        <!--repository/components/lib jars-->
+        <http.core.nio.version>4.3</http.core.nio.version>
+        <jettison.version>1.1</jettison.version>
+        <httpasyncclient.version>4.0</httpasyncclient.version>
+        <hash.ids.version>1.0.1</hash.ids.version>
     </properties>
 
-   <repositories>
+    <repositories>
+        <repository>
+            <id>wso2-nexus</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+
 
-		<repository>
-			<id>wso2telco-nexus</id>
-			<name>WSO2Telco internal Repository</name>
-			<url>http://maven.wso2telco.com/nexus/content/groups/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>ignore</checksumPolicy>
-			</releases>
-		</repository>
+        <repository>
+            <id>wso2telco-nexus</id>
+            <name>WSO2Telco internal Repository</name>
+            <url>http://maven.wso2telco.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
 
-		<repository>
-			<id>wso2telco.releases</id>
-			<name>WSO2 internal Repository</name>
-			<url>http://maven.wso2telco.com/nexus/content/repositories/releases/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>ignore</checksumPolicy>
-			</releases>
-		</repository>
+        <repository>
+            <id>wso2telco.releases</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2telco.com/nexus/content/repositories/releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
 
-		<repository>
-			<id>wso2Telco.snapshots</id>
-			<name>WSO2Telco Snapshot Repository</name>
-			<url>http://maven.wso2telco.com/nexus/content/repositories/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-	</repositories>
+        <repository>
+            <id>wso2Telco.snapshots</id>
+            <name>WSO2Telco Snapshot Repository</name>
+            <url>http://maven.wso2telco.com/nexus/content/repositories/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
 
-<pluginRepositories>
-		<pluginRepository>
-			<id>wso2telco-nexus</id>
-			<name>WSO2Telco internal Repository</name>
-			<url>http://maven.wso2telco.com/nexus/content/groups/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>ignore</checksumPolicy>
-			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>wso2telco.releases</id>
-			<name>WSO2 internal Repository</name>
-			<url>http://maven.wso2telco.com/nexus/content/repositories/releases/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>ignore</checksumPolicy>
-			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>wso2Telco.snapshots</id>
-			<name>WSO2Telco Snapshot Repository</name>
-			<url>http://maven.wso2telco.com/nexus/content/repositories/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</pluginRepository>
-	</pluginRepositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>wso2telco-nexus</id>
+            <name>WSO2Telco internal Repository</name>
+            <url>http://maven.wso2telco.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </pluginRepository>
+        <pluginRepository>
+            <id>wso2telco.releases</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2telco.com/nexus/content/repositories/releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </pluginRepository>
+        <pluginRepository>
+            <id>wso2Telco.snapshots</id>
+            <name>WSO2Telco Snapshot Repository</name>
+            <url>http://maven.wso2telco.com/nexus/content/repositories/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
 
-	<distributionManagement>
-		<snapshotRepository>
-			<id>wso2Telco.snapshots</id>
-			<name>Snapshot repo</name>
-			<url>http://maven.wso2telco.com/nexus/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<!-- Publish the versioned releases here -->
-		<repository>
-			<id>wso2telco.releases</id>
-			<name>release repo</name>
-			<url>http://maven.wso2telco.com/nexus/content/repositories/releases/</url>
-		</repository>
-	</distributionManagement>
+    <distributionManagement>
+        <snapshotRepository>
+            <id>wso2Telco.snapshots</id>
+            <name>Snapshot repo</name>
+            <url>http://maven.wso2telco.com/nexus/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <!-- Publish the versioned releases here -->
+        <repository>
+            <id>wso2telco.releases</id>
+            <name>release repo</name>
+            <url>http://maven.wso2telco.com/nexus/content/repositories/releases/</url>
+        </repository>
+    </distributionManagement>
 
 
-	<scm>
-		<url>https://github.com/WSO2Telco/product-ids.git</url>
-		<developerConnection>scm:git:https://github.com/WSO2Telco/product-ids.git</developerConnection>
-		<connection>scm:git:https://github.com/WSO2Telco/product-ids.git</connection>
-		<tag>HEAD</tag>
-	</scm>
+    <scm>
+        <url>https://github.com/WSO2Telco/product-ids.git</url>
+        <developerConnection>scm:git:https://github.com/WSO2Telco/product-ids.git</developerConnection>
+        <connection>scm:git:https://github.com/WSO2Telco/product-ids.git</connection>
+        <tag>v2_3_0</tag>
+    </scm>
 
 
 </project>