diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/pom.xml b/components/tenant-mgt/io.entgra.tenant.mgt.core/pom.xml
index 76284fea49f..5ec9904eb3d 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/pom.xml
+++ b/components/tenant-mgt/io.entgra.tenant.mgt.core/pom.xml
@@ -46,7 +46,11 @@
                             org.wso2.carbon.stratos.common.exception,
                             org.wso2.carbon.stratos.common.listeners,
                             org.wso2.carbon.device.mgt.common.metadata.mgt,
+                            org.wso2.carbon.device.mgt.common.exceptions,
+                            org.wso2.carbon.device.mgt.common.permission.mgt,
+                            org.wso2.carbon.device.mgt.common.roles.config,
                             org.wso2.carbon.device.mgt.core.metadata.mgt,
+                            org.wso2.carbon.device.mgt.core.config,
                             org.wso2.carbon.user.core.service,
                             org.wso2.carbon.context
                         </Import-Package>
diff --git a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtServiceComponent.java b/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtServiceComponent.java
index ac2b0be69bb..534c50c59d2 100644
--- a/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtServiceComponent.java
+++ b/components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtServiceComponent.java
@@ -9,6 +9,7 @@ import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.device.mgt.common.metadata.mgt.WhiteLabelManagementService;
 import org.wso2.carbon.device.mgt.core.metadata.mgt.WhiteLabelManagementServiceImpl;
+import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
@@ -27,6 +28,7 @@ import org.wso2.carbon.user.core.service.RealmService;
  * unbind="unsetRealmService"
  */
 
+@SuppressWarnings("unused")
 public class TenantMgtServiceComponent {
 
     private static final Log log = LogFactory.getLog(TenantManagerService.class);
@@ -43,7 +45,7 @@ public class TenantMgtServiceComponent {
             TenantMgtDataHolder.getInstance().setWhiteLabelManagementService(whiteLabelManagementService);
             DeviceMgtTenantListener deviceMgtTenantListener = new DeviceMgtTenantListener();
             componentContext.getBundleContext().
-                    registerService(DeviceMgtTenantListener.class.getName(), deviceMgtTenantListener, null);
+                    registerService(TenantMgtListener.class.getName(), deviceMgtTenantListener, null);
             log.info("Tenant management service activated");
         } catch (Throwable t) {
             String msg = "Error occurred while activating tenant management service";