diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 00a70da90c..adf2063ac5 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -163,7 +163,6 @@
         <dependency>
             <groupId>commons-lang.wso2</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.6.0.wso2v1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 74441130a0..94bfb59aef 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -53,5 +53,25 @@
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-lang.wso2</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.utils</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.base</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/common/KeyStoreManagamentDataHolder.java b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/common/KeyStoreManagamentDataHolder.java
index 6857b07dc5..776794fdbe 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/common/KeyStoreManagamentDataHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/common/KeyStoreManagamentDataHolder.java
@@ -15,7 +15,7 @@
  */
 package org.wso2.carbon.identity.api.server.keystore.management.common;
 
-import org.wso2.carbon.security.keystore.KeyStoreManagementService;
+import org.wso2.carbon.core.keystore.KeyStoreManagementService;
 
 /**
  * Service holder class for keystore management.
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/common/factory/OSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/common/factory/OSGIServiceFactory.java
index 1b62ec68ef..d6eb09734c 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/common/factory/OSGIServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/common/factory/OSGIServiceFactory.java
@@ -18,7 +18,7 @@
 
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.security.keystore.KeyStoreManagementService;
+import org.wso2.carbon.core.keystore.KeyStoreManagementService;
 
 /**
  * Factory Beans serve as a factory for creating other beans within the IOC container. This factory bean is used to
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 22d39dca2f..541fce5831 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -160,6 +160,11 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
@@ -174,5 +179,10 @@
             <groupId>org.wso2.carbon.identity.server.api</groupId>
             <artifactId>org.wso2.carbon.identity.api.server.common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.base</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/keystore/management/v1/KeystoresApiService.java b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/keystore/management/v1/KeystoresApiService.java
index bda2ae5182..b12b006df9 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/keystore/management/v1/KeystoresApiService.java
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/keystore/management/v1/KeystoresApiService.java
@@ -16,17 +16,9 @@
 
 package org.wso2.carbon.identity.api.server.keystore.management.v1;
 
-import org.wso2.carbon.identity.api.server.keystore.management.v1.*;
-import org.wso2.carbon.identity.api.server.keystore.management.v1.model.*;
-import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import org.wso2.carbon.identity.api.server.keystore.management.v1.model.CertificateRequest;
-import org.wso2.carbon.identity.api.server.keystore.management.v1.model.CertificateResponse;
-import org.wso2.carbon.identity.api.server.keystore.management.v1.model.ErrorResponse;
-import java.io.File;
 import javax.ws.rs.core.Response;
 
-
 public interface KeystoresApiService {
 
       public Response deleteCertificate(String alias);
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/v1/core/KeyStoreService.java b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/v1/core/KeyStoreService.java
index e16396cea8..ecc791f99d 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/v1/core/KeyStoreService.java
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/src/main/java/org/wso2/carbon/identity/api/server/keystore/management/v1/core/KeyStoreService.java
@@ -19,13 +19,13 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.core.keystore.KeyStoreManagementException;
+import org.wso2.carbon.core.keystore.KeyStoreManagementServerException;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.server.keystore.management.common.KeyStoreConstants;
 import org.wso2.carbon.identity.api.server.keystore.management.v1.model.CertificateResponse;
-import org.wso2.carbon.security.keystore.KeyStoreManagementException;
-import org.wso2.carbon.security.keystore.KeyStoreManagementServerException;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/pom.xml b/pom.xml
index 3ab5f66d14..edfaf15e6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,12 @@
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.core</artifactId>
+        </dependency>
+    </dependencies>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
@@ -400,12 +406,24 @@
                 <version>${carbon.kernel.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.core</artifactId>
+                <version>${carbon.kernel.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
                 <version>${carbon.kernel.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.base</artifactId>
+                <version>${carbon.kernel.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.multitenancy</groupId>
                 <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
@@ -586,6 +604,12 @@
                 <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
                 <version>${apache.felix.scr.ds.annotations.version}</version>
             </dependency>
+            <dependency>
+                <groupId>commons-lang.wso2</groupId>
+                <artifactId>commons-lang</artifactId>
+                <scope>compile</scope>
+                <version>${commons.lang.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jacoco</groupId>
                 <artifactId>org.jacoco.agent</artifactId>
@@ -706,6 +730,7 @@
         <identity.branding.preference.management.version>1.0.4</identity.branding.preference.management.version>
         <apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>
         <!--<maven.checkstyleplugin.excludes>**/gen/**/*</maven.checkstyleplugin.excludes>-->
+        <commons.lang.version>2.6.0.wso2v1</commons.lang.version>
 
         <tenant.resource.manager.version>1.5.55</tenant.resource.manager.version>
         <identity.verification.version>1.0.3</identity.verification.version>