diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
index 1e60eaf4953..beacb3c4366 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
@@ -48,6 +48,7 @@ import static org.openmetadata.service.util.EntityUtil.fieldAdded;
 import static org.openmetadata.service.util.EntityUtil.fieldDeleted;
 import static org.openmetadata.service.util.EntityUtil.fieldUpdated;
 import static org.openmetadata.service.util.EntityUtil.getColumnField;
+import static org.openmetadata.service.util.EntityUtil.getEntityReferences;
 import static org.openmetadata.service.util.EntityUtil.getExtensionField;
 import static org.openmetadata.service.util.EntityUtil.nextMajorVersion;
 import static org.openmetadata.service.util.EntityUtil.nextVersion;
@@ -81,16 +82,17 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.annotation.CheckForNull;
 import javax.json.JsonPatch;
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 import lombok.Getter;
+import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.openmetadata.common.utils.CommonUtil;
+import org.openmetadata.schema.CreateEntity;
 import org.openmetadata.schema.EntityInterface;
 import org.openmetadata.schema.api.VoteRequest;
 import org.openmetadata.schema.api.feed.ResolveTask;
@@ -428,6 +430,23 @@ public abstract class EntityRepository<T extends EntityInterface> {
     LOG.info("Created a new {} {}", entityType, entity.getFullyQualifiedName());
   }
 
+  public final T copy(T entity, CreateEntity request, String updatedBy) {
+    EntityReference owner = validateOwner(request.getOwner());
+    EntityReference domain = validateDomain(request.getDomain());
+    entity.setId(UUID.randomUUID());
+    entity.setName(request.getName());
+    entity.setDisplayName(request.getDisplayName());
+    entity.setDescription(request.getDescription());
+    entity.setOwner(owner);
+    entity.setDomain(domain);
+    entity.setDataProducts(getEntityReferences(Entity.DATA_PRODUCT, request.getDataProducts()));
+    entity.setLifeCycle(request.getLifeCycle());
+    entity.setExtension(request.getExtension());
+    entity.setUpdatedBy(updatedBy);
+    entity.setUpdatedAt(System.currentTimeMillis());
+    return entity;
+  }
+
   public EntityUpdater getUpdater(T original, T updated, Operation operation) {
     return new EntityUpdater(original, updated, operation);
   }
