diff --git a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml
index 2ffc7f6807..9b5b3387e3 100644
--- a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml
+++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml
@@ -52,41 +52,25 @@
                         <Bundle-Description>Tenant Management Core Bundle</Bundle-Description>
                         <Private-Package>io.entgra.device.mgt.core.tenant.mgt.core.internal</Private-Package>
                         <Import-Package>
-                            io.entgra.device.mgt.core.application.mgt.common.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.application.mgt.common.services;version="[5.0,6)",
-                            io.entgra.device.mgt.core.application.mgt.core.config;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.metadata.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.permission.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.roles.config;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.config;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.metadata.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.permission.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.tenant.mgt.common.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.tenant.mgt.common.spi;version="[5.0,6)",
-                            io.entgra.device.mgt.core.tenant.mgt.core,
-                            org.apache.commons.logging;version="[1.2,2)",
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
-                            org.osgi.service.*;version="${imp.package.version.osgi.service}",
-                            org.wso2.carbon.context;version="[4.8,5)",
-                            org.wso2.carbon.registry.core.exceptions;version="[1.0,2)",
-                            org.wso2.carbon.stratos.common.beans;version="[4.9,5)",
-                            org.wso2.carbon.stratos.common.exception;version="[4.9,5)",
-                            org.wso2.carbon.stratos.common.listeners;version="[4.9,5)",
-                            org.wso2.carbon.user.api;version="[1.0,2)",
-                            org.wso2.carbon.user.core.service;version="[4.8,5)",
-                            org.apache.commons.logging,
-                            io.entgra.device.mgt.core.application.mgt.common.*,
-                            io.entgra.device.mgt.core.application.mgt.core.config,
-                            io.entgra.device.mgt.core.device.mgt.core,
-                            io.entgra.device.mgt.core.tenant.mgt.common.*,
-                            io.entgra.device.mgt.core.device.mgt.common.metadata.mgt,
-                            io.entgra.device.mgt.core.device.mgt.common.exceptions,
-                            io.entgra.device.mgt.core.device.mgt.common.permission.mgt,
-                            io.entgra.device.mgt.core.device.mgt.common.roles.config,
-                            io.entgra.device.mgt.core.device.mgt.core.metadata.mgt,
-                            io.entgra.device.mgt.core.device.mgt.core.config,
-                            io.entgra.device.mgt.core.device.mgt.core.dao.*
+                            org.osgi.service.component;version="${imp.package.version.osgi.service}",
+                            io.entgra.device.mgt.core.application.mgt.common.exception.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.application.mgt.common.services.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.application.mgt.core.config.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.device.mgt.common.exceptions.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.device.mgt.common.permission.mgt.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.device.mgt.core.permission.mgt.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.device.mgt.common.roles.config.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.device.mgt.core.dao.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.tenant.mgt.common.exception.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.tenant.mgt.common.spi.*;version="[5.0,6)",
+                            org.wso2.carbon.user.api.*,
+                            org.wso2.carbon.user.core.service.*,
+                            org.apache.commons.logging.*,
+                            org.wso2.carbon.context.*,
+                            org.wso2.carbon.stratos.common,
+                            io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.*;version="[5.0,6)",
+                            io.entgra.device.mgt.core.device.mgt.core.metadata.mgt.*;version="[5.0,6)"
                         </Import-Package>
                         <Export-Package>
                             !io.entgra.device.mgt.core.tenant.mgt.core.internal,