diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 12f59031..31a17cc7 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -127,6 +127,24 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 
+					<execution>
+						<id>1-replace-datasource-property-thrift-authentication</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="Replace DataSource to WSO2AM_DB"/>
+								<replace
+										file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml"
+										token="jdbc/WSO2CarbonDB"
+										value="jdbc/WSO2AM_DB"
+										/>
+							</tasks>
+						</configuration>
+					</execution>
+
 					<!--============ Added with ES Features ===============-->
 
 					<execution>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 9d9b6232..07167f2c 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -501,7 +501,7 @@
 
         <!--============ Added with API Features ===============-->
         <fileSet>
-            <directory>apim-resources/customsequences</directory>
+            <directory>src/repository/conf/resources/customsequences</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/customsequences</outputDirectory>
             <includes>
                 <include>**/**.xml</include>
@@ -539,6 +539,18 @@
             </excludes>
         </fileSet-->
 
+        <fileSet>
+            <directory>src/repository/conf/synapse-configs</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs</outputDirectory>
+            <excludes>
+                <exclude>**/empty.txt</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>src/repository/conf/synapse-configs/default/sequences</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory>
+        </fileSet>
+
         <!-- Analytics related config -->
         <fileSet>
             <directory>
@@ -740,13 +752,21 @@
             <fileMode>644</fileMode>
         </file>
 
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/msg-mgt.properties
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+
 
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -764,7 +784,7 @@
         </file>
         <file>
             <source>src/repository/conf/identity.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
@@ -906,6 +926,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/repository/conf/axis2/axis2.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+
         <file>
             <!--<source>src/repository/conf/etc/launch.ini</source>-->
             <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/launch.ini</source>
@@ -951,14 +978,6 @@
             </outputDirectory>
         </file>
 
-        <!--============ Added with ES Features ===============-->
-        <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-mgt.properties
@@ -1037,14 +1056,15 @@
         <!-- End of Enterprise Store Features -->
 
         <!-- Copying apim feature - bam.xml -->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>-->
-            <!--<filtered>true</filtered>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
+        <file>
+            <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml-->
+            <source>
+                src/repository/conf/etc/bam.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
 
         <!-- Analytics datasources -->
         <file>
diff --git a/modules/distribution/src/repository/conf/axis2/axis2.xml b/modules/distribution/src/repository/conf/axis2/axis2.xml
index e6103df9..3b795a2a 100644
--- a/modules/distribution/src/repository/conf/axis2/axis2.xml
+++ b/modules/distribution/src/repository/conf/axis2/axis2.xml
@@ -93,9 +93,7 @@
     <parameter name="manageTransportSession">true</parameter>
 
     <!-- Synapse Configuration file -->
-    <parameter name="SynapseConfig.ConfigurationFile" locked="false">
-        ./repository/deployment/server/synapse-configs
-    </parameter>
+    <parameter name="SynapseConfig.ConfigurationFile" locked="false">repository/deployment/server/synapse-configs</parameter>
 
     <!-- Synapse Home parameter -->
     <parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
@@ -577,7 +575,7 @@
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
         <phase name="Security"/>
-	<phase name="Transport"/>
+        <phase name="Transport"/>
         <!--
            The MsgOutObservation phase is used to observe messages just before the
            responses are sent out. In this phase, we could do some things such as SOAP message
@@ -701,4 +699,4 @@
                                port="2222"/>
         </groupManagement>
     </clustering>
-</axisconfig>
+</axisconfig>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/axis2/axis2_client.xml b/modules/distribution/src/repository/conf/axis2/axis2_client.xml
index deb24c71..5dc3425b 100644
--- a/modules/distribution/src/repository/conf/axis2/axis2_client.xml
+++ b/modules/distribution/src/repository/conf/axis2/axis2_client.xml
@@ -109,7 +109,7 @@
                           class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
                           class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-	<!--JSON Message Formatters-->
+        <!--JSON Message Formatters-->
         <messageFormatter contentType="application/json"
                           class="org.apache.axis2.json.JSONMessageFormatter"/>
         <messageFormatter contentType="application/json/badgerfish"
@@ -128,7 +128,7 @@
                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
         <messageBuilder contentType="application/x-www-form-urlencoded"
                         class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
-	<!--JSON Message Builders-->
+        <!--JSON Message Builders-->
         <messageBuilder contentType="application/json"
                         class="org.apache.axis2.json.JSONOMBuilder"/>
         <messageBuilder contentType="application/json/badgerfish"
@@ -312,6 +312,6 @@
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
         <phase name="Security"/>
-	<phase name="Transport"/>
+        <phase name="Transport"/>
     </phaseOrder>
-</axisconfig>
+</axisconfig>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/etc/bam.xml b/modules/distribution/src/repository/conf/etc/bam.xml
new file mode 100644
index 00000000..45e47cc3
--- /dev/null
+++ b/modules/distribution/src/repository/conf/etc/bam.xml
@@ -0,0 +1,4 @@
+<BamConfig>
+	<ServiceDataPublishing>disable</ServiceDataPublishing>
+	<WebappDataPublishing>disable</WebappDataPublishing>
+</BamConfig>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/identity.xml b/modules/distribution/src/repository/conf/identity.xml
index e9af104a..ae58884c 100755
--- a/modules/distribution/src/repository/conf/identity.xml
+++ b/modules/distribution/src/repository/conf/identity.xml
@@ -1,44 +1,59 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- ~ Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights 
-	Reserved. ~ ~ WSO2 Inc. licenses this file to you under the Apache License, 
-	~ Version 2.0 (the "License"); you may not use this file except ~ in compliance 
-	with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 
-	~ ~ Unless required by applicable law or agreed to in writing, ~ software 
-	distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT 
-	WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the 
-	License for the ~ specific language governing permissions and limitations 
-	~ under the License. -->
+<!--
+ ~ Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you under the Apache License,
+ ~ Version 2.0 (the "License"); you may not use this file except
+ ~ in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~    http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied.  See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
 
 <Server xmlns="http://wso2.org/projects/carbon/carbon.xml">
 
+    <OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl>
+
+    <OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern>
+    <!-- If the users must be prompted for approval -->
+    <OpenIDSkipUserConsent>false</OpenIDSkipUserConsent>
+    <!-- Expiry time of the OpenID RememberMe token in minutes -->
+    <OpenIDRememberMeExpiry>7200</OpenIDRememberMeExpiry>
+
     <JDBCPersistenceManager>
         <DataSource>