@@ -1370,7 +1389,7 @@ public abstract class EntityRepository<T extends EntityInterface> {
   public List<EntityReference> findFrom(
       UUID toId, String toEntityType, Relationship relationship, String fromEntityType) {
     List<EntityRelationshipRecord> records = findFromRecords(toId, toEntityType, relationship, fromEntityType);
-    return EntityUtil.getEntityReferences(records);
+    return getEntityReferences(records);
   }
 
   public List<EntityRelationshipRecord> findFromRecords(
@@ -1431,7 +1450,7 @@ public abstract class EntityRepository<T extends EntityInterface> {
       UUID fromId, String fromEntityType, Relationship relationship, String toEntityType) {
     // When toEntityType is null, all the relationships to any entity is returned
     List<EntityRelationshipRecord> records = findToRecords(fromId, fromEntityType, relationship, toEntityType);
-    return EntityUtil.getEntityReferences(records);
+    return getEntityReferences(records);
   }
 
   public final List<EntityRelationshipRecord> findToRecords(
@@ -2387,7 +2406,7 @@ public abstract class EntityRepository<T extends EntityInterface> {
 
   static class EntityLoaderWithName extends CacheLoader<Pair<String, String>, EntityInterface> {
     @Override
-    public EntityInterface load(@CheckForNull Pair<String, String> fqnPair) {
+    public @NonNull EntityInterface load(@NotNull Pair<String, String> fqnPair) {
       String entityType = fqnPair.getLeft();
       String fqn = fqnPair.getRight();
       EntityRepository<? extends EntityInterface> repository = Entity.getEntityRepository(entityType);
@@ -2397,7 +2416,7 @@ public abstract class EntityRepository<T extends EntityInterface> {
 
   static class EntityLoaderWithId extends CacheLoader<Pair<String, UUID>, EntityInterface> {
     @Override
-    public EntityInterface load(@NotNull Pair<String, UUID> idPair) {
+    public @NonNull EntityInterface load(@NotNull Pair<String, UUID> idPair) {
       String entityType = idPair.getLeft();
       UUID id = idPair.getRight();
       EntityRepository<? extends EntityInterface> repository = Entity.getEntityRepository(entityType);
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/EntityResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/EntityResource.java
index 3196034f903..5b7366e351b 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/EntityResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/EntityResource.java
@@ -19,7 +19,6 @@ import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriInfo;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.openmetadata.schema.CreateEntity;
 import org.openmetadata.schema.EntityInterface;
 import org.openmetadata.schema.type.EntityHistory;
 import org.openmetadata.schema.type.EntityReference;
@@ -289,23 +288,6 @@ public abstract class EntityResource<T extends EntityInterface, K extends Entity
     return repository.importFromCsv(name, csv, dryRun, securityContext.getUserPrincipal().getName());
   }
 
-  public T copy(T entity, CreateEntity request, String updatedBy) {
-    EntityReference owner = repository.validateOwner(request.getOwner());
-    EntityReference domain = repository.validateDomain(request.getDomain());
-    entity.setId(UUID.randomUUID());
-    entity.setName(request.getName());
-    entity.setDisplayName(request.getDisplayName());
-    entity.setDescription(request.getDescription());
-    entity.setOwner(owner);
-    entity.setDomain(domain);
-    entity.setDataProducts(getEntityReferences(Entity.DATA_PRODUCT, request.getDataProducts()));
-    entity.setLifeCycle(request.getLifeCycle());
-    entity.setExtension(request.getExtension());
-    entity.setUpdatedBy(updatedBy);
-    entity.setUpdatedAt(System.currentTimeMillis());
-    return entity;
-  }
-
   protected ResourceContext<T> getResourceContext() {
     return new ResourceContext<>(entityType);
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java
index 4a4bfb1aa54..de73544766c 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java
@@ -463,7 +463,8 @@ public class WebAnalyticEventResource extends EntityResource<WebAnalyticEvent, W
   }
 
   private WebAnalyticEvent getWebAnalyticEvent(CreateWebAnalyticEvent create, String user) {
-    return copy(new WebAnalyticEvent(), create, user)
+    return repository
+        .copy(new WebAnalyticEvent(), create, user)
         .withName(create.getName())
         .withDisplayName(create.getDisplayName())
         .withDescription(create.getDescription())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMarketPlaceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMarketPlaceResource.java
index c9e78c4a9f3..f5eb50a9898 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMarketPlaceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMarketPlaceResource.java
@@ -354,7 +354,8 @@ public class AppMarketPlaceResource extends EntityResource<AppMarketPlaceDefinit
   private AppMarketPlaceDefinition getApplicationDefinition(
       CreateAppMarketPlaceDefinitionReq create, String updatedBy) {
     AppMarketPlaceDefinition app =
-        copy(new AppMarketPlaceDefinition(), create, updatedBy)
+        repository
+            .copy(new AppMarketPlaceDefinition(), create, updatedBy)
             .withDeveloper(create.getDeveloper())
             .withDeveloperUrl(create.getDeveloperUrl())
             .withSupportEmail(create.getSupportEmail())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/automations/WorkflowResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/automations/WorkflowResource.java
index f7828793b0d..2b637441779 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/automations/WorkflowResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/automations/WorkflowResource.java
@@ -444,7 +444,8 @@ public class WorkflowResource extends EntityResource<Workflow, WorkflowRepositor
   private Workflow getWorkflow(CreateWorkflow create, String user) {
     OpenMetadataConnection openMetadataServerConnection =
         new OpenMetadataConnectionBuilder(openMetadataApplicationConfig).build();
-    return copy(new Workflow(), create, user)
+    return repository
+        .copy(new Workflow(), create, user)
         .withDescription(create.getDescription())
         .withRequest(create.getRequest())
         .withWorkflowType(create.getWorkflowType())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/bots/BotResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/bots/BotResource.java
index 0368f722dbd..ee40fff1e86 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/bots/BotResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/bots/BotResource.java
@@ -378,7 +378,8 @@ public class BotResource extends EntityResource<Bot, BotRepository> {
   }
 
   private Bot getBot(CreateBot create, String user) {
-    return copy(new Bot(), create, user)
+    return repository
+        .copy(new Bot(), create, user)
         .withBotUser(getEntityReference(Entity.USER, create.getBotUser()))
         .withProvider(create.getProvider())
         .withFullyQualifiedName(create.getName());
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/charts/ChartResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/charts/ChartResource.java
index 77b2c49ae77..5ffae063a1f 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/charts/ChartResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/charts/ChartResource.java
@@ -426,7 +426,8 @@ public class ChartResource extends EntityResource<Chart, ChartRepository> {
   }
 
   private Chart getChart(CreateChart create, String user) {
-    return copy(new Chart(), create, user)
+    return repository
+        .copy(new Chart(), create, user)
         .withService(EntityUtil.getEntityReference(Entity.DASHBOARD_SERVICE, create.getService()))
         .withChartType(create.getChartType())
         .withSourceUrl(create.getSourceUrl())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/dashboards/DashboardResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/dashboards/DashboardResource.java
index 7353d4448ab..dfedc791afb 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/dashboards/DashboardResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/dashboards/DashboardResource.java
@@ -437,7 +437,8 @@ public class DashboardResource extends EntityResource<Dashboard, DashboardReposi
   }
 
   private Dashboard getDashboard(CreateDashboard create, String user) {
-    return copy(new Dashboard(), create, user)
+    return repository
+        .copy(new Dashboard(), create, user)
         .withService(getEntityReference(Entity.DASHBOARD_SERVICE, create.getService()))
         .withCharts(getEntityReferences(Entity.CHART, create.getCharts()))
         .withDataModels(getEntityReferences(Entity.DASHBOARD_DATA_MODEL, create.getDataModels()))
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/DatabaseResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/DatabaseResource.java
index 7ec901d2f30..c95d5a7cbed 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/DatabaseResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/DatabaseResource.java
@@ -402,7 +402,8 @@ public class DatabaseResource extends EntityResource<Database, DatabaseRepositor
   }
 
   private Database getDatabase(CreateDatabase create, String user) {
-    return copy(new Database(), create, user)
+    return repository
+        .copy(new Database(), create, user)
         .withService(getEntityReference(Entity.DATABASE_SERVICE, create.getService()))
         .withSourceUrl(create.getSourceUrl())
         .withRetentionPeriod(create.getRetentionPeriod());
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/DatabaseSchemaResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/DatabaseSchemaResource.java
index 8bf421778a0..7f88aa0d6c2 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/DatabaseSchemaResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/DatabaseSchemaResource.java
@@ -406,7 +406,8 @@ public class DatabaseSchemaResource extends EntityResource<DatabaseSchema, Datab
   }
 
   private DatabaseSchema getDatabaseSchema(CreateDatabaseSchema create, String user) {
-    return copy(new DatabaseSchema(), create, user)
+    return repository
+        .copy(new DatabaseSchema(), create, user)
         .withDatabase(getEntityReference(Entity.DATABASE, create.getDatabase()))
         .withTags(create.getTags())
         .withSourceUrl(create.getSourceUrl())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/StoredProcedureResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/StoredProcedureResource.java
index e42f93ea186..8e1afd48658 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/StoredProcedureResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/StoredProcedureResource.java
@@ -414,7 +414,8 @@ public class StoredProcedureResource extends EntityResource<StoredProcedure, Sto
   }
 
   private StoredProcedure getStoredProcedure(CreateStoredProcedure create, String user) {
-    return copy(new StoredProcedure(), create, user)
+    return repository
+        .copy(new StoredProcedure(), create, user)
         .withDatabaseSchema(getEntityReference(Entity.DATABASE_SCHEMA, create.getDatabaseSchema()))
         .withTags(create.getTags())
         .withStoredProcedureCode(create.getStoredProcedureCode())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/TableResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/TableResource.java
index 0fe0b88d9b0..244a4bf4369 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/TableResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/TableResource.java
@@ -937,7 +937,8 @@ public class TableResource extends EntityResource<Table, TableRepository> {
 
   private Table getTable(CreateTable create, String user) {
     return validateNewTable(
-            copy(new Table(), create, user)
+            repository
+                .copy(new Table(), create, user)
                 .withColumns(create.getColumns())
                 .withSourceUrl(create.getSourceUrl())
                 .withTableConstraints(create.getTableConstraints())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/datainsight/DataInsightChartResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/datainsight/DataInsightChartResource.java
index d752610360b..7d38ddeb4d0 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/datainsight/DataInsightChartResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/datainsight/DataInsightChartResource.java
@@ -442,7 +442,8 @@ public class DataInsightChartResource extends EntityResource<DataInsightChart, D
   }
 
   private DataInsightChart getDataInsightChart(CreateDataInsightChart create, String user) {
-    return copy(new DataInsightChart(), create, user)
+    return repository
+        .copy(new DataInsightChart(), create, user)
         .withName(create.getName())
         .withDescription(create.getDescription())
         .withDataIndexType(create.getDataIndexType())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/datamodels/DashboardDataModelResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/datamodels/DashboardDataModelResource.java
index c09c0b2b4e1..a86b798fa8d 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/datamodels/DashboardDataModelResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/datamodels/DashboardDataModelResource.java
@@ -439,7 +439,8 @@ public class DashboardDataModelResource extends EntityResource<DashboardDataMode
 
   private DashboardDataModel getDataModel(CreateDashboardDataModel create, String user) {
     DatabaseUtil.validateColumns(create.getColumns());
-    return copy(new DashboardDataModel(), create, user)
+    return repository
+        .copy(new DashboardDataModel(), create, user)
         .withService(EntityUtil.getEntityReference(Entity.DASHBOARD_SERVICE, create.getService()))
         .withDataModelType(create.getDataModelType())
         .withSql(create.getSql())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/docstore/DocStoreResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/docstore/DocStoreResource.java
index 7ab17dd805e..915df9356c2 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/docstore/DocStoreResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/docstore/DocStoreResource.java
@@ -340,7 +340,8 @@ public class DocStoreResource extends EntityResource<Document, DocumentRepositor
   }
 
   private Document getDocument(CreateDocument cd, String user) {
-    return copy(new Document(), cd, user)
+    return repository
+        .copy(new Document(), cd, user)
         .withFullyQualifiedName(cd.getFullyQualifiedName())
         .withData(cd.getData())
         .withEntityType(cd.getEntityType());
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/domains/DataProductResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/domains/DataProductResource.java
index 2a365bea8b0..a2bedb2b2e9 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/domains/DataProductResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/domains/DataProductResource.java
@@ -331,7 +331,8 @@ public class DataProductResource extends EntityResource<DataProduct, DataProduct
   private DataProduct getDataProduct(CreateDataProduct create, String user) {
     List<String> experts = create.getExperts();
     DataProduct dataProduct =
-        copy(new DataProduct(), create, user)
+        repository
+            .copy(new DataProduct(), create, user)
             .withFullyQualifiedName(create.getName())
             .withStyle(create.getStyle())
             .withExperts(EntityUtil.populateEntityReferences(getEntityReferences(Entity.USER, experts)));
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/domains/DomainResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/domains/DomainResource.java
index e00d9c87935..55f8bc6bd20 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/domains/DomainResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/domains/DomainResource.java
@@ -311,7 +311,8 @@ public class DomainResource extends EntityResource<Domain, DomainRepository> {
 
   private Domain getDomain(CreateDomain create, String user) {
     List<String> experts = create.getExperts();
-    return copy(new Domain(), create, user)
+    return repository
+        .copy(new Domain(), create, user)
         .withStyle(create.getStyle())
         .withDomainType(create.getDomainType())
         .withFullyQualifiedName(create.getName())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestCaseResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestCaseResource.java
index 75815647995..86e9c615268 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestCaseResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestCaseResource.java
@@ -648,7 +648,8 @@ public class TestCaseResource extends EntityResource<TestCase, TestCaseRepositor
   }
 
   private TestCase getTestCase(CreateTestCase create, String user, EntityLink entityLink) {
-    return copy(new TestCase(), create, user)
+    return repository
+        .copy(new TestCase(), create, user)
         .withDescription(create.getDescription())
         .withName(create.getName())
         .withDisplayName(create.getDisplayName())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestDefinitionResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestDefinitionResource.java
index 7de317fc84d..f86009f7730 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestDefinitionResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestDefinitionResource.java
@@ -382,7 +382,8 @@ public class TestDefinitionResource extends EntityResource<TestDefinition, TestD
   }
 
   private TestDefinition getTestDefinition(CreateTestDefinition create, String user) {
-    return copy(new TestDefinition(), create, user)
+    return repository
+        .copy(new TestDefinition(), create, user)
         .withDescription(create.getDescription())
         .withEntityType(create.getEntityType())
         .withTestPlatforms(create.getTestPlatforms())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestSuiteResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestSuiteResource.java
index 28b2377ec79..c81b15f8096 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestSuiteResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/dqtests/TestSuiteResource.java
@@ -533,7 +533,8 @@ public class TestSuiteResource extends EntityResource<TestSuite, TestSuiteReposi
 
   private TestSuite getTestSuite(CreateTestSuite create, String user) {
     TestSuite testSuite =
-        copy(new TestSuite(), create, user)
+        repository
+            .copy(new TestSuite(), create, user)
             .withDescription(create.getDescription())
             .withDisplayName(create.getDisplayName())
             .withName(create.getName());
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/events/subscription/EventSubscriptionResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/events/subscription/EventSubscriptionResource.java
index ce28930bccf..5a0d45053d9 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/events/subscription/EventSubscriptionResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/events/subscription/EventSubscriptionResource.java
@@ -540,7 +540,8 @@ public class EventSubscriptionResource extends EntityResource<EventSubscription,
   }
 
   public EventSubscription getEventSubscription(CreateEventSubscription create, String user) {
-    return copy(new EventSubscription(), create, user)
+    return repository
+        .copy(new EventSubscription(), create, user)
         .withAlertType(create.getAlertType())
         .withTrigger(create.getTrigger())
         .withEnabled(create.getEnabled())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryResource.java
index c19923121f1..ddb2ea102cb 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryResource.java
@@ -449,7 +449,8 @@ public class GlossaryResource extends EntityResource<Glossary, GlossaryRepositor
   }
 
   private Glossary getGlossary(CreateGlossary create, String user) {
-    return copy(new Glossary(), create, user)
+    return repository
+        .copy(new Glossary(), create, user)
         .withReviewers(getEntityReferences(Entity.USER, create.getReviewers()))
         .withTags(create.getTags())
         .withProvider(create.getProvider())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryTermResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryTermResource.java
index 5d1ff808825..bb873b382a0 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryTermResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryTermResource.java
@@ -441,7 +441,8 @@ public class GlossaryTermResource extends EntityResource<GlossaryTerm, GlossaryT
   }
 
   private GlossaryTerm getGlossaryTerm(CreateGlossaryTerm create, String user) {
-    return copy(new GlossaryTerm(), create, user)
+    return repository
+        .copy(new GlossaryTerm(), create, user)
         .withSynonyms(create.getSynonyms())
         .withStyle(create.getStyle())
         .withGlossary(getEntityReference(Entity.GLOSSARY, create.getGlossary()))
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/kpi/KpiResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/kpi/KpiResource.java
index a937b84cee3..2a538479341 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/kpi/KpiResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/kpi/KpiResource.java
@@ -461,7 +461,8 @@ public class KpiResource extends EntityResource<Kpi, KpiRepository> {
   }
 
   private Kpi getKpi(CreateKpiRequest create, String user) {
-    return copy(new Kpi(), create, user)
+    return repository
+        .copy(new Kpi(), create, user)
         .withStartDate(create.getStartDate())
         .withEndDate(create.getEndDate())
         .withTargetDefinition(create.getTargetDefinition())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/mlmodels/MlModelResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/mlmodels/MlModelResource.java
index 2de0e6dbe61..3267ed9f231 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/mlmodels/MlModelResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/mlmodels/MlModelResource.java
@@ -440,7 +440,8 @@ public class MlModelResource extends EntityResource<MlModel, MlModelRepository>
   }
 
   private MlModel getMlModel(CreateMlModel create, String user) {
-    return copy(new MlModel(), create, user)
+    return repository
+        .copy(new MlModel(), create, user)
         .withService(getEntityReference(Entity.MLMODEL_SERVICE, create.getService()))
         .withDashboard(getEntityReference(Entity.DASHBOARD, create.getDashboard()))
         .withAlgorithm(create.getAlgorithm())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/pipelines/PipelineResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/pipelines/PipelineResource.java
index 34d5041be20..4201e374d61 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/pipelines/PipelineResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/pipelines/PipelineResource.java
@@ -542,7 +542,8 @@ public class PipelineResource extends EntityResource<Pipeline, PipelineRepositor
   }
 
   private Pipeline getPipeline(CreatePipeline create, String user) {
-    return copy(new Pipeline(), create, user)
+    return repository
+        .copy(new Pipeline(), create, user)
         .withService(getEntityReference(Entity.PIPELINE_SERVICE, create.getService()))
         .withTasks(create.getTasks())
         .withSourceUrl(create.getSourceUrl())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/policies/PolicyResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/policies/PolicyResource.java
index 9010964a2e3..c33d332f683 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/policies/PolicyResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/policies/PolicyResource.java
@@ -453,7 +453,8 @@ public class PolicyResource extends EntityResource<Policy, PolicyRepository> {
   }
 
   private Policy getPolicy(CreatePolicy create, String user) {
-    Policy policy = copy(new Policy(), create, user).withRules(create.getRules()).withEnabled(create.getEnabled());
+    Policy policy =
+        repository.copy(new Policy(), create, user).withRules(create.getRules()).withEnabled(create.getEnabled());
     if (create.getLocation() != null) {
       policy = policy.withLocation(new EntityReference().withId(create.getLocation()));
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/query/QueryResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/query/QueryResource.java
index ecd5c013d07..108c21ed528 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/query/QueryResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/query/QueryResource.java
@@ -509,7 +509,8 @@ public class QueryResource extends EntityResource<Query, QueryRepository> {
   }
 
   private Query getQuery(CreateQuery create, String user) {
-    return copy(new Query(), create, user)
+    return repository
+        .copy(new Query(), create, user)
         .withTags(create.getTags())
         .withQuery(create.getQuery())
         .withService(getEntityReference(Entity.DATABASE_SERVICE, create.getService()))
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/searchindex/SearchIndexResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/searchindex/SearchIndexResource.java
index 5002ece223f..10f4c961406 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/searchindex/SearchIndexResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/searchindex/SearchIndexResource.java
@@ -490,7 +490,8 @@ public class SearchIndexResource extends EntityResource<SearchIndex, SearchIndex
   }
 
   private SearchIndex getSearchIndex(CreateSearchIndex create, String user) {
-    return copy(new SearchIndex(), create, user)
+    return repository
+        .copy(new SearchIndex(), create, user)
         .withService(getEntityReference(Entity.SEARCH_SERVICE, create.getService()))
         .withFields(create.getFields())
         .withSearchIndexSettings(create.getSearchIndexSettings())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceResource.java
index 319bb0a8eb6..7c0259b426f 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceResource.java
@@ -419,7 +419,8 @@ public class DashboardServiceResource
   }
 
   private DashboardService getService(CreateDashboardService create, String user) {
-    return copy(new DashboardService(), create, user)
+    return repository
+        .copy(new DashboardService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection());
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceResource.java
index ba349794f11..0525938d5ba 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceResource.java
@@ -434,7 +434,8 @@ public class DatabaseServiceResource
   }
 
   private DatabaseService getService(CreateDatabaseService create, String user) {
-    return copy(new DatabaseService(), create, user)
+    return repository
+        .copy(new DatabaseService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection());
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/ingestionpipelines/IngestionPipelineResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/ingestionpipelines/IngestionPipelineResource.java
index d153f534fd2..351a17d41d8 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/ingestionpipelines/IngestionPipelineResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/ingestionpipelines/IngestionPipelineResource.java
@@ -780,7 +780,8 @@ public class IngestionPipelineResource extends EntityResource<IngestionPipeline,
   private IngestionPipeline getIngestionPipeline(CreateIngestionPipeline create, String user) {
     OpenMetadataConnection openMetadataServerConnection =
         new OpenMetadataConnectionBuilder(openMetadataApplicationConfig).build();
-    return copy(new IngestionPipeline(), create, user)
+    return repository
+        .copy(new IngestionPipeline(), create, user)
         .withPipelineType(create.getPipelineType())
         .withAirflowConfig(create.getAirflowConfig())
         .withOpenMetadataServerConnection(openMetadataServerConnection)
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceResource.java
index b19a87004da..00828e304a5 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceResource.java
@@ -418,7 +418,8 @@ public class MessagingServiceResource
   }
 
   private MessagingService getService(CreateMessagingService create, String user) {
-    return copy(new MessagingService(), create, user)
+    return repository
+        .copy(new MessagingService(), create, user)
         .withConnection(create.getConnection())
         .withServiceType(create.getServiceType());
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceResource.java
index 0874d2c4b0d..5f5268225b4 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceResource.java
@@ -461,7 +461,8 @@ public class MetadataServiceResource
   }
 
   private MetadataService getMetadataService(CreateMetadataService create, String user) {
-    return copy(new MetadataService(), create, user)
+    return repository
+        .copy(new MetadataService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection());
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceResource.java
index 68a3e8c3a58..d9e19ff1c8a 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceResource.java
@@ -433,7 +433,8 @@ public class MlModelServiceResource
   }
 
   private MlModelService getService(CreateMlModelService create, String user) {
-    return copy(new MlModelService(), create, user)
+    return repository
+        .copy(new MlModelService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection());
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceResource.java
index 3597385e98e..c7ab1286f81 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceResource.java
@@ -434,7 +434,8 @@ public class PipelineServiceResource
   }
 
   private PipelineService getService(CreatePipelineService create, String user) {
-    return copy(new PipelineService(), create, user)
+    return repository
+        .copy(new PipelineService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection());
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceResource.java
index c2aef124995..ae7956a869e 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceResource.java
@@ -407,7 +407,8 @@ public class SearchServiceResource
   }
 
   private SearchService getService(CreateSearchService create, String user) {
-    return copy(new SearchService(), create, user)
+    return repository
+        .copy(new SearchService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection());
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceResource.java
index a8bed49e070..9f4775f10e7 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceResource.java
@@ -412,7 +412,8 @@ public class StorageServiceResource
   }
 
   private StorageService getService(CreateStorageService create, String user) {
-    return copy(new StorageService(), create, user)
+    return repository
+        .copy(new StorageService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection());
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/storages/ContainerResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/storages/ContainerResource.java
index 308e519cfe7..7308e6df5fe 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/storages/ContainerResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/storages/ContainerResource.java
@@ -440,7 +440,8 @@ public class ContainerResource extends EntityResource<Container, ContainerReposi
   }
 
   private Container getContainer(CreateContainer create, String user) {
-    return copy(new Container(), create, user)
+    return repository
+        .copy(new Container(), create, user)
         .withService(getEntityReference(Entity.STORAGE_SERVICE, create.getService()))
         .withParent(create.getParent())
         .withDataModel(create.getDataModel())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/tags/ClassificationResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/tags/ClassificationResource.java
index bba8242f111..75d9eb197bf 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/tags/ClassificationResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/tags/ClassificationResource.java
@@ -364,20 +364,16 @@ public class ClassificationResource extends EntityResource<Classification, Class
     return restoreEntity(uriInfo, securityContext, restore.getId());
   }
 
-  public static Classification getClassification(CreateClassification create, SecurityContext securityContext) {
-    return getClassification(create, securityContext.getUserPrincipal().getName());
+  private Classification getClassification(CreateClassification create, SecurityContext securityContext) {
+    return getClassification(repository, create, securityContext.getUserPrincipal().getName());
   }
 
-  public static Classification getClassification(CreateClassification create, String updatedBy) {
-    return new Classification()
-        .withId(UUID.randomUUID())
-        .withName(create.getName())
-        .withDisplayName(create.getDisplayName())
+  public static Classification getClassification(
+      ClassificationRepository repository, CreateClassification create, String updatedBy) {
+    return repository
+        .copy(new Classification(), create, updatedBy)
         .withFullyQualifiedName(create.getName())
         .withProvider(create.getProvider())
-        .withMutuallyExclusive(create.getMutuallyExclusive())
-        .withDescription(create.getDescription())
-        .withUpdatedBy(updatedBy)
-        .withUpdatedAt(System.currentTimeMillis());
+        .withMutuallyExclusive(create.getMutuallyExclusive());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/tags/TagResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/tags/TagResource.java
index 3ea0ee63bf8..6626567fabf 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/tags/TagResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/tags/TagResource.java
@@ -173,7 +173,8 @@ public class TagResource extends EntityResource<Tag, TagRepository> {
         EntityRepository.getEntitiesFromSeedData(CLASSIFICATION, ".*json/data/tags/.*\\.json$", LoadTags.class);
     for (LoadTags loadTags : loadTagsList) {
       Classification classification =
-          ClassificationResource.getClassification(loadTags.getCreateClassification(), ADMIN_USER_NAME);
+          ClassificationResource.getClassification(
+              classificationRepository, loadTags.getCreateClassification(), ADMIN_USER_NAME);
       classificationRepository.initializeEntity(classification);
 
       List<Tag> tagsToCreate = new ArrayList<>();
@@ -497,7 +498,8 @@ public class TagResource extends EntityResource<Tag, TagRepository> {
     String parentFQN = create.getParent() != null ? create.getParent() : create.getClassification();
     EntityReference classification = getEntityReference(CLASSIFICATION, create.getClassification());
     EntityReference parent = create.getParent() == null ? null : getEntityReference(TAG, create.getParent());
-    return copy(new Tag(), create, updateBy)
+    return repository
+        .copy(new Tag(), create, updateBy)
         .withFullyQualifiedName(FullyQualifiedName.add(parentFQN, create.getName()))
         .withStyle(create.getStyle())
         .withParent(parent)
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/PersonaResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/PersonaResource.java
index 7327cbb69b9..050f95c3137 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/PersonaResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/PersonaResource.java
@@ -326,6 +326,8 @@ public class PersonaResource extends EntityResource<Persona, PersonaRepository>
   }
 
   private Persona getPersona(CreatePersona cp, String user) {
-    return copy(new Persona(), cp, user).withUsers(EntityUtil.toEntityReferences(cp.getUsers(), Entity.USER));
+    return repository
+        .copy(new Persona(), cp, user)
+        .withUsers(EntityUtil.toEntityReferences(cp.getUsers(), Entity.USER));
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/RoleResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/RoleResource.java
index 360bf554fec..e7dcf406295 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/RoleResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/RoleResource.java
@@ -408,7 +408,9 @@ public class RoleResource extends EntityResource<Role, RoleRepository> {
     if (nullOrEmpty(create.getPolicies())) {
       throw new IllegalArgumentException("At least one policy is required to create a role");
     }
-    return copy(new Role(), create, user).withPolicies(getEntityReferences(Entity.POLICY, create.getPolicies()));
+    return repository
+        .copy(new Role(), create, user)
+        .withPolicies(getEntityReferences(Entity.POLICY, create.getPolicies()));
   }
 
   public static EntityReference getRole(String roleName) {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java
index 041aefc4fff..68bcfe325f3 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java
@@ -502,7 +502,8 @@ public class TeamResource extends EntityResource<Team, TeamRepository> {
     if (ct.getTeamType().equals(TeamType.GROUP) && ct.getChildren() != null) {
       throw new IllegalArgumentException(CREATE_GROUP);
     }
-    return copy(new Team(), ct, user)
+    return repository
+        .copy(new Team(), ct, user)
         .withProfile(ct.getProfile())
         .withIsJoinable(ct.getIsJoinable())
         .withUsers(EntityUtil.toEntityReferences(ct.getUsers(), Entity.USER))
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/topics/TopicResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/topics/TopicResource.java
index 92ad246b926..ee54b3efdc2 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/topics/TopicResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/topics/TopicResource.java
@@ -489,7 +489,8 @@ public class TopicResource extends EntityResource<Topic, TopicRepository> {
   }
 
   private Topic getTopic(CreateTopic create, String user) {
-    return copy(new Topic(), create, user)
+    return repository
+        .copy(new Topic(), create, user)
         .withService(getEntityReference(Entity.MESSAGING_SERVICE, create.getService()))
         .withPartitions(create.getPartitions())
         .withMessageSchema(create.getMessageSchema())
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/types/TypeResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/types/TypeResource.java
index ce72d6bb435..39a9597e36c 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/types/TypeResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/types/TypeResource.java
@@ -393,7 +393,8 @@ public class TypeResource extends EntityResource<Type, TypeRepository> {
   }
 
   private Type getType(CreateType create, String user) {
-    return copy(new Type(), create, user)
+    return repository
+        .copy(new Type(), create, user)
         .withFullyQualifiedName(create.getName())
         .withCategory(create.getCategory())
         .withSchema(create.getSchema());