diff --git a/pom.xml b/pom.xml
index 08eea11f36..7f6cf9ecb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -487,6 +487,7 @@
         <process.feature.version>1.0.0</process.feature.version>
         <uuid.feature.version>1.0.0</uuid.feature.version>
         <sso.feature.version>1.1.0-SNAPSHOT</sso.feature.version>
+        <i18n.feature.version>1.1.0-SNAPSHOT</i18n.feature.version>
         <jaggery-test.feature.version>1.1.0</jaggery-test.feature.version>
         <!--Testing -->
         <test.framework.version>4.3.1</test.framework.version>
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index 31ad07efd6..2d58915833 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -98,12 +98,17 @@
              <outputDirectory>wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
              <fileMode>755</fileMode>
          </fileSet>-->
+        <!--Removed -->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
             </directory>
             <outputDirectory>${pom.artifactId}-${project.version}/modules/</outputDirectory>
             <includes>
-                <include>*/**</include>
+                <include>**/carbon/</include>
+                <include>**/jaggery-test/</include>
+                <include>**/process/</include>
+                <include>**/uuid/</include>
+                <include>**/i18n/</include>
             </includes>
         </fileSet>
 
@@ -198,7 +203,7 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
-
+        <!--Copying modules-->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
@@ -208,6 +213,20 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>src/repository/modules/encode</directory>
+            <outputDirectory>wso2mdm-${project.version}/modules/encode</outputDirectory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/repository/modules/sso</directory>
+            <outputDirectory>wso2mdm-${project.version}/modules/sso</outputDirectory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
 
         <!-- Copying Device Management related dbscripts -->
         <fileSet>
diff --git a/product/modules/distribution/src/repository/modules/encode/module.xml b/product/modules/distribution/src/repository/modules/encode/module.xml
new file mode 100644
index 0000000000..15a9762513
--- /dev/null
+++ b/product/modules/distribution/src/repository/modules/encode/module.xml
@@ -0,0 +1,7 @@
+<module name="encode" namespace="ns" expose="true" xmlns="http://wso2.org/projects/jaggery/module.xml">    
+        <hostObject>
+            <className>org.wso2.carbon.apimgt.hostobjects.EncodeHostObject</className>
+            <name>Encode</name>
+        </hostObject>
+</module>
+
diff --git a/product/modules/distribution/src/repository/modules/sso/module.xml b/product/modules/distribution/src/repository/modules/sso/module.xml
new file mode 100644
index 0000000000..15682e7284
--- /dev/null
+++ b/product/modules/distribution/src/repository/modules/sso/module.xml
@@ -0,0 +1,7 @@
+<module name="sso" expose="true"  xmlns="http://wso2.org/projects/jaggery/module.xml">
+    <hostObject>
+        <className>org.wso2.carbon.hostobjects.sso.SAMLSSORelyingPartyObject</className>
+        <name>SSORelyingParty</name>
+    </hostObject>
+
+</module>
\ No newline at end of file
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index edba18878b..c21c737512 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -130,6 +130,9 @@
                                 <featureArtifactDef>
                                     org.jaggeryjs.modules:sso.feature:${sso.feature.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:i18n.feature:${sso.feature.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version}
                                 </featureArtifactDef>
@@ -368,6 +371,10 @@
                                     <id>org.jaggeryjs.modules.sso.feature.group</id>
                                     <version>${sso.feature.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.i18n.feature.group</id>
+                                    <version>${i18n.feature.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
                                     <version>${jaggery-test.feature.version}</version>