-            <!-- Include a data source name (jndiConfigName) from the set of data
-                sources defined in master-datasources.xml -->
+            <!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
             <Name>jdbc/WSO2AM_DB</Name>
         </DataSource>
-        <!-- If the identity database is created from another place and if it is
-            required to skip schema initialization during the server start up, set the
-            following property to "true". -->
-        <!-- <SkipDBSchemaCreation>false</SkipDBSchemaCreation> -->
-        <!--SessionDataPersist>
-            <Enable>true</Enable>
-            <EnableCleanUp>true</EnableCleanUp>
-            <Temporary>false</Temporary-->
-        <!--/SessionDataPersist-->
+        <!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
+           property to "true". -->
+        <SkipDBSchemaCreation>true</SkipDBSchemaCreation>
     </JDBCPersistenceManager>
 
-    <!-- Time configurations are in minutes -->
-    <TimeConfig>
-        <SessionIdleTimeout>120</SessionIdleTimeout>
-        <RememberMeTimeout>20160</RememberMeTimeout>
-        <PersistanceCleanUpTimeout>20160</PersistanceCleanUpTimeout>
-        <PersistanceCleanUpPeriod>1140</PersistanceCleanUpPeriod>
-    </TimeConfig>
-
-    <!-- Security configurations -->
+    <!--
+      Security configurations
+    -->
     <Security>
-        <!-- The directory under which all other KeyStore files will be stored -->
+        <UserTrustedRPStore>
+            <Location>${carbon.home}/repository/resources/security/userRP.jks</Location>
+            <!-- Keystore type (JKS/PKCS12 etc.)-->
+            <Type>JKS</Type>
+            <!-- Keystore password-->
+            <Password>wso2carbon</Password>
+            <!-- Private Key password-->
+            <KeyPassword>wso2carbon</KeyPassword>
+        </UserTrustedRPStore>
+
+        <!--
+              The directory under which all other KeyStore files will be stored
+          -->
         <KeyStoresDir>${carbon.home}/conf/keystores</KeyStoresDir>
     </Security>
 
@@ -53,106 +68,39 @@
         </System>
     </Identity>
 
-    <OpenID>
-        <!--
-            Default values for OpenIDServerUrl and OpenIDUSerPattern are built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>
-            If above format doesn't satisfy uncomment the following configs and explicitly configure the values
-         -->
-        <!--OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl-->
-        <!--OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern-->
-
-        <!-- If the users must be prompted for approval -->
-        <OpenIDSkipUserConsent>false</OpenIDSkipUserConsent>
-        <!-- Expiry time of the OpenID RememberMe token in minutes -->
-        <OpenIDRememberMeExpiry>7200</OpenIDRememberMeExpiry>
-        <!-- Multifactor Authentication configuration -->
-        <UseMultifactorAuthentication>false</UseMultifactorAuthentication>
-        <!-- To enable or disable openid dumb mode -->
-        <DisableOpenIDDumbMode>false</DisableOpenIDDumbMode>
-        <!-- remember me session timeout in seconds -->
-        <SessionTimeout>36000</SessionTimeout>
-        <!-- skips authentication if valid SAML2 Web SSO browser session available -->
-        <AcceptSAMLSSOLogin>false</AcceptSAMLSSOLogin>
-        <ClaimsRetrieverImplClass>org.wso2.carbon.identity.provider.openid.claims.DefaultClaimsRetriever
-        </ClaimsRetrieverImplClass>
-
-        <!--
-               OpenID private association store is configurable from following configs.
-               It includes two new replication stores,
-                       i.   OpenIDServerAssociationStore (Default association store)
-                       ii.  PrivateAssociationCryptoStore
-                       iii. PrivateAssociationReplicationStore
-        -->
-
-        <!-- Specify full qualified class name of the class which going to use as private association store -->
-        <!-- 
-		<OpenIDPrivateAssociationStoreClass>org.wso2.carbon.identity.provider.openid.PrivateAssociationCryptoStore</OpenIDPrivateAssociationStoreClass>
-	-->
-
-        <!-- The exiration time (in minutes) for the OpenID association -->
-        <!--
-		<OpenIDAssociationExpiryTime>15</OpenIDAssociationExpiryTime>
-	-->
-
-        <!-- Configs specific to PrivateAssociationCryptoStore -->
-        <!-- Server secret. This value should be the same in all nodes in the cluster -->
-        <!--
-		<OpenIDPrivateAssociationServerKey>qewlj324lmasc</OpenIDPrivateAssociationServerKey>
-	-->
-
-        <!-- Configs specific to PrivateAssociationCryptoStore -->
-        <!-- This enable private association cleanup task which cleans expired private associations -->
-        <!--
-		<EnableOpenIDAssociationCleanupTask>true</EnableOpenIDAssociationCleanupTask>
-	-->
-        <!-- Time Period (in minutes) that cleanup task would run -->
-        <!--
-		<OpenIDAssociationCleanupPeriod>15</OpenIDAssociationCleanupPeriod>
-	-->
-    </OpenID>
-
     <OAuth>
-        <AppInfoCacheTimeout>-1</AppInfoCacheTimeout>
-        <AuthorizationGrantCacheTimeout>-1</AuthorizationGrantCacheTimeout>
-        <SessionDataCacheTimeout>-1</SessionDataCacheTimeout>
-        <ClaimCacheTimeout>-1</ClaimCacheTimeout>
-
-        <!--
-            Default values for OAuth1RequestTokenUrl, OAuth1AccessTokenUrl, OAuth1AuthorizeUrl
-            OAuth2AuthzEPUrl, OAuth2TokenEPUrl and OAuth2UserInfoEPUrl are built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>/<path>
-            If above format doesn't satisfy uncomment the following configs and explicitly configure the values
-         -->
-        <OAuth1RequestTokenUrl>https://localhost:9443/oauth/request-token</OAuth1RequestTokenUrl>
-        <OAuth1AuthorizeUrl>https://localhost:9443/oauth/authorize-url</OAuth1AuthorizeUrl>
-        <OAuth1AccessTokenUrl>https://localhost:9443/oauth/access-token</OAuth1AccessTokenUrl>
-        <!--OAuth2AuthzEPUrl>https://localhost:9443/oauth2/authorize</OAuth2AuthzEPUrl-->
-        <!--OAuth2TokenEPUrl>https://localhost:9443/oauth2/token</OAuth2TokenEPUrl-->
-        <!--OAuth2UserInfoEPUrl>https://localhost:9443/oauth2/userinfo</OAuth2UserInfoEPUrl-->
-
+        <RequestTokenUrl>https://localhost:9443/oauth/request-token</RequestTokenUrl>
+        <AccessTokenUrl>https://localhost:9443/oauth/access-token</AccessTokenUrl>
+        <AuthorizeUrl>https://localhost:9443/oauth/authorize-url</AuthorizeUrl>
         <!-- Default validity period for Authorization Code in seconds -->
         <AuthorizationCodeDefaultValidityPeriod>300</AuthorizationCodeDefaultValidityPeriod>
