diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/mssql.sql b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/mssql.sql
index 54a7dc720..bc4e44b0e 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/mssql.sql
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/mssql.sql
@@ -38,6 +38,7 @@ IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[W
 CREATE TABLE WINDOWS_ENROLLMENT_TOKEN (
   ID INT NOT NULL IDENTITY,
   TENANT_DOMAIN VARCHAR(45) NOT NULL,
+  TENANT_ID INT DEFAULT 0,
   ENROLLMENT_TOKEN VARCHAR (100) NULL DEFAULT NULL,
   DEVICE_ID VARCHAR (100) NOT NULL,
   USERNAME VARCHAR (45) NOT NULL,
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/mysql.sql b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/mysql.sql
index 378d516da..4d2e4d159 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/mysql.sql
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/mysql.sql
@@ -36,6 +36,7 @@ ENGINE = InnoDB;
 CREATE TABLE IF NOT EXISTS `WINDOWS_ENROLLMENT_TOKEN` (
   `ID` INT NOT NULL AUTO_INCREMENT,
   `TENANT_DOMAIN` VARCHAR(45) NOT NULL,
+  `TENANT_ID` INT DEFAULT 0,
   `ENROLLMENT_TOKEN` VARCHAR(100) NULL,
   `DEVICE_ID` VARCHAR(100) NULL,
   `USERNAME` VARCHAR(45) NULL,
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/oracle.sql b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/oracle.sql
index 3371fab89..2e69878b1 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/oracle.sql
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/oracle.sql
@@ -37,6 +37,7 @@ CREATE TABLE WIN_FEATURE (
 CREATE TABLE WINDOWS_ENROLLMENT_TOKEN (
   ID INT NOT NULL,
   TENANT_DOMAIN VARCHAR(45) NOT NULL,
+  TENANT_ID INT DEFAULT 0,
   ENROLLMENT_TOKEN VARCHAR(100) NULL,
   DEVICE_ID VARCHAR(100) NULL,
   USERNAME VARCHAR(45) NULL,
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/postgresql.sql b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/postgresql.sql
index c8af94cd6..9286eb41c 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/postgresql.sql
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/dbscripts/plugins/postgresql.sql
@@ -35,6 +35,7 @@ CREATE TABLE IF NOT EXISTS WIN_FEATURE (
 CREATE TABLE IF NOT EXISTS WINDOWS_ENROLLMENT_TOKEN (
   ID SERIAL NOT NULL,
   TENANT_DOMAIN VARCHAR(45) NOT NULL,
+  TENANT_ID INTEGER DEFAULT 0,
   ENROLLMENT_TOKEN VARCHAR(100) NULL,
   DEVICE_ID VARCHAR(100) NULL,
   USERNAME VARCHAR(45) NULL,