diff --git a/src/main/java/com/eactive/apim/portal/config/BaseDatasourceConfiguration.java b/src/main/java/com/eactive/apim/portal/config/BaseDatasourceConfiguration.java
index e8100b3..b3d4c01 100644
--- a/src/main/java/com/eactive/apim/portal/config/BaseDatasourceConfiguration.java
+++ b/src/main/java/com/eactive/apim/portal/config/BaseDatasourceConfiguration.java
@@ -1,27 +1,16 @@
 package com.eactive.apim.portal.config;
 
-import com.eactive.eai.data.jpa.BaseRepositoryImpl;
-
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
-import javax.annotation.PostConstruct;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
+import com.eactive.eai.rms.data.PortalSchemaProviderHolder;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.Environment;
-import org.springframework.data.domain.AuditorAware;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jndi.JndiObjectFactoryBean;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
diff --git a/src/main/java/com/eactive/apim/portal/config/EmsDatasourceProperty.java b/src/main/java/com/eactive/apim/portal/config/EmsDatasourceProperty.java
index 66d4daa..0ac89c0 100644
--- a/src/main/java/com/eactive/apim/portal/config/EmsDatasourceProperty.java
+++ b/src/main/java/com/eactive/apim/portal/config/EmsDatasourceProperty.java
@@ -1,13 +1,20 @@
 package com.eactive.apim.portal.config;
 
+import com.eactive.eai.rms.data.PortalSchemaProviderHolder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+
 @EqualsAndHashCode(callSuper = true)
 @Component
 @ConfigurationProperties(prefix = "ems.datasource")
 @Data
 public class EmsDatasourceProperty extends DatasourceProperty {
+    @PostConstruct
+    public void init() {
+        PortalSchemaProviderHolder.setProvider(this::getSchema);
+    }
 }