diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/filter/ApiPermissionFilter.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/filter/ApiPermissionFilter.java
index 5f05dfb337..1f043c7b86 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/filter/ApiPermissionFilter.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/filter/ApiPermissionFilter.java
@@ -23,6 +23,7 @@ import org.wso2.carbon.apimgt.application.extension.api.util.APIUtil;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -120,7 +121,8 @@ public class ApiPermissionFilter implements Filter {
         try {
             UserRealm userRealm = APIUtil.getRealmService().getTenantUserRealm(PrivilegedCarbonContext
                                 .getThreadLocalCarbonContext().getTenantId());
-            return userRealm.getAuthorizationManager().isUserAuthorized(username, permission, action);
+            String tenantAwareUsername = MultitenantUtils.getTenantAwareUsername(username);
+            return userRealm.getAuthorizationManager().isUserAuthorized(tenantAwareUsername, permission, action);
         } catch (UserStoreException e) {
             String errorMsg = String.format("Unable to authorize the user : %s", username);
             log.error(errorMsg, e);
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/META-INF/permissions.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/META-INF/permissions.xml
index 591725fa12..9c41774ce5 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/META-INF/permissions.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/META-INF/permissions.xml
@@ -37,14 +37,14 @@
     </Permission>
     <Permission>
         <name>Register application</name>
-        <path>/device-mgt/api/application</path>
+        <path>/manage/api/subscribe</path>
         <url>/register</url>
         <method>POST</method>
         <scope>application_user</scope>
     </Permission>
     <Permission>
         <name>Delete application</name>
-        <path>/device-mgt/api/application</path>
+        <path>/manage/api/subscribe</path>
         <url>/unregister</url>
         <method>DELETE</method>
         <scope>application_user</scope>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
index adbf6cda43..ebf1e57654 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
@@ -404,13 +404,13 @@ public class DeviceManagementServiceComponent {
     }
 
 
-    protected void setDeviceTaskManagerService(DeviceTaskManagerService emailSenderService) {
+    protected void setDeviceTaskManagerService(DeviceTaskManagerService deviceTaskManagerService) {
         if (log.isDebugEnabled()) {
         }
-        DeviceManagementDataHolder.getInstance().setDeviceTaskManagerService(emailSenderService);
+        DeviceManagementDataHolder.getInstance().setDeviceTaskManagerService(deviceTaskManagerService);
     }
 
-    protected void unsetDeviceTaskManagerService(DeviceTaskManagerService emailSenderService) {
+    protected void unsetDeviceTaskManagerService(DeviceTaskManagerService deviceTaskManagerService) {
         if (log.isDebugEnabled()) {
         }
         DeviceManagementDataHolder.getInstance().setDeviceTaskManagerService(null);
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
index eb30a07b12..498a439c07 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -145,12 +145,7 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE (
   DEVICE_TYPE VARCHAR(300) NOT NULL ,
   CREATED_TIME DATETIME NOT NULL ,
   UPDATED_TIME DATETIME NOT NULL ,
-  PRIMARY KEY (ID) ,
-  CONSTRAINT DM_PROFILE_DEVICE_TYPE
-    FOREIGN KEY (DEVICE_TYPE, TENANT_ID)
-    REFERENCES DM_DEVICE_TYPE (NAME, PROVIDER_TENANT_ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  PRIMARY KEY (ID)
 );
 
 CREATE  TABLE IF NOT EXISTS DM_POLICY (
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
index db405cdc1e..b1a029dbbb 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -191,9 +191,7 @@ CREATE TABLE DM_PROFILE (
   DEVICE_TYPE VARCHAR(300) NOT NULL ,
   CREATED_TIME DATETIME NOT NULL ,
   UPDATED_TIME DATETIME NOT NULL ,
-  PRIMARY KEY (ID) ,
-  CONSTRAINT DM_PROFILE_DEVICE_TYPE FOREIGN KEY (DEVICE_TYPE, TENANT_ID) REFERENCES
-  DM_DEVICE_TYPE (NAME, PROVIDER_TENANT_ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+  PRIMARY KEY (ID)
 );
 
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_POLICY]') AND TYPE IN (N'U'))
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
index 5d8faece3f..f327b7b599 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -168,12 +168,7 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE (
   DEVICE_TYPE VARCHAR(300) NOT NULL ,
   CREATED_TIME DATETIME NOT NULL ,
   UPDATED_TIME DATETIME NOT NULL ,
-  PRIMARY KEY (ID) ,
-  CONSTRAINT DM_PROFILE_DEVICE_TYPE
-    FOREIGN KEY (DEVICE_TYPE, TENANT_ID)
-    REFERENCES DM_DEVICE_TYPE (NAME, PROVIDER_TENANT_ID)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION
+  PRIMARY KEY (ID)
 )ENGINE = InnoDB;
 
 
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
index f2e71c9c9c..c544452f52 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -268,10 +268,7 @@ CREATE  TABLE DM_PROFILE (
   DEVICE_TYPE VARCHAR2(300) NOT NULL ,
   CREATED_TIME TIMESTAMP(0) NOT NULL ,
   UPDATED_TIME TIMESTAMP(0) NOT NULL ,
-  CONSTRAINT PK_DM_PROFILE PRIMARY KEY (ID) ,
-  CONSTRAINT DM_PROFILE_DEVICE_TYPE
-  FOREIGN KEY (DEVICE_TYPE, TENANT_ID)
-  REFERENCES DM_DEVICE_TYPE (NAME, PROVIDER_TENANT_ID)
+  CONSTRAINT PK_DM_PROFILE PRIMARY KEY (ID)
 )
 /
 -- Generate ID using sequence and trigger
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index d5c035e26b..9c1f7490a6 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -148,12 +148,7 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE (
   TENANT_ID INTEGER NOT NULL ,
   DEVICE_TYPE VARCHAR(300) NOT NULL ,
   CREATED_TIME TIMESTAMP NOT NULL ,
-  UPDATED_TIME TIMESTAMP NOT NULL ,
-  CONSTRAINT DM_PROFILE_DEVICE_TYPE
-  FOREIGN KEY (DEVICE_TYPE, TENANT_ID)
-  REFERENCES DM_DEVICE_TYPE (NAME, PROVIDER_TENANT_ID)
-  ON DELETE NO ACTION
-  ON UPDATE NO ACTION
+  UPDATED_TIME TIMESTAMP NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS DM_POLICY (