diff --git a/gms/factories/src/main/java/com/linkedin/gms/factory/dataprocess/DataProcessDAOFactory.java b/gms/factories/src/main/java/com/linkedin/gms/factory/dataprocess/DataProcessDAOFactory.java
index 8e25647f9f..39f6c03d24 100644
--- a/gms/factories/src/main/java/com/linkedin/gms/factory/dataprocess/DataProcessDAOFactory.java
+++ b/gms/factories/src/main/java/com/linkedin/gms/factory/dataprocess/DataProcessDAOFactory.java
@@ -3,6 +3,7 @@ package com.linkedin.gms.factory.dataprocess;
 import com.linkedin.gms.factory.common.TopicConventionFactory;
 import com.linkedin.common.urn.DataProcessUrn;
 import com.linkedin.metadata.aspect.DataProcessAspect;
+import com.linkedin.metadata.dao.BaseLocalDAO;
 import com.linkedin.metadata.dao.EbeanLocalDAO;
 import com.linkedin.metadata.dao.producer.KafkaMetadataEventProducer;
 import com.linkedin.metadata.dao.producer.KafkaProducerCallback;
@@ -26,7 +27,7 @@ public class DataProcessDAOFactory {
 
   @Bean(name = "dataProcessDAO")
   @DependsOn({"gmsEbeanServiceConfig", "kafkaEventProducer", TopicConventionFactory.TOPIC_CONVENTION_BEAN})
-  protected EbeanLocalDAO<DataProcessAspect, DataProcessUrn> createInstance() {
+  protected BaseLocalDAO<DataProcessAspect, DataProcessUrn> createInstance() {
     KafkaMetadataEventProducer<DataProcessSnapshot, DataProcessAspect, DataProcessUrn> producer =
         new KafkaMetadataEventProducer(DataProcessSnapshot.class, DataProcessAspect.class,
             applicationContext.getBean(Producer.class), applicationContext.getBean(TopicConvention.class),
diff --git a/gms/factories/src/main/java/com/linkedin/gms/factory/dataset/DatasetDaoFactory.java b/gms/factories/src/main/java/com/linkedin/gms/factory/dataset/DatasetDaoFactory.java
index 7d574e396c..5763895ae5 100644
--- a/gms/factories/src/main/java/com/linkedin/gms/factory/dataset/DatasetDaoFactory.java
+++ b/gms/factories/src/main/java/com/linkedin/gms/factory/dataset/DatasetDaoFactory.java
@@ -3,6 +3,7 @@ package com.linkedin.gms.factory.dataset;
 import com.linkedin.gms.factory.common.TopicConventionFactory;
 import com.linkedin.common.urn.DatasetUrn;
 import com.linkedin.metadata.aspect.DatasetAspect;
+import com.linkedin.metadata.dao.BaseLocalDAO;
 import com.linkedin.metadata.dao.EbeanLocalDAO;
 import com.linkedin.metadata.dao.producer.KafkaMetadataEventProducer;
 import com.linkedin.metadata.dao.producer.KafkaProducerCallback;
@@ -24,7 +25,7 @@ public class DatasetDaoFactory {
 
   @Bean(name = "datasetDao")
   @DependsOn({"gmsEbeanServiceConfig", "kafkaEventProducer", TopicConventionFactory.TOPIC_CONVENTION_BEAN})
-  protected EbeanLocalDAO<DatasetAspect, DatasetUrn> createInstance() {
+  protected BaseLocalDAO<DatasetAspect, DatasetUrn> createInstance() {
     KafkaMetadataEventProducer<DatasetSnapshot, DatasetAspect, DatasetUrn> producer =
         new KafkaMetadataEventProducer(DatasetSnapshot.class, DatasetAspect.class,
             applicationContext.getBean(Producer.class), applicationContext.getBean(TopicConvention.class),
diff --git a/gms/factories/src/main/java/com/linkedin/gms/factory/identity/CorpGroupDaoFactory.java b/gms/factories/src/main/java/com/linkedin/gms/factory/identity/CorpGroupDaoFactory.java
index 57509c97eb..fff27a77f9 100644
--- a/gms/factories/src/main/java/com/linkedin/gms/factory/identity/CorpGroupDaoFactory.java
+++ b/gms/factories/src/main/java/com/linkedin/gms/factory/identity/CorpGroupDaoFactory.java
@@ -3,6 +3,7 @@ package com.linkedin.gms.factory.identity;
 import com.linkedin.gms.factory.common.TopicConventionFactory;
 import com.linkedin.common.urn.CorpGroupUrn;
 import com.linkedin.metadata.aspect.CorpGroupAspect;
+import com.linkedin.metadata.dao.BaseLocalDAO;
 import com.linkedin.metadata.dao.EbeanLocalDAO;
 import com.linkedin.metadata.dao.producer.KafkaMetadataEventProducer;
 import com.linkedin.metadata.snapshot.CorpGroupSnapshot;
@@ -26,7 +27,7 @@ public class CorpGroupDaoFactory {
   @Bean(name = "corpGroupDao")
   @DependsOn({"gmsEbeanServiceConfig", "kafkaEventProducer", TopicConventionFactory.TOPIC_CONVENTION_BEAN})
   @Nonnull
-  protected EbeanLocalDAO createInstance() {
+  protected BaseLocalDAO<CorpGroupAspect, CorpGroupUrn> createInstance() {
     KafkaMetadataEventProducer<CorpGroupSnapshot, CorpGroupAspect, CorpGroupUrn> producer =
         new KafkaMetadataEventProducer(CorpGroupSnapshot.class, CorpGroupAspect.class,
             applicationContext.getBean(Producer.class), applicationContext.getBean(TopicConvention.class));
diff --git a/gms/factories/src/main/java/com/linkedin/gms/factory/identity/CorpUserDaoFactory.java b/gms/factories/src/main/java/com/linkedin/gms/factory/identity/CorpUserDaoFactory.java
index ad5f95378a..06f17d8777 100644
--- a/gms/factories/src/main/java/com/linkedin/gms/factory/identity/CorpUserDaoFactory.java
+++ b/gms/factories/src/main/java/com/linkedin/gms/factory/identity/CorpUserDaoFactory.java
@@ -3,6 +3,7 @@ package com.linkedin.gms.factory.identity;
 import com.linkedin.gms.factory.common.TopicConventionFactory;
 import com.linkedin.common.urn.CorpuserUrn;
 import com.linkedin.metadata.aspect.CorpUserAspect;
+import com.linkedin.metadata.dao.BaseLocalDAO;
 import com.linkedin.metadata.dao.EbeanLocalDAO;
 import com.linkedin.metadata.dao.producer.KafkaMetadataEventProducer;
 import com.linkedin.metadata.snapshot.CorpUserSnapshot;
@@ -26,7 +27,7 @@ public class CorpUserDaoFactory {
   @Bean(name = "corpUserDao")
   @DependsOn({"gmsEbeanServiceConfig", "kafkaEventProducer", TopicConventionFactory.TOPIC_CONVENTION_BEAN})
   @Nonnull
-  protected EbeanLocalDAO createInstance() {
+  protected BaseLocalDAO<CorpUserAspect, CorpuserUrn> createInstance() {
     KafkaMetadataEventProducer<CorpUserSnapshot, CorpUserAspect, CorpuserUrn> producer =
         new KafkaMetadataEventProducer(CorpUserSnapshot.class, CorpUserAspect.class,
             applicationContext.getBean(Producer.class), applicationContext.getBean(TopicConvention.class));
diff --git a/gms/impl/src/main/java/com/linkedin/metadata/resources/dataprocess/BaseDataProcessesAspectResource.java b/gms/impl/src/main/java/com/linkedin/metadata/resources/dataprocess/BaseDataProcessesAspectResource.java
index 44ecbe8d6f..d45d5c2edd 100644
--- a/gms/impl/src/main/java/com/linkedin/metadata/resources/dataprocess/BaseDataProcessesAspectResource.java
+++ b/gms/impl/src/main/java/com/linkedin/metadata/resources/dataprocess/BaseDataProcessesAspectResource.java
@@ -5,7 +5,6 @@ import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.dataprocess.DataProcessKey;
 import com.linkedin.metadata.aspect.DataProcessAspect;
 import com.linkedin.metadata.dao.BaseLocalDAO;
-import com.linkedin.metadata.dao.EbeanLocalDAO;
 import com.linkedin.metadata.restli.BaseVersionedAspectResource;
 import com.linkedin.restli.common.ComplexResourceKey;
 import com.linkedin.restli.common.EmptyRecord;
@@ -27,7 +26,7 @@ public class BaseDataProcessesAspectResource<ASPECT extends RecordTemplate>
 
     @Inject
     @Named("dataProcessDAO")
-    private EbeanLocalDAO localDAO;
+    private BaseLocalDAO localDAO;
 
     @Nonnull
     @Override
diff --git a/gms/impl/src/main/java/com/linkedin/metadata/resources/identity/BaseCorpUsersAspectResource.java b/gms/impl/src/main/java/com/linkedin/metadata/resources/identity/BaseCorpUsersAspectResource.java
index c062867eb6..13096896bb 100644
--- a/gms/impl/src/main/java/com/linkedin/metadata/resources/identity/BaseCorpUsersAspectResource.java
+++ b/gms/impl/src/main/java/com/linkedin/metadata/resources/identity/BaseCorpUsersAspectResource.java
@@ -5,7 +5,6 @@ import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.identity.CorpUserKey;
 import com.linkedin.metadata.aspect.CorpUserAspect;
 import com.linkedin.metadata.dao.BaseLocalDAO;
-import com.linkedin.metadata.dao.EbeanLocalDAO;
 import com.linkedin.metadata.restli.BaseVersionedAspectResource;
 import com.linkedin.restli.common.ComplexResourceKey;
 import com.linkedin.restli.common.EmptyRecord;
@@ -28,7 +27,7 @@ public class BaseCorpUsersAspectResource<ASPECT extends RecordTemplate>
 
   @Inject
   @Named("corpUserDao")
-  private EbeanLocalDAO localDAO;
+  private BaseLocalDAO localDAO;
 
   @Nonnull
   @Override
@@ -41,5 +40,4 @@ public class BaseCorpUsersAspectResource<ASPECT extends RecordTemplate>
   protected CorpuserUrn getUrn(@PathKeysParam @Nonnull PathKeys keys) {
     return new CorpuserUrn(keys.<ComplexResourceKey<CorpUserKey, EmptyRecord>>get(CORPUSER_KEY).getKey().getName());
   }
-
 }
\ No newline at end of file