-        <!-- Default validity period for application access tokens in seconds -->
+        <!-- Default validity period for Access Token in seconds -->
         <AccessTokenDefaultValidityPeriod>3600</AccessTokenDefaultValidityPeriod>
-        <!-- Default validity period for user access tokens in seconds -->
+        <!-- Default validity period for Application Access Token in seconds-If want to set this as never expired,set the value as <0   -->
+        <ApplicationAccessTokenDefaultValidityPeriod>3600</ApplicationAccessTokenDefaultValidityPeriod>
+        <!-- Default validity period for User Access Token in seconds-->
         <UserAccessTokenDefaultValidityPeriod>3600</UserAccessTokenDefaultValidityPeriod>
-        <!-- Validity period for refresh token -->
-        <RefreshTokenValidityPeriod>84600</RefreshTokenValidityPeriod>
         <!-- Timestamp skew in seconds -->
         <TimestampSkew>300</TimestampSkew>
-        <!-- Enable OAuth caching -->
+        <!-- Enable OAuth caching. This cache has the replication support. -->
         <EnableOAuthCache>true</EnableOAuthCache>
-        <!-- Enable renewal of refresh token for refresh_token grant -->
-        <RenewRefreshTokenForRefreshGrant>true</RenewRefreshTokenForRefreshGrant>
-        <!-- Process the token before storing it in database, e.g. encrypting -->
-        <TokenPersistenceProcessor>org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor</TokenPersistenceProcessor>
-        <!-- Supported Client Authentication Methods -->
+        <!-- Configure the security measures needs to be done prior to store the token in the database,
+          such as hashing, encrypting, etc.-->
+        <TokenPersistenceProcessor>
+            org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor
+        </TokenPersistenceProcessor>
+        <!--<ClientAuthHandlers>
+            <ClientAuthHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler</ClientAuthHandlerImplClass>
+        </ClientAuthHandlers>-->
+
         <ClientAuthHandlers>
             <ClientAuthHandler Class="org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler">
                 <Property Name="StrictClientCredentialValidation">false</Property>
             </ClientAuthHandler>
         </ClientAuthHandlers>
+        <!--TokenPersistenceProcessor>
+                org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionPersistenceProcessor
+            </TokenPersistenceProcessor-->
         <!-- Supported Response Types -->
         <SupportedResponseTypes>
             <SupportedResponseType>
@@ -168,20 +116,26 @@
         <SupportedGrantTypes>
             <SupportedGrantType>
                 <GrantTypeName>authorization_code</GrantTypeName>
-                <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler</GrantTypeHandlerImplClass>
+                <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedAuthorizationCodeGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
             <SupportedGrantType>
                 <GrantTypeName>password</GrantTypeName>
-                <!-- <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler</GrantTypeHandlerImplClass> -->
                 <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedPasswordGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
+
+            <!-- This is commented out intentionally due to a bug-->
+            <!--<SupportedGrantType>
+                <GrantTypeName>application_token</GrantTypeName>
+                <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.OpenKeyManagerGrantHandler</GrantTypeHandlerImplClass>
+                <GrantTypeValidatorImplClass>org.wso2.carbon.apimgt.keymgt.handlers.OpenKeyManagerGrantValidator</GrantTypeValidatorImplClass>
+            </SupportedGrantType>-->
             <SupportedGrantType>
                 <GrantTypeName>refresh_token</GrantTypeName>
                 <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.RefreshGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
             <SupportedGrantType>
                 <GrantTypeName>client_credentials</GrantTypeName>
-                <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCredentialsGrantHandler</GrantTypeHandlerImplClass>
+                <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedClientCredentialsGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
             <SupportedGrantType>
                 <GrantTypeName>urn:ietf:params:oauth:grant-type:saml2-bearer</GrantTypeName>
@@ -195,24 +149,33 @@
         <OAuthCallbackHandlers>
             <OAuthCallbackHandler Class="org.wso2.carbon.apimgt.keymgt.util.APIManagerOAuthCallbackHandler"/>
         </OAuthCallbackHandlers>
-        <!--TokenValidators>
-            <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
-        </TokenValidators-->
-        <!-- Assertions can be used to embedd parameters into access token. -->
+        <OAuthScopeValidator class="org.wso2.carbon.identity.oauth2.validators.JDBCScopeValidator"/>
+
+        <!-- Add custom user headers to the response-->
+        <!--<RequiredRespHeaderClaimUris>
+            <ClaimUri>http://wso2.org/claims/emailaddress</ClaimUri>
+            <ClaimUri>http://wso2.org/claims/gender</ClaimUri>
+        </RequiredRespHeaderClaimUris>-->
+
+        <!-- Enable/Disable OAuth Caching-->
+        <!--<EnableCache>true</EnableCache>-->
+
+        <!-- Assertions can be used to embedd parameters into access token.-->
         <EnableAssertions>
             <UserName>false</UserName>
         </EnableAssertions>
 
-        <!-- This should be set to true when using multiple user stores and keys
-            should saved into different tables according to the user store. By default
-            all the application keys are saved in to the same table. UserName Assertion
-            should be 'true' to use this. -->
+        <!-- This should be set to true when using multiple user stores and keys should saved
+                into different tables according to the user store. By default all the application keys are saved in to the same table.
+                UserName Assertion should be 'true' to use this.-->
         <EnableAccessTokenPartitioning>false</EnableAccessTokenPartitioning>
-        <!-- user store domain names and mapping to new table name. eg: if you
-            provide 'A:foo.com', foo.com should be the user store domain name and 'A'
-            represent the relavant mapping of token store table, i.e. tokens will be
-            added to a table called IDN_OAUTH2_ACCESS_TOKEN_A. -->
+
+        <!-- user store domain names and mappings to new table names.
+                    eg: if you provide 'A:foo.com', foo.com should be the user store domain name and 'A' represent the relavant mapping of
+                    token storing table, i.e. tokens relevant to the users comming from foo.com user store will be added to a table called
+                    IDN_OAUTH2_ACCESS_TOKEN_A. -->
         <AccessTokenPartitioningDomains><!-- A:foo.com, B:bar.com --></AccessTokenPartitioningDomains>
