diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index 29a3c19678..6b5d68e3c2 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -112,7 +112,7 @@
             <outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory>
             <includes>
                 <include>**/api-manager.xml</include>
-                <include>**/sso-idp-config.xml</include>
+                <include>**/security/</include>
                 <!-- <include>**/emm-config.xml</include>-->
             </includes>
         </fileSet>
@@ -126,7 +126,15 @@
                 <include>**/trusted-idp-config.xml</include>
             </includes>
         </fileSet>
-
+        <fileSet>
+            <directory>
+                src/repository/conf/identity/
+            </directory>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/identity/</outputDirectory>
+            <includes>
+                <include>**/**</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>src/repository/conf/datasources</directory>
             <outputDirectory>wso2mdm-${project.version}/repository/conf/datasources
@@ -224,6 +232,16 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </fileSet>
+        <!-- Copying Authentication Endpoint webapp -->
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
+            <includes>
+                <include>authenticationendpoint.war</include>
+            </includes>
+        </fileSet>
 
 	<!-- Copying API Manager Publisher and Store Jaggery apps -->
 	<fileSet>
@@ -280,6 +298,7 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
+
         <!-- <file>
              <source>
                  ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
@@ -377,6 +396,7 @@
             <fileMode>644</fileMode>
         </file>
 
+
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>
@@ -416,6 +436,11 @@
             <outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/repository/conf/security/sso-idp-config.xml</source>
+            <outputDirectory>wso2mdm-${project.version}/repository/conf/security</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
 
         <file>
             <source>
diff --git a/product/modules/distribution/src/repository/conf/identity/identity-providers/default.xml b/product/modules/distribution/src/repository/conf/identity/identity-providers/default.xml
new file mode 100644
index 0000000000..3d1faa529d
--- /dev/null
+++ b/product/modules/distribution/src/repository/conf/identity/identity-providers/default.xml
@@ -0,0 +1,24 @@
+<IdentityProvider>
+	<IdentityProviderName>default</IdentityProviderName>
+	<DisplayName>default</DisplayName>
+	<IdentityProviderDescription></IdentityProviderDescription>
+	<Alias></Alias>
+	<IsPrimary></IsPrimary>
+	<IsFederationHub></IsFederationHub>
+	<HomeRealmId></HomeRealmId>
+	<ProvisioningRole></ProvisioningRole>
+	<FederatedAuthenticatorConfigs></FederatedAuthenticatorConfigs>
+	<DefaultAuthenticatorConfig>
+	</DefaultAuthenticatorConfig>
+	<ProvisioningConnectorConfigs>
+		<ProvisioningConnectorConfig>
+			<ProvisioningProperties>
+			</ProvisioningProperties>
+		</ProvisioningConnectorConfig>
+	</ProvisioningConnectorConfigs>
+	<DefaultProvisioningConnectorConfig></DefaultProvisioningConnectorConfig>
+	<ClaimConfig></ClaimConfig>
+	<Certificate></Certificate>
+	<PermissionAndRoleConfig></PermissionAndRoleConfig>
+	<JustInTimeProvisioningConfig></JustInTimeProvisioningConfig>
+</IdentityProvider>
\ No newline at end of file
diff --git a/product/modules/distribution/src/repository/conf/identity/service-providers/default.xml b/product/modules/distribution/src/repository/conf/identity/service-providers/default.xml
new file mode 100644
index 0000000000..83cb78a0b7
--- /dev/null
+++ b/product/modules/distribution/src/repository/conf/identity/service-providers/default.xml
@@ -0,0 +1,49 @@
+<ServiceProvider>
+	<ApplicationID>1</ApplicationID>
+	<ApplicationName>default</ApplicationName>
+	<Description>Default Service Provider</Description>
+	<InboundAuthenticationConfig>
+		<InboundAuthenticationRequestConfigs>
+			<InboundAuthenticationRequestConfig>
+				<InboundAuthKey>default</InboundAuthKey>
+				<InboundAuthType></InboundAuthType>
+				<Properties></Properties>
+			</InboundAuthenticationRequestConfig>
+		</InboundAuthenticationRequestConfigs>
+	</InboundAuthenticationConfig>
+	<LocalAndOutBoundAuthenticationConfig>
+		<AuthenticationSteps>
+			<AuthenticationStep>
+				<StepOrder>1</StepOrder>
+				<LocalAuthenticatorConfigs>
+					<LocalAuthenticatorConfig>
+						<Name>BasicAuthenticator</Name>
+						<DisplayName>basicauth</DisplayName>
+						<IsEnabled>true</IsEnabled>
+					</LocalAuthenticatorConfig>
+				</LocalAuthenticatorConfigs>
+				<!-- FederatedIdentityProviders>
+				 <IdentityProvider>
+				       <IdentityProviderName>facebook</IdentityProviderName>
+				       <IsEnabled>true</IsEnabled>
+                                     <DefaultAuthenticatorConfig>
+                                             <FederatedAuthenticatorConfig> 
+                                                     <Name>FacebookAuthenticator</Name>
+                                                     <IsEnabled>true</IsEnabled>
+                                             </FederatedAuthenticatorConfig>
+                                     </DefaultAuthenticatorConfig>
+				 </IdentityProvider>
+				</FederatedIdentityProviders -->
+				<SubjectStep>true</SubjectStep>
+				<AttributeStep>true</AttributeStep>
+			</AuthenticationStep>
+		</AuthenticationSteps>	
+	</LocalAndOutBoundAuthenticationConfig>
+	<RequestPathAuthenticatorConfigs></RequestPathAuthenticatorConfigs>
+	<InboundProvisioningConfig></InboundProvisioningConfig>
+	<OutboundProvisioningConfig></OutboundProvisioningConfig>
+	<ClaimConfig>
+          <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+       </ClaimConfig>
+	<PermissionAndRoleConfig></PermissionAndRoleConfig>
+</ServiceProvider>
diff --git a/product/modules/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml b/product/modules/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml
new file mode 100644
index 0000000000..e6006ead27
--- /dev/null
+++ b/product/modules/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml
@@ -0,0 +1,49 @@
+<ServiceProvider>
+	<ApplicationID>2</ApplicationID>
+	<ApplicationName>wso2_cdm</ApplicationName>
+	<Description>CDM</Description>
+	<InboundAuthenticationConfig>
+		<InboundAuthenticationRequestConfigs>
+			<InboundAuthenticationRequestConfig>
+				<InboundAuthKey>cdm</InboundAuthKey>
+				<InboundAuthType>samlsso</InboundAuthType>
+				<Properties></Properties>
+			</InboundAuthenticationRequestConfig>
+		</InboundAuthenticationRequestConfigs>
+	</InboundAuthenticationConfig>
+	<LocalAndOutBoundAuthenticationConfig>
+		<AuthenticationSteps>
+			<AuthenticationStep>
+				<StepOrder>1</StepOrder>
+				<LocalAuthenticatorConfigs>
+					<LocalAuthenticatorConfig>
+						<Name>BasicAuthenticator</Name>
+						<DisplayName>basicauth</DisplayName>
+						<IsEnabled>true</IsEnabled>
+					</LocalAuthenticatorConfig>
+				</LocalAuthenticatorConfigs>
+				<!-- FederatedIdentityProviders>
+				 <IdentityProvider>
+				       <IdentityProviderName>facebook</IdentityProviderName>
+				       <IsEnabled>true</IsEnabled>
+                                     <DefaultAuthenticatorConfig>
+                                             <FederatedAuthenticatorConfig> 
+                                                     <Name>FacebookAuthenticator</Name>
+                                                     <IsEnabled>true</IsEnabled>
+                                             </FederatedAuthenticatorConfig>
+                                     </DefaultAuthenticatorConfig>
+				 </IdentityProvider>
+				</FederatedIdentityProviders -->
+				<SubjectStep>true</SubjectStep>
+				<AttributeStep>true</AttributeStep>
+			</AuthenticationStep>
+		</AuthenticationSteps>	
+	</LocalAndOutBoundAuthenticationConfig>
+	<RequestPathAuthenticatorConfigs></RequestPathAuthenticatorConfigs>
+	<InboundProvisioningConfig></InboundProvisioningConfig>
+	<OutboundProvisioningConfig></OutboundProvisioningConfig>
+	<ClaimConfig>
+          <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+       </ClaimConfig>
+	<PermissionAndRoleConfig></PermissionAndRoleConfig>
+</ServiceProvider>
diff --git a/product/modules/distribution/src/repository/conf/security/sso-idp-config.xml b/product/modules/distribution/src/repository/conf/security/sso-idp-config.xml
new file mode 100755
index 0000000000..cb76f1d87d
--- /dev/null
+++ b/product/modules/distribution/src/repository/conf/security/sso-idp-config.xml
@@ -0,0 +1,49 @@
+<!--
+ ~ Copyright (c) 2005-2010, 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.
+ -->
+<SSOIdentityProviderConfig>
+    <TenantRegistrationPage>https://stratos-local.wso2.com/carbon/tenant-register/select_domain.jsp</TenantRegistrationPage>
+<!--     <ServiceProviders>
+        <ServiceProvider>
+            <Issuer>cdm</Issuer>
+            <AssertionConsumerService>https://localhost:9443/cdm/acs</AssertionConsumerService>
+            <SignResponse>true</SignResponse>
+            <CustomLoginPage>/cdm/login</CustomLoginPage>
+        </ServiceProvider>
+    </ServiceProviders> -->
+    <ServiceProviders>
+       		<ServiceProvider>
+          		<Issuer>cdm</Issuer>
+           		<AssertionConsumerService>https://localhost:9443/cdm/acs</AssertionConsumerService>
+				<SignAssertion>true</SignAssertion>
+           		<SignResponse>true</SignResponse>
+			<EnableAttributeProfile>false</EnableAttributeProfile>
+			<IncludeAttributeByDefault>false</IncludeAttributeByDefault>
+           		<Claims>
+				<Claim>http://wso2.org/claims/role</Claim>
+				<Claim>http://wso2.org/claims/emailaddress</Claim>
+ 			</Claims>
+			<EnableSingleLogout>false</EnableSingleLogout>
+			<SingleLogoutUrl></SingleLogoutUrl>
+			<EnableAudienceRestriction>true</EnableAudienceRestriction>
+			<AudiencesList>
+				<Audience>carbonServer</Audience>
+			</AudiencesList>
+			<ConsumingServiceIndex></ConsumingServiceIndex>           
+       		</ServiceProvider>  
+	</ServiceProviders> 
+</SSOIdentityProviderConfig>
diff --git a/product/modules/distribution/src/repository/conf/sso-idp-config.xml b/product/modules/distribution/src/repository/conf/sso-idp-config.xml
deleted file mode 100755
index 99f61be9eb..0000000000
--- a/product/modules/distribution/src/repository/conf/sso-idp-config.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, 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.
- -->
-<SSOIdentityProviderConfig>
-    <TenantRegistrationPage>https://stratos-local.wso2.com/carbon/tenant-register/select_domain.jsp</TenantRegistrationPage>
-    <ServiceProviders>
-        <ServiceProvider>
-            <Issuer>store</Issuer>
-            <AssertionConsumerService>https://localhost:9443/store/acs</AssertionConsumerService>
-            <SignResponse>true</SignResponse>
-            <CustomLoginPage>/store/login.jag</CustomLoginPage>
-        </ServiceProvider>
-        <ServiceProvider>
-            <Issuer>social</Issuer>
-            <AssertionConsumerService>https://localhost:9443/social/acs</AssertionConsumerService>
-            <SignResponse>true</SignResponse>
-            <CustomLoginPage>/social/login</CustomLoginPage>
-        </ServiceProvider>
-        <ServiceProvider>
-            <Issuer>publisher</Issuer>
-            <AssertionConsumerService>https://localhost:9443/publisher/acs</AssertionConsumerService>
-            <SignResponse>true</SignResponse>
-            <CustomLoginPage>/publisher/controllers/login.jag</CustomLoginPage>
-        </ServiceProvider>
-				<ServiceProvider>
-            <Issuer>emm</Issuer>
-            <AssertionConsumerService>https://localhost:9443/emm/acs</AssertionConsumerService>
-            <SignResponse>true</SignResponse>
-            <CustomLoginPage>/emm/login</CustomLoginPage>
-        </ServiceProvider>
-				<ServiceProvider>
-            <Issuer>mam</Issuer>
-            <AssertionConsumerService>https://localhost:9443/mam/acs</AssertionConsumerService>
-            <SignResponse>true</SignResponse>
-            <CustomLoginPage>/mam/login</CustomLoginPage>
-        </ServiceProvider>
-    </ServiceProviders>
-</SSOIdentityProviderConfig>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index f3245f533c..edba18878b 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -305,6 +305,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.identity.mgt.feature:${carbon.platform.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.claim.mgt.server.feature:${carbon.platform.version}
+                                </featureArtifactDef>
                                 <!-- End of SSO Fixes -->
 
                             </featureArtifacts>
@@ -586,7 +589,10 @@
                                     <id>org.wso2.carbon.identity.mgt.feature.group</id>
                                     <version>${carbon.platform.version}</version>
                                 </feature>
-
+                                <feature>
+                                    <id>org.wso2.carbon.claim.mgt.server.feature.group</id>
+                                    <version>${carbon.platform.version}</version>
+                                </feature>
                                 <!--SSO FIX OVER-->
 
                             </features>