diff --git a/openmetadata-sdk/fix_all_compilation_issues.sh b/openmetadata-sdk/fix_all_compilation_issues.sh
deleted file mode 100755
index 3a62d5a7266..00000000000
--- a/openmetadata-sdk/fix_all_compilation_issues.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-echo "Fixing all compilation issues in Fluent API..."
-
-# 1. Fix Policy imports (it's in policies package)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.data.Policy/org.openmetadata.schema.entity.policies.Policy/g' \
-  -e 's/org.openmetadata.schema.api.data.CreatePolicy/org.openmetadata.schema.api.policies.CreatePolicy/g' {} \;
-
-# 2. Remove references to CreateReport (doesn't exist, use CreateEntity pattern)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.api.data.CreateReport/org.openmetadata.schema.api.data.CreateTable/g' \
-  -e 's/CreateReport/CreateTable/g' {} \;
-
-# 3. Remove DataType references (replace with String literals)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/DataType\./ColumnDataType\./g' {} \;
-
-# 4. Remove references to non-existent Service wrappers and collections
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e '/import.*FluentDashboardService/d' \
-  -e '/import.*DashboardServiceCollection/d' \
-  -e '/import.*FluentPipelineService/d' \
-  -e '/import.*PipelineServiceCollection/d' \
-  -e '/import.*FluentMessagingService/d' \
-  -e '/import.*MessagingServiceCollection/d' \
-  -e '/import.*FluentMlModelService/d' \
-  -e '/import.*MlModelServiceCollection/d' \
-  -e '/import.*FluentPolicy/d' {} \;
-
-# 5. Remove method references to non-existent classes
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/DashboardServiceCollection list()/Object list()/g' \
-  -e 's/FluentDashboardService fluent/Object fluent/g' \
-  -e 's/PipelineServiceCollection list()/Object list()/g' \
-  -e 's/FluentPipelineService fluent/Object fluent/g' \
-  -e 's/MessagingServiceCollection list()/Object list()/g' \
-  -e 's/FluentMessagingService fluent/Object fluent/g' \
-  -e 's/MlModelServiceCollection list()/Object list()/g' \
-  -e 's/FluentMlModelService fluent/Object fluent/g' \
-  -e 's/FluentPolicy fluent/Object fluent/g' {} \;
-
-echo "Removing Report-related files since CreateReport doesn't exist..."
-rm -f src/main/java/org/openmetadata/sdk/fluent/Reports.java
-rm -f src/main/java/org/openmetadata/sdk/fluent/builders/ReportBuilder.java
-rm -f src/main/java/org/openmetadata/sdk/fluent/wrappers/FluentReport.java
-rm -f src/main/java/org/openmetadata/sdk/fluent/collections/ReportCollection.java
-
-echo "Fixes applied!"
\ No newline at end of file
diff --git a/openmetadata-sdk/fix_all_imports.sh b/openmetadata-sdk/fix_all_imports.sh
deleted file mode 100755
index 59010aa942f..00000000000
--- a/openmetadata-sdk/fix_all_imports.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-echo "Fixing all import issues..."
-
-# Fix Classification imports (should be in classification package)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.data.Classification/org.openmetadata.schema.entity.classification.Classification/g' \
-  -e 's/org.openmetadata.schema.api.data.CreateClassification/org.openmetadata.schema.api.classification.CreateClassification/g' {} \;
-
-# Fix Tag imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.classification.Tag/org.openmetadata.schema.entity.classification.Tag/g' \
-  -e 's/org.openmetadata.schema.api.classification.CreateTag/org.openmetadata.schema.api.classification.CreateTag/g' {} \;
-
-# Fix User/Team imports (they're in teams package)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.data.User/org.openmetadata.schema.entity.teams.User/g' \
-  -e 's/org.openmetadata.schema.entity.data.Team/org.openmetadata.schema.entity.teams.Team/g' \
-  -e 's/org.openmetadata.schema.api.data.CreateUser/org.openmetadata.schema.api.teams.CreateUser/g' \
-  -e 's/org.openmetadata.schema.api.data.CreateTeam/org.openmetadata.schema.api.teams.CreateTeam/g' {} \;
-
-# Fix Role imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.teams.Role/org.openmetadata.schema.entity.teams.Role/g' \
-  -e 's/org.openmetadata.schema.api.teams.CreateRole/org.openmetadata.schema.api.teams.CreateRole/g' {} \;
-
-# Fix DatabaseConnection to proper type
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/DatabaseConnection/Object/g' {} \;
-
-# Remove DataType references entirely (doesn't exist)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/String\./ColumnDataType\./g' {} \;
-
-# Remove non-existent wrappers
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e '/FluentTestDefinition/d' \
-  -e '/FluentRole/d' \
-  -e '/FluentStorageService/d' \
-  -e '/StorageServiceCollection/d' {} \;
-
-echo "Fixes applied!"
diff --git a/openmetadata-sdk/fix_imports.sh b/openmetadata-sdk/fix_imports.sh
deleted file mode 100755
index 5308d2ebe19..00000000000
--- a/openmetadata-sdk/fix_imports.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# Fix imports for entities in the fluent API
-
-echo "Fixing import issues in generated Fluent API..."
-
-# Fix Domain imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.api.data.CreateDomain/org.openmetadata.schema.api.domains.CreateDomain/g' \
-  -e 's/org.openmetadata.schema.entity.data.Domain/org.openmetadata.schema.entity.domains.Domain/g' {} \;
-
-# Fix DataProduct imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.api.data.CreateDataProduct/org.openmetadata.schema.api.domains.CreateDataProduct/g' \
-  -e 's/org.openmetadata.schema.entity.data.DataProduct/org.openmetadata.schema.entity.domains.DataProduct/g' {} \;
-
-# Fix Bot imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.api.bots/org.openmetadata.schema.api.teams/g' \
-  -e 's/org.openmetadata.schema.entity.bots/org.openmetadata.schema.entity.teams/g' {} \;
-
-# Fix Classification imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.classification.Classification/org.openmetadata.schema.entity.classification.Classification/g' \
-  -e 's/org.openmetadata.schema.entity.classification.Tag/org.openmetadata.schema.entity.classification.Tag/g' {} \;
-
-# Fix Tag imports (Tags are in classification package)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.data.Tag/org.openmetadata.schema.entity.classification.Tag/g' \
-  -e 's/org.openmetadata.schema.api.data.CreateTag/org.openmetadata.schema.api.classification.CreateTag/g' {} \;
-
-# Fix Role imports (Roles are in teams package)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.data.Role/org.openmetadata.schema.entity.teams.Role/g' \
-  -e 's/org.openmetadata.schema.api.data.CreateRole/org.openmetadata.schema.api.teams.CreateRole/g' {} \;
-
-# Fix Policy imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.policies/org.openmetadata.schema.entity.policies/g' \
-  -e 's/org.openmetadata.schema.api.policies/org.openmetadata.schema.api.policies/g' {} \;
-
-# Fix TestCase, TestDefinition, TestSuite imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.dataQuality/org.openmetadata.schema.tests/g' \
-  -e 's/org.openmetadata.schema.api.dataQuality/org.openmetadata.schema.api.tests/g' {} \;
-
-# Fix Report imports (Reports might not exist)
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/org.openmetadata.schema.entity.data.Report/org.openmetadata.schema.entity.data.Report/g' \
-  -e 's/org.openmetadata.schema.api.data.CreateReport/org.openmetadata.schema.api.data.CreateReport/g' {} \;
-
-# Remove non-existent imports
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e '/import org.openmetadata.sdk.fluent.options/d' \
-  -e '/import org.openmetadata.schema.type.DataType/d' \
-  -e '/import org.openmetadata.sdk.fluent.wrappers.FluentBot/d' \
-  -e '/import org.openmetadata.sdk.fluent.wrappers.FluentRole/d' \
-  -e '/import org.openmetadata.sdk.fluent.wrappers.FluentStorageService/d' \
-  -e '/import org.openmetadata.sdk.fluent.collections.StorageServiceCollection/d' {} \;
-
-# Remove references to non-existent classes in code
-find src/main/java/org/openmetadata/sdk/fluent -name "*.java" -exec sed -i '' \
-  -e 's/RequestOptions/Object/g' \
-  -e 's/DataType\./String./g' {} \;
-
-echo "Import fixes applied!"
\ No newline at end of file
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Chart.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Chart.java
index 26e6003709d..4e64c43e532 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Chart.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Chart.java
@@ -26,29 +26,7 @@ public class Chart {
 
   // Static CRUD methods
   public static org.openmetadata.schema.entity.data.Chart create(CreateChart request) {
-    // Convert CreateChart to Chart entity
-    org.openmetadata.schema.entity.data.Chart chart =
-        new org.openmetadata.schema.entity.data.Chart();
-    chart.setName(request.getName());
-    if (request.getDisplayName() != null) {
-      chart.setDisplayName(request.getDisplayName());
-    }
-    if (request.getDescription() != null) {
-      chart.setDescription(request.getDescription());
-    }
-    if (request.getOwners() != null) {
-      chart.setOwners(request.getOwners());
-    }
-    if (request.getTags() != null) {
-      chart.setTags(request.getTags());
-    }
-    if (request.getService() != null) {
-      chart.setService(
-          new org.openmetadata.schema.type.EntityReference()
-              .withFullyQualifiedName(request.getService())
-              .withType("dashboardService"));
-    }
-    return getClient().charts().create(chart);
+    return getClient().charts().create(request);
   }
 
   public static org.openmetadata.schema.entity.data.Chart retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Container.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Container.java
index d286654d005..356d1aa571e 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Container.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Container.java
@@ -25,26 +25,7 @@ public class Container extends org.openmetadata.schema.entity.data.Container {
 
   // Static CRUD methods - Stripe style
   public static org.openmetadata.schema.entity.data.Container create(CreateContainer request) {
-    // Convert CreateContainer to Container entity
-    org.openmetadata.schema.entity.data.Container container =
-        new org.openmetadata.schema.entity.data.Container();
-    container.setName(request.getName());
-    container.setDisplayName(request.getDisplayName());
-    container.setDescription(request.getDescription());
-    container.setOwners(request.getOwners());
-    container.setParent(request.getParent());
-    container.setDataModel(request.getDataModel());
-    container.setPrefix(request.getPrefix());
-    container.setNumberOfObjects(request.getNumberOfObjects());
-    container.setSize(request.getSize());
-    container.setFileFormats(request.getFileFormats());
-    container.setExtension(request.getExtension());
-    container.setSourceHash(request.getSourceHash());
-    container.setLifeCycle(request.getLifeCycle());
-    container.setSourceUrl(request.getSourceUrl());
-
-    return (org.openmetadata.schema.entity.data.Container)
-        getClient().containers().create(container);
+    return getClient().containers().create(request);
   }
 
   public static org.openmetadata.schema.entity.data.Container retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Dashboard.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Dashboard.java
index 96098a36635..32fded67d4a 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Dashboard.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Dashboard.java
@@ -25,21 +25,7 @@ public class Dashboard extends org.openmetadata.schema.entity.data.Dashboard {
 
   // Static CRUD methods - Stripe style
   public static org.openmetadata.schema.entity.data.Dashboard create(CreateDashboard request) {
-    // Convert CreateDashboard to Dashboard entity
-    org.openmetadata.schema.entity.data.Dashboard dashboard =
-        new org.openmetadata.schema.entity.data.Dashboard();
-    dashboard.setName(request.getName());
-    dashboard.setDisplayName(request.getDisplayName());
-    dashboard.setDescription(request.getDescription());
-    dashboard.setOwners(request.getOwners());
-    dashboard.setProject(request.getProject());
-    dashboard.setExtension(request.getExtension());
-    dashboard.setSourceHash(request.getSourceHash());
-    dashboard.setLifeCycle(request.getLifeCycle());
-    dashboard.setSourceUrl(request.getSourceUrl());
-
-    return (org.openmetadata.schema.entity.data.Dashboard)
-        getClient().dashboards().create(dashboard);
+    return getClient().dashboards().create(request);
   }
 
   public static org.openmetadata.schema.entity.data.Dashboard retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Glossary.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Glossary.java
index 96f9fc83d05..77d3574a96f 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Glossary.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Glossary.java
@@ -26,23 +26,7 @@ public class Glossary {
 
   // Static CRUD methods
   public static org.openmetadata.schema.entity.data.Glossary create(CreateGlossary request) {
-    // Convert CreateGlossary to Glossary
-    org.openmetadata.schema.entity.data.Glossary entity =
-        new org.openmetadata.schema.entity.data.Glossary();
-    entity.setName(request.getName());
-    if (request.getDisplayName() != null) {
-      entity.setDisplayName(request.getDisplayName());
-    }
-    if (request.getDescription() != null) {
-      entity.setDescription(request.getDescription());
-    }
-    if (request.getOwners() != null) {
-      entity.setOwners(request.getOwners());
-    }
-    if (request.getTags() != null) {
-      entity.setTags(request.getTags());
-    }
-    return getClient().glossaries().create(entity);
+    return getClient().glossaries().create(request);
   }
 
   public static org.openmetadata.schema.entity.data.Glossary retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/MlModel.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/MlModel.java
index 8283196a22e..bc25758f90d 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/MlModel.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/MlModel.java
@@ -25,24 +25,7 @@ public class MlModel extends org.openmetadata.schema.entity.data.MlModel {
 
   // Static CRUD methods - Stripe style
   public static org.openmetadata.schema.entity.data.MlModel create(CreateMlModel request) {
-    // Convert CreateMlModel to MlModel entity
-    org.openmetadata.schema.entity.data.MlModel mlModel =
-        new org.openmetadata.schema.entity.data.MlModel();
-    mlModel.setName(request.getName());
-    mlModel.setDisplayName(request.getDisplayName());
-    mlModel.setDescription(request.getDescription());
-    mlModel.setOwners(request.getOwners());
-    mlModel.setAlgorithm(request.getAlgorithm());
-    mlModel.setMlFeatures(request.getMlFeatures());
-    mlModel.setMlHyperParameters(request.getMlHyperParameters());
-    mlModel.setTarget(request.getTarget());
-    mlModel.setMlStore(request.getMlStore());
-    mlModel.setExtension(request.getExtension());
-    mlModel.setSourceHash(request.getSourceHash());
-    mlModel.setLifeCycle(request.getLifeCycle());
-    mlModel.setSourceUrl(request.getSourceUrl());
-
-    return (org.openmetadata.schema.entity.data.MlModel) getClient().mlModels().create(mlModel);
+    return getClient().mlModels().create(request);
   }
 
   public static org.openmetadata.schema.entity.data.MlModel retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Pipeline.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Pipeline.java
index 4e947c3507c..a00c4c71650 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Pipeline.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Pipeline.java
@@ -25,23 +25,7 @@ public class Pipeline extends org.openmetadata.schema.entity.data.Pipeline {
 
   // Static CRUD methods - Stripe style
   public static org.openmetadata.schema.entity.data.Pipeline create(CreatePipeline request) {
-    // Convert CreatePipeline to Pipeline entity
-    org.openmetadata.schema.entity.data.Pipeline pipeline =
-        new org.openmetadata.schema.entity.data.Pipeline();
-    pipeline.setName(request.getName());
-    pipeline.setDisplayName(request.getDisplayName());
-    pipeline.setDescription(request.getDescription());
-    pipeline.setOwners(request.getOwners());
-    pipeline.setTasks(request.getTasks());
-    pipeline.setStartDate(request.getStartDate());
-    pipeline.setConcurrency(request.getConcurrency());
-    pipeline.setPipelineLocation(request.getPipelineLocation());
-    pipeline.setExtension(request.getExtension());
-    pipeline.setSourceHash(request.getSourceHash());
-    pipeline.setLifeCycle(request.getLifeCycle());
-    pipeline.setSourceUrl(request.getSourceUrl());
-
-    return (org.openmetadata.schema.entity.data.Pipeline) getClient().pipelines().create(pipeline);
+    return getClient().pipelines().create(request);
   }
 
   public static org.openmetadata.schema.entity.data.Pipeline retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Query.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Query.java
index 1a3eb18ff2c..022da98dc1c 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Query.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Query.java
@@ -25,20 +25,7 @@ public class Query extends org.openmetadata.schema.entity.data.Query {
 
   // Static CRUD methods - Stripe style
   public static org.openmetadata.schema.entity.data.Query create(CreateQuery request) {
-    // Convert CreateQuery to Query entity
-    org.openmetadata.schema.entity.data.Query query =
-        new org.openmetadata.schema.entity.data.Query();
-    query.setName(request.getName());
-    query.setDisplayName(request.getDisplayName());
-    query.setDescription(request.getDescription());
-    query.setOwners(request.getOwners());
-    query.setQuery(request.getQuery());
-    query.setQueryType(request.getQueryType());
-    query.setQueryDate(request.getQueryDate());
-    query.setDuration(request.getDuration());
-    query.setQueryUsedIn(request.getQueryUsedIn());
-
-    return (org.openmetadata.schema.entity.data.Query) getClient().queries().create(query);
+    return getClient().queries().create(request);
   }
 
   public static org.openmetadata.schema.entity.data.Query retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Tag.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Tag.java
index eb3266de313..ca85fd0550b 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Tag.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Tag.java
@@ -4,7 +4,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import org.openmetadata.schema.api.classification.CreateTag;
-import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.sdk.client.OpenMetadataClient;
 
 /**
@@ -27,23 +26,7 @@ public class Tag {
 
   // Static CRUD methods
   public static org.openmetadata.schema.entity.classification.Tag create(CreateTag request) {
-    // Convert CreateTag to Tag
-    org.openmetadata.schema.entity.classification.Tag entity =
-        new org.openmetadata.schema.entity.classification.Tag();
-    entity.setName(request.getName());
-    if (request.getDisplayName() != null) {
-      entity.setDisplayName(request.getDisplayName());
-    }
-    if (request.getDescription() != null) {
-      entity.setDescription(request.getDescription());
-    }
-    if (request.getClassification() != null) {
-      entity.setClassification(
-          new EntityReference()
-              .withFullyQualifiedName(request.getClassification())
-              .withType("classification"));
-    }
-    return getClient().tags().create(entity);
+    return getClient().tags().create(request);
   }
 
   public static org.openmetadata.schema.entity.classification.Tag retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Team.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Team.java
index a8bc0ab4ec2..cbda33e6186 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Team.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Team.java
@@ -25,17 +25,7 @@ public class Team extends org.openmetadata.schema.entity.teams.Team {
 
   // Static CRUD methods - Stripe style
   public static org.openmetadata.schema.entity.teams.Team create(CreateTeam request) {
-    // Convert CreateTeam to Team entity
-    org.openmetadata.schema.entity.teams.Team team =
-        new org.openmetadata.schema.entity.teams.Team();
-    team.setName(request.getName());
-    team.setDisplayName(request.getDisplayName());
-    team.setDescription(request.getDescription());
-    team.setTeamType(request.getTeamType());
-    team.setIsJoinable(request.getIsJoinable());
-    team.setProfile(request.getProfile());
-
-    return (org.openmetadata.schema.entity.teams.Team) getClient().teams().create(team);
+    return getClient().teams().create(request);
   }
 
   public static org.openmetadata.schema.entity.teams.Team retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Topic.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Topic.java
index b7ee8f9c27d..6442ed85c2f 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Topic.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/Topic.java
@@ -25,25 +25,7 @@ public class Topic extends org.openmetadata.schema.entity.data.Topic {
 
   // Static CRUD methods - Stripe style
   public static org.openmetadata.schema.entity.data.Topic create(CreateTopic request) {
-    // Convert CreateTopic to Topic entity
-    org.openmetadata.schema.entity.data.Topic topic =
-        new org.openmetadata.schema.entity.data.Topic();
-    topic.setName(request.getName());
-    topic.setDisplayName(request.getDisplayName());
-    topic.setDescription(request.getDescription());
-    topic.setOwners(request.getOwners());
-    topic.setMessageSchema(request.getMessageSchema());
-    topic.setPartitions(request.getPartitions());
-    topic.setCleanupPolicies(request.getCleanupPolicies());
-    topic.setReplicationFactor(request.getReplicationFactor());
-    topic.setRetentionTime(request.getRetentionTime());
-    topic.setRetentionSize(request.getRetentionSize());
-    topic.setExtension(request.getExtension());
-    topic.setSourceHash(request.getSourceHash());
-    topic.setLifeCycle(request.getLifeCycle());
-    topic.setSourceUrl(request.getSourceUrl());
-
-    return (org.openmetadata.schema.entity.data.Topic) getClient().topics().create(topic);
+    return getClient().topics().create(request);
   }
 
   public static org.openmetadata.schema.entity.data.Topic retrieve(String id) {
diff --git a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/User.java b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/User.java
index 897e859a568..52af24aeea9 100644
--- a/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/User.java
+++ b/openmetadata-sdk/src/main/java/org/openmetadata/sdk/entities/User.java
@@ -25,20 +25,7 @@ public class User extends org.openmetadata.schema.entity.teams.User {
 
   // Static CRUD methods - Stripe style
   public static org.openmetadata.schema.entity.teams.User create(CreateUser request) {
-    // Convert CreateUser to User entity
-    org.openmetadata.schema.entity.teams.User user =
-        new org.openmetadata.schema.entity.teams.User();
-    user.setName(request.getName());
-    user.setEmail(request.getEmail());
-    user.setDisplayName(request.getDisplayName());
-    user.setDescription(request.getDescription());
-    user.setProfile(request.getProfile());
-    user.setTimezone(request.getTimezone());
-    user.setIsBot(request.getIsBot());
-    user.setIsAdmin(request.getIsAdmin());
-    user.setAuthenticationMechanism(request.getAuthenticationMechanism());
-
-    return (org.openmetadata.schema.entity.teams.User) getClient().users().create(user);
+    return getClient().users().create(request);
   }
 
   public static org.openmetadata.schema.entity.teams.User retrieve(String id) {