+
         <AuthorizationContextTokenGeneration>
             <Enabled>false</Enabled>
             <TokenGeneratorImplClass>org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator</TokenGeneratorImplClass>
@@ -221,30 +184,25 @@
             <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
             <AuthorizationContextTTL>15</AuthorizationContextTTL>
         </AuthorizationContextTokenGeneration>
+
         <SAML2Grant>
             <!--SAML2TokenHandler></SAML2TokenHandler-->
         </SAML2Grant>
-        <OpenIDConnect>
-            <IDTokenBuilder>org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder</IDTokenBuilder>
-            <!--
-                Default value for IDTokenIssuerID, is OAuth2TokenEPUrl.
-                If that doesn't satisfy uncomment the following config and explicitly configure the value
-            -->
-            <!--IDTokenIssuerID>https://localhost:9443/oauth2/token</IDTokenIssuerID-->
-            <IDTokenSubjectClaim>http://wso2.org/claims/givenname</IDTokenSubjectClaim>
-            <IDTokenCustomClaimsCallBackHandler>org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback</IDTokenCustomClaimsCallBackHandler>
-            <IDTokenExpiration>3600</IDTokenExpiration>
-            <UserInfoEndpointClaimDialect>http://wso2.org/claims</UserInfoEndpointClaimDialect>
-            <UserInfoEndpointClaimRetriever>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoUserStoreClaimRetriever</UserInfoEndpointClaimRetriever>
-            <UserInfoEndpointRequestValidator>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInforRequestDefaultValidator</UserInfoEndpointRequestValidator>
-            <UserInfoEndpointAccessTokenValidator>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoISAccessTokenValidator</UserInfoEndpointAccessTokenValidator>
-            <UserInfoEndpointResponseBuilder>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoJSONResponseBuilder</UserInfoEndpointResponseBuilder>
-            <SkipUserConsent>false</SkipUserConsent>
-        </OpenIDConnect>
+
+        <!-- Primary/secondary login configuration for APIstore. If user likes to keep two login attributes in a distributed setup, to login the APIstore,
+        he should configure this section. Primary login doesn't have a claimUri associated with it. But secondary login, which is a claim attribute,
+        is associated with a claimuri.-->
+        <!-- <LoginConfig>
+                <UserIdLogin  primary="true">
+            <ClaimUri></ClaimUri>
+            </UserIdLogin>
+            <EmailLogin  primary="false">
+                <ClaimUri>http://wso2.org/claims/emailaddress</ClaimUri>
+            </EmailLogin>
+        </LoginConfig>-->
     </OAuth>
 
     <MultifactorAuthentication>
-        <!--Enable>false</Enable-->
         <XMPPSettings>
             <XMPPConfig>
                 <XMPPProvider>gtalk</XMPPProvider>
@@ -258,59 +216,15 @@
     </MultifactorAuthentication>
 
     <SSOService>
-        <PersistanceCacheTimeout>157680000</PersistanceCacheTimeout>
-        <SessionIndexCacheTimeout>157680000</SessionIndexCacheTimeout>
-        <EntityId>localhost</EntityId>
-        <!--
-            Default value for IdentityProviderURL is  built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/samlsso
-            If that doesn't satisfy uncomment the following config and explicitly configure the value
-        -->
-        <!--IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL-->
-        <SingleLogoutRetryCount>5</SingleLogoutRetryCount>
-        <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval>
-        <!-- in milli seconds -->
-        <TenantPartitioningEnabled>false</TenantPartitioningEnabled>
-        <SessionTimeout>36000</SessionTimeout>
-        <!-- remember me session timeout in seconds -->
-        <!-- skips authentication if valid SAML2 Web SSO browser session available -->
-        <AttributeStatementBuilder>org.wso2.carbon.identity.sso.saml.attributes.UserAttributeStatementBuilder</AttributeStatementBuilder>
-        <AttributesClaimDialect>http://wso2.org/claims</AttributesClaimDialect>
-        <AcceptOpenIDLogin>false</AcceptOpenIDLogin>
-        <ClaimsRetrieverImplClass>org.wso2.carbon.identity.sso.saml.builders.claims.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
-        <SAMLSSOAssertionBuilder>org.wso2.carbon.identity.sso.saml.builders.assertion.DefaultSAMLAssertionBuilder</SAMLSSOAssertionBuilder>
-        <SAMLSSOEncrypter>org.wso2.carbon.identity.sso.saml.builders.encryption.DefaultSSOEncrypter</SAMLSSOEncrypter>
-        <SAMLSSOSigner>org.wso2.carbon.identity.sso.saml.builders.signature.DefaultSSOSigner</SAMLSSOSigner>
-        <SAML2HTTPRedirectSignatureValidator>org.wso2.carbon.identity.sso.saml.validators.SAML2HTTPRedirectDeflateSignatureValidator</SAML2HTTPRedirectSignatureValidator>
-        <!--SAMLSSOResponseBuilder>org.wso2.carbon.identity.sso.saml.builders.DefaultResponseBuilder</SAMLSSOResponseBuilder-->
-
-        <!-- SAML Token validity period in minutes -->
-        <SAMLResponseValidityPeriod>5</SAMLResponseValidityPeriod>
-        <UseAuthenticatedUserDomainCrypto>false</UseAuthenticatedUserDomainCrypto>
+        <IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL>
     </SSOService>
 
-    <SecurityTokenService>
-        <!--
-            Default value for IdentityProviderURL is  built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/services/wso2carbon-sts
-            If that doesn't satisfy uncomment the following config and explicitly configure the value
-        -->
-        <!--IdentityProviderURL>https://localhost:9443/services/wso2carbon-sts</IdentityProviderURL-->
-    </SecurityTokenService>
-
-    <PassiveSTS>
-        <!--
-            Default value for IdentityProviderURL is  built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/passivests
-            If that doesn't satisfy uncomment the following config and explicitly configure the value
-        -->
-        <!--IdentityProviderURL>https://localhost:9443/passivests</IdentityProviderURL-->
-    </PassiveSTS>
-
     <EntitlementSettings>
         <!-- Uncomment this to enable on-demand policy loading -->
-        <!--OnDemandPolicyLoading> <Enable>true</Enable> <MaxInMemoryPolicies>100</MaxInMemoryPolicies>
-            </OnDemandPolicyLoading -->
+        <!--OnDemandPolicyLoading>
+                <Enable>true</Enable>
+                <MaxInMemoryPolicies>100</MaxInMemoryPolicies>
+        </OnDemandPolicyLoading-->
         <DecisionCaching>
             <Enable>true</Enable>
             <CachingInterval>36000</CachingInterval>
@@ -319,54 +233,16 @@
             <Enable>true</Enable>
         </AttributeCaching>
         <ThirftBasedEntitlementConfig>
-            <EnableThriftService>false</EnableThriftService>
+            <EnableThriftService>true</EnableThriftService>
             <ReceivePort>${Ports.ThriftEntitlementReceivePort}</ReceivePort>
             <ClientTimeout>10000</ClientTimeout>
             <KeyStore>
                 <Location>${carbon.home}/repository/resources/security/wso2carbon.jks</Location>
                 <Password>wso2carbon</Password>
             </KeyStore>
-            <!-- Enable this element to mention the host-name of your IS machine -->
-            <ThriftHostName>localhost</ThriftHostName>
         </ThirftBasedEntitlementConfig>
     </EntitlementSettings>
 
-    <SCIM>
-        <!--
-            Default value for UserEPUrl and GroupEPUrl are built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>/<path>
-            If that doesn't satisfy uncomment the following config and explicitly configure the value
-        -->
-        <!--UserEPUrl>https://localhost:9443/wso2/scim/Users</UserEPUrl-->
-        <!--GroupEPUrl>https://localhost:9443/wso2/scim/Groups</GroupEPUrl-->
-        <SCIMAuthenticators>
-            <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.BasicAuthHandler">
-                <Property name="Priority">5</Property>
-            </Authenticator>
-            <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.OAuthHandler">
-                <Property name="Priority">10</Property>
-                <Property name="AuthorizationServer">local://services</Property>
-                <!--Property name="AuthorizationServer">https://localhost:9443/services</Property>
-                <Property name="UserName">admin</Property>
-                <Property name="Password">admin</Property-->
-            </Authenticator>
-        </SCIMAuthenticators>
-    </SCIM>
-
-    <!--SessionContextCache>
-        <Enable>true</Enable>
-        <Capacity>100000</Capacity>
-    </SessionContextCache-->
-
-    <EventListeners>
-        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener"
-                       name="org.wso2.carbon.identity.workflow.mgt.impl.userstore.UserStoreActionListener"
-                       orderId="10" enable="false"/>
-        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.mgt.IdentityMgtEventListener"
-                       orderId="50" enable="false"/>
-        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.oauth.listener.IdentityOathEventListener"
-                       orderId="60" enable="false"/>
-        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.provider.openid.listener.IdentityOpenIDUserEventListener"
-                       orderId="70" enable="false"/>
-    </EventListeners>
+    <!--To do OSGI invocations to OAuth2Service,when the entire server is in one JVM -->
+    <SeparateBackEnd>false</SeparateBackEnd>
 </Server>
\ No newline at end of file
diff --git a/modules/distribution/apim-resources/customsequences/fault/json_fault.xml b/modules/distribution/src/repository/conf/resources/customsequences/fault/json_fault.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/fault/json_fault.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/fault/json_fault.xml
diff --git a/modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/json_to_xml_in_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/in/json_to_xml_in_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/in/log_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/log_in_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/in/log_in_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/in/log_in_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/preserve_accept_header.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/in/preserve_accept_header.xml
diff --git a/modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/xml_to_json_in_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/in/xml_to_json_in_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/apply_accept_header.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/out/apply_accept_header.xml
diff --git a/modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/json_to_xml_out_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/out/json_to_xml_out_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/out/log_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/log_out_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/out/log_out_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/out/log_out_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/xml_to_json_out_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/out/xml_to_json_out_message.xml
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml
new file mode 100644
index 00000000..4221f0c2
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml
@@ -0,0 +1,24 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMAuthorizeAPI_" context="/authorize">
+    <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/authorize">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml
new file mode 100644
index 00000000..8a72d753
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMRevokeAPI_" context="/revoke">
+    <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/revoke">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <!--handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/-->
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml
new file mode 100644
index 00000000..43268da1
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml
@@ -0,0 +1,25 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMTokenAPI_" context="/token">
+    <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <send>
+                <endpoint>
+                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/token">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml b/modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
new file mode 100644
index 00000000..722d81b0
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<proxy xmlns="http://ws.apache.org/ns/synapse"
+       name="WorkflowCallbackService"
+       transports="https http"
+       startOnLoad="true"
+       trace="disable">
+   <description/>
+   <target>
+      <inSequence>
+         <property name="messageType"
+                   value="application/x-www-form-urlencoded"
+                   scope="axis2"
+                   type="STRING"/>
+         <send>
+            <endpoint>
+               <address uri="https://localhost:9443/store/site/blocks/workflow/workflow-listener/ajax/workflow-listener.jag"
+                        format="rest"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <property name="messageType" value="text/xml" scope="axis2" type="STRING"/>
+         <send/>
+      </outSequence>
+   </target>
+   <publishWSDL>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                        xmlns:ns1="http://org.apache.axis2/xsd"
+                        xmlns:ns="http://callback.workflow.apimgt.carbon.wso2.org"
+                        xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+                        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+                        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                        xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+                        targetNamespace="http://callback.workflow.apimgt.carbon.wso2.org">
+         <wsdl:documentation>WorkflowCallbackService</wsdl:documentation>
+         <wsdl:types>
+            <xs:schema attributeFormDefault="qualified"
+                       elementFormDefault="qualified"
+                       targetNamespace="http://callback.workflow.apimgt.carbon.wso2.org">
+               <xs:element name="resumeEvent">
+                  <xs:complexType>
+                     <xs:sequence>
+                        <xs:element minOccurs="0"
+                                    name="workflowReference"
+                                    nillable="true"
+                                    type="xs:string"/>
+                        <xs:element minOccurs="0" name="status" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0"
+                                    name="description"
+                                    nillable="true"
+                                    type="xs:string"/>
+                     </xs:sequence>
+                  </xs:complexType>
+               </xs:element>
+               <xs:element name="resumeEventResponse">
+                  <xs:complexType>
+                     <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                     </xs:sequence>
+                  </xs:complexType>
+               </xs:element>
+            </xs:schema>
+         </wsdl:types>
+         <wsdl:message name="resumeEventRequest">
+            <wsdl:part name="parameters" element="ns:resumeEvent"/>
+         </wsdl:message>
+         <wsdl:message name="resumeEventResponse">
+            <wsdl:part name="parameters" element="ns:resumeEventResponse"/>
+         </wsdl:message>
+         <wsdl:portType name="WorkflowCallbackServicePortType">
+            <wsdl:operation name="resumeEvent">
+               <wsdl:input message="ns:resumeEventRequest" wsaw:Action="urn:resumeEvent"/>
+               <wsdl:output message="ns:resumeEventResponse" wsaw:Action="urn:resumeEventResponse"/>
+            </wsdl:operation>
+         </wsdl:portType>
+         <wsdl:binding name="WorkflowCallbackServiceSoap11Binding"
+                       type="ns:WorkflowCallbackServicePortType">
+            <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+            <wsdl:operation name="resumeEvent">
+               <soap:operation soapAction="urn:resumeEvent" style="document"/>
+               <wsdl:input>
+                  <soap:body use="literal"/>
+               </wsdl:input>
+               <wsdl:output>
+                  <soap:body use="literal"/>
+               </wsdl:output>
+            </wsdl:operation>
+         </wsdl:binding>
+         <wsdl:binding name="WorkflowCallbackServiceSoap12Binding"
+                       type="ns:WorkflowCallbackServicePortType">
+            <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+            <wsdl:operation name="resumeEvent">
+               <soap12:operation soapAction="urn:resumeEvent" style="document"/>
+               <wsdl:input>
+                  <soap12:body use="literal"/>
+               </wsdl:input>
+               <wsdl:output>
+                  <soap12:body use="literal"/>
+               </wsdl:output>
+            </wsdl:operation>
+         </wsdl:binding>
+         <wsdl:binding name="WorkflowCallbackServiceHttpBinding"
+                       type="ns:WorkflowCallbackServicePortType">
+            <http:binding verb="POST"/>
+            <wsdl:operation name="resumeEvent">
+               <http:operation location="resumeEvent"/>
+               <wsdl:input>
+                  <mime:content type="text/xml" part="parameters"/>
+               </wsdl:input>
+               <wsdl:output>
+                  <mime:content type="text/xml" part="parameters"/>
+               </wsdl:output>
+            </wsdl:operation>
+         </wsdl:binding>
+         <wsdl:service name="WorkflowCallbackService">
+            <wsdl:port name="WorkflowCallbackServiceHttpsSoap11Endpoint"
+                       binding="ns:WorkflowCallbackServiceSoap11Binding">
+               <soap:address location="https://localhost:8243/services/WorkflowCallbackService.WorkflowCallbackServiceHttpsSoap11Endpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpSoap11Endpoint"
+                       binding="ns:WorkflowCallbackServiceSoap11Binding">
+               <soap:address location="http://localhost:8280/services/WorkflowCallbackService.WorkflowCallbackServiceHttpSoap11Endpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpsSoap12Endpoint"
+                       binding="ns:WorkflowCallbackServiceSoap12Binding">
+               <soap12:address location="https://localhost:8243/services/WorkflowCallbackService.WorkflowCallbackServiceHttpsSoap12Endpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpSoap12Endpoint"
+                       binding="ns:WorkflowCallbackServiceSoap12Binding">
+               <soap12:address location="http://localhost:8280/services/WorkflowCallbackService.WorkflowCallbackServiceHttpSoap12Endpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpsEndpoint"
+                       binding="ns:WorkflowCallbackServiceHttpBinding">
+               <http:address location="https://localhost:8243/services/WorkflowCallbackService.WorkflowCallbackServiceHttpsEndpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpEndpoint"
+                       binding="ns:WorkflowCallbackServiceHttpBinding">
+               <http:address location="http://localhost:8280/services/WorkflowCallbackService.WorkflowCallbackServiceHttpEndpoint/"/>
+            </wsdl:port>
+         </wsdl:service>
+      </wsdl:definitions>
+   </publishWSDL>
+</proxy>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/registry.xml b/modules/distribution/src/repository/conf/synapse-configs/default/registry.xml
new file mode 100644
index 00000000..b19a4c89
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/registry.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+
+<!-- Registry declaration of the WSO2 ESB -->
+<registry xmlns="http://ws.apache.org/ns/synapse" provider="org.wso2.carbon.mediation.registry.WSO2Registry">
+    <!--all resources loaded from the URL registry would be
+    cached for this number of milliseconds -->
+    <parameter name="cachableDuration">15000</parameter>
+</registry>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml
new file mode 100644
index 00000000..5a5213d8
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml
@@ -0,0 +1,4 @@
+<sequence name="_auth_failure_handler_" xmlns="http://ws.apache.org/ns/synapse">
+    <property name="error_message_type" value="application/xml"/>
+    <sequence key="_cors_request_handler_"/>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml
new file mode 100644
index 00000000..64e8fe39
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_build_">
+    <builder>
+        <messageBuilder contentType="application/json" class="org.apache.axis2.json.JSONBuilder"
+                        formatterClass="org.apache.axis2.json.JSONMessageFormatter"/>
+        <messageBuilder contentType="application/xml" class="org.apache.axis2.builder.ApplicationXMLBuilder"
+                        formatterClass="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+    </builder>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml
new file mode 100644
index 00000000..503bc372
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml
@@ -0,0 +1,21 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_cors_request_handler_">
+   <filter source="$ctx:CORSConfiguration.Enabled" regex="true">
+      <then>
+         <filter source="boolean($trp:Access-Control-Allow-Origin)" regex="false">
+            <then>
+               <property name="Access-Control-Allow-Origin" expression="$ctx:Access-Control-Allow-Origin"  scope="transport" type="STRING"/>
+            </then>
+         </filter>
+         <filter source="boolean($trp:Access-Control-Allow-Methods)" regex="false">
+            <then>
+               <property name="Access-Control-Allow-Methods" expression="$ctx:Access-Control-Allow-Methods" scope="transport" type="STRING"/>
+            </then>
+         </filter>
+         <filter source="boolean($trp:Access-Control-Allow-Headers)" regex="false">
+            <then>
+               <property name="Access-Control-Allow-Headers" expression="$ctx:Access-Control-Allow-Headers" scope="transport" type="STRING"/>
+            </then>
+         </filter>
+      </then>
+   </filter>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml
new file mode 100644
index 00000000..77199419
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_production_key_error_">
+    <property name="ERROR_CODE" value="900901"/>
+    <property name="ERROR_MESSAGE" value="Production key offered to the API with no production endpoint"/>
+    <property name="CUSTOM_HTTP_SC" value="403"/>
+    <sequence key="fault"/>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
new file mode 100644
index 00000000..f88ce6b6
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_resource_mismatch_handler_">
+    <property name="ERROR_CODE" value="403"/>
+    <property name="ERROR_MESSAGE" value="No matching resource found in the API for the given request"/>
+    <property name="CUSTOM_HTTP_SC" value="403"/>
+    <sequence key="fault"/>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml
new file mode 100644
index 00000000..12906f2e
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_sandbox_key_error_">
+    <property name="ERROR_CODE" value="900901"/>
+    <property name="ERROR_MESSAGE" value="Sandbox key offered to the API with no sandbox endpoint"/>
+    <property name="CUSTOM_HTTP_SC" value="403"/>
+    <sequence key="fault"/>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml
new file mode 100644
index 00000000..40e81240
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml
@@ -0,0 +1,5 @@
+<sequence name="_throttle_out_handler_" xmlns="http://ws.apache.org/ns/synapse">    
+    <property name="X-JWT-Assertion" scope="transport" action="remove"/>
+    <class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtThrottleUsageHandler"/>
+    <sequence key="_cors_request_handler_"/>
+</sequence>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml
new file mode 100644
index 00000000..1e4a9825
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml
@@ -0,0 +1,40 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_token_fault_">
+    <log level="custom">
+        <property name="STATUS" value="Executing token 'fault' sequence"/>
+        <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
+        <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
+    </log>
+    <payloadFactory>
+        <format>
+            <am:fault xmlns:am="http://wso2.org/apimanager">
+                <am:code>$1</am:code>
+                <am:type>Status report</am:type>
+                <am:message>Runtime Error</am:message>
+                <am:description>$2</am:description>
+            </am:fault>
+        </format>
+        <args>
+            <arg expression="$ctx:ERROR_CODE"/>
+            <arg expression="$ctx:ERROR_MESSAGE"/>
+        </args>
+    </payloadFactory>
+    <filter xpath="$ctx:CUSTOM_HTTP_SC">
+        <then>
+            <property name="HTTP_SC" expression="$ctx:CUSTOM_HTTP_SC" scope="axis2"/>
+        </then>
+        <else>
+            <property name="HTTP_SC" value="500" scope="axis2"/>
+        </else>
+    </filter>
+    <property name="RESPONSE" value="true"/>
+    <header name="To" action="remove"/>
+    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+    <property name="ContentType" scope="axis2" action="remove"/>
+    <property name="Authorization" scope="transport" action="remove"/>
+    <property name="Host" scope="transport" action="remove"/>
+    <property name="Accept" scope="transport" action="remove"/>
+    <property name="messageType" value="application/xml" scope="axis2"/>
+    <sequence key="_cors_request_handler_"/>
+    <send/>
+    <drop/>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml
new file mode 100644
index 00000000..3b915492
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="fault">
+    <log level="custom">
+        <property name="STATUS" value="Executing default 'fault' sequence"/>
+        <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
+        <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
+    </log>
+    <filter source="get-property('MESSAGE_FORMAT')" regex="soap1[1-2]">
+        <then>
+            <property name="SOAP_FAULT_CODE" value="Server"/>
+            <makefault>
+                <code expression="$ctx:SOAP_FAULT_CODE"/>
+                <reason expression="$ctx:ERROR_MESSAGE"/>
+            </makefault>
+        </then>
+        <else>
+            <payloadFactory>
+                <format>
+                    <am:fault xmlns:am="http://wso2.org/apimanager">
+                        <am:code>$1</am:code>
+                        <am:type>Status report</am:type>
+                        <am:message>Runtime Error</am:message>
+                        <am:description>$2</am:description>
+                    </am:fault>
+                </format>
+                <args>
+                    <arg expression="$ctx:ERROR_CODE"/>
+                    <arg expression="$ctx:ERROR_MESSAGE"/>
+                </args>
+            </payloadFactory>
+            <filter source="$axis2:HTTP_METHOD" regex="^(?!.*(POST|PUT)).*$">
+                <property name="messageType" value="application/xml" scope="axis2"/>
+            </filter>
+        </else>
+    </filter>
+    <filter xpath="$ctx:CUSTOM_HTTP_SC">
+        <then>
+            <property name="HTTP_SC" expression="$ctx:CUSTOM_HTTP_SC" scope="axis2"/>
+        </then>
+        <else>
+            <property name="HTTP_SC" value="500" scope="axis2"/>
+        </else>
+    </filter>
+    <class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtFaultHandler"/>
+    <property name="RESPONSE" value="true"/>
+    <header name="To" action="remove"/>
+    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+    <property name="ContentType" scope="axis2" action="remove"/>
+    <property name="Authorization" scope="transport" action="remove"/>
+    <property name="Host" scope="transport" action="remove"/>
+    <property name="Accept" scope="transport" action="remove"/>
+    <property name="X-JWT-Assertion" scope="transport" action="remove"/>
+    <sequence key="_cors_request_handler_"/>
+    <send/>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml
new file mode 100644
index 00000000..9063e8ad
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+
+<!-- Default main sequence shipped with the WSO2 ESB -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="main">
+    <description>The default main sequence for API manager - Returns 404 Not Found</description>
+    <in>
+        <log level="custom">
+            <property name="STATUS" value="Message dispatched to the main sequence. Invalid URL."/>
+            <property name="RESOURCE" expression="fn:concat('/', $axis2:REST_URL_POSTFIX)"/>
+        </log>        
+        <filter source="$ctx:TRANSPORT_DENIED" regex="true">
+            <payloadFactory>
+                <format>
+                    <am:fault xmlns:am="http://wso2.org/apimanager">
+                        <am:code>403</am:code>
+                        <am:type>Status report</am:type>
+                        <am:message>Forbidden</am:message>
+                        <am:description>Unsupported Transport [ $2 ]. The requested resource (/$1) is not available.</am:description>
+                    </am:fault>
+                </format>
+                <args>
+                    <arg expression="$axis2:REST_URL_POSTFIX"/>
+                    <arg expression="$ctx:IN_TRANSPORT"/>
+                </args>
+            </payloadFactory>
+            <property name="HTTP_SC" value="403" scope="axis2"/>
+            <property name="RESPONSE" value="true"/>
+            <header name="To" action="remove"/>
+            <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+            <property name="ContentType" scope="axis2" action="remove"/>
+            <property name="Authorization" scope="transport" action="remove"/>
+            <property name="Host" scope="transport" action="remove"/>
+            <property name="Accept" scope="transport" action="remove"/>
+            <send/>
+        </filter>
+        <filter source="get-property('MESSAGE_FORMAT')" regex="soap1[1-2]">
+            <then>
+                <property name="SOAP_FAULT_CODE" value="Server"/>
+                <makefault>
+                    <code expression="$ctx:SOAP_FAULT_CODE"/>
+                    <reason value="The requested endpoint is not available."/>
+                </makefault>
+            </then>
+            <else>
+                <payloadFactory>
+                    <format>
+                        <am:fault xmlns:am="http://wso2.org/apimanager">
+                            <am:code>404</am:code>
+                            <am:type>Status report</am:type>
+                            <am:message>Not Found</am:message>
+                            <am:description>The requested resource (/$1) is not available.</am:description>
+                        </am:fault>
+                    </format>
+                    <args>
+                        <arg expression="$axis2:REST_URL_POSTFIX"/>
+                    </args>
+                </payloadFactory>
+            </else>
+        </filter>
+        <filter source="$axis2:HTTP_METHOD" regex="^(?!.*(POST|PUT)).*$">
+            <property name="messageType" value="application/xml" scope="axis2"/>
+        </filter>
+        <property name="HTTP_SC" value="404" scope="axis2"/>
+        <property name="RESPONSE" value="true"/>
+        <header name="To" action="remove"/>
+        <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+        <property name="ContentType" scope="axis2" action="remove"/>
+        <property name="Authorization" scope="transport" action="remove"/>
+        <property name="Host" scope="transport" action="remove"/>
+        <property name="Accept" scope="transport" action="remove"/>
+        <property name="X-JWT-Assertion" scope="transport" action="remove"/>
+        <send/>
+        <drop/>
+    </in>
+    <out>
+        <log level="full">
+            <property name="STATUS" value="Unexpected response message in out flow"/>
+        </log>
+        <drop/>
+    </out>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml b/modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml
new file mode 100644
index 00000000..d7f60ec4
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+
+<!-- An empty flat synapse configuration shipped with the WSO2 ESB -->
+<definitions xmlns="http://ws.apache.org/ns/synapse">
+
+    <!-- You can add any flat sequences, endpoints, etc.. to this synapse.xml file if you do
+    *not* want to keep the artifacts in several files -->
+</definitions>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index e123bddb..47a538af 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -135,7 +135,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-                                <!-- End of Device Management Features -->
+                                 End of Device Management Features
 
                                 <!-- Jaggery Features -->
                                 <featureArtifactDef>
@@ -291,7 +291,7 @@
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
                                 </feaureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.self.registration.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
@@ -302,9 +302,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -376,6 +376,14 @@
                                     org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version}
                                 </featureArtifactDef>
 
+
+                                <!--- TCP Transport -->
+                                <featureArtifactDef>
+                                    org.apache.axis2.transport:org.apache.axis2.transport.tcp.feature:${axis2-transports.wso2.version}
+                                </featureArtifactDef>
+
+
+
                                 <!-- Registry task feature and dependencies -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
@@ -497,14 +505,34 @@
 									org.wso2.ciphertool:org.wso2.ciphertool.feature:${ciphertool.version}
 								</feaureArtifactDef>
 
-								<!--<axis2-transports.wso2.version>1.1.0-wso2v12</axis2-transports.wso2.version>-->
 
 								<!-- End of Enterprise Store Features -->
 								<!--=====================================================================================================-->
+
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
-
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.initializer.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.task.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.apache.synapse.transport.nhttp.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.inbound.endpoints.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.ntask.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.mediation:org.wso2.carbon.mediation.admin.feature:${carbon.mediation.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.deployment:org.wso2.carbon.service.mgt.server.feature:${carbon.deployment.version}-->
+                                <!--</featureArtifactDef>-->
 
                                 <!--APIM feature-->
                                 <featureArtifactDef>
@@ -919,10 +947,10 @@
                                     <id>org.wso2.carbon.identity.core.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.identity.self.registration.server.feature.group</id>-->
-                                    <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
+                                    <version>${carbon.identity.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -931,10 +959,10 @@
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.identity.relying.party.server.feature.group</id>-->
-                                    <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
+                                    <version>${carbon.identity.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -1033,6 +1061,43 @@
                                     <id>org.wso2.carbon.apimgt.store.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.initializer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.task.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.transport.nhttp.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.wso2.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!-- TCP transport Synapse -->
+                                <feature>
+                                    <id>org.apache.axis2.transport.tcp.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.inbound.endpoints.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.ntask.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.mediation.admin.feature.group</id>-->
+                                    <!--<version>${carbon.mediation.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.service.mgt.server.feature.group</id>-->
+                                    <!--<version>${carbon.deployment.version}</version>-->
+                                <!--</feature>-->
                                 <!-- End of API Management Features -->
 
                                 <!-- Notification Support: Mail -->
@@ -1041,6 +1106,9 @@
                                     <version>${axis2-transports.wso2.version}</version>
                                 </feature>
 
+
+
+
                                 <!-- Device  Store Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
diff --git a/pom.xml b/pom.xml
index 61c9005d..23cea62b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -856,7 +856,7 @@
         <carbon.deployment.version>4.5.2</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>4.5.10-SNAPSHOT</carbon.identity.version>
+        <carbon.identity.version>4.5.6</carbon.identity.version>
 
         <!-- Carbon Multi-tenancy -->
         <carbon.multitenancy.version>4.4.1</carbon.multitenancy.version>
@@ -879,8 +879,7 @@
         <carbon.mediation.version>4.4.5</carbon.mediation.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>1.3.0-SNAPSHOT</carbon.api.mgt.version>
-        <apimserver.version>1.10.0-SNAPSHOT</apimserver.version>
+        <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
 
         <!-- Tomcat -->
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@@ -892,17 +891,17 @@
         <bouncycastle.version>1.49</bouncycastle.version>
         <apache.wss4j.version>2.0.0</apache.wss4j.version>
         <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
-        <axis2-transports.wso2.version>1.1.0-wso2v13</axis2-transports.wso2.version>
+        <axis2-transports.wso2.version>1.1.0-wso2v12</axis2-transports.wso2.version>
 
         <!--DAS-->
-        <carbon.analytics.version>1.0.3-SNAPSHOT</carbon.analytics.version>
+        <carbon.analytics.version>1.0.3</carbon.analytics.version>
         <carbon.analytics.common.version>5.0.2</carbon.analytics.common.version>
-        <das.release.version>3.0.0-SNAPSHOT</das.release.version>
-        <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <shindig.version>1.0.0</shindig.version>
-        <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
         <carbon.event-processing.version>2.0.5</carbon.event-processing.version>
+        <das.release.version>3.0.0-SNAPSHOT</das.release.version>
+        <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
+        <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>