diff --git a/.editorconfig b/.editorconfig
index 40dca25..8273cfc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -56,5 +56,8 @@ dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
 
+# IDE0090: Use 'new(...)'
+dotnet_diagnostic.IDE0090.severity = none
+
 [*.{csproj,proj,targets}]
 indent_size = 2
\ No newline at end of file
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlBulkInsertProvider.cs b/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlBulkInsertProvider.cs
index 445632f..2b2ef20 100644
--- a/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlBulkInsertProvider.cs
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlBulkInsertProvider.cs
@@ -1,3 +1,5 @@
+using JetBrains.Annotations;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Logging;
@@ -9,6 +11,7 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.MySql;
 
+[UsedImplicitly]
 internal class MySqlBulkInsertProvider(ILogger<MySqlBulkInsertProvider> logger) : BulkInsertProviderBase<MySqlServerDialectBuilder, MySqlBulkInsertOptions>(logger)
 {
     //language=sql
@@ -22,13 +25,13 @@ internal class MySqlBulkInsertProvider(ILogger<MySqlBulkInsertProvider> logger)
     protected override MySqlBulkInsertOptions CreateDefaultOptions() => new();
 
     /// <inheritdoc />
-    public override IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
+    protected override IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
         bool sync,
         DbContext context,
         TableMetadata tableInfo,
         IEnumerable<T> entities,
-        BulkInsertOptions options,
-        OnConflictOptions? onConflict = null,
+        MySqlBulkInsertOptions options,
+        OnConflictOptions<T>? onConflict = null,
         CancellationToken ctk = default)
     {
         throw new NotSupportedException("Provider does not support returning entities.");
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/Abstractions/IBulkInsertProvider.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/Abstractions/IBulkInsertProvider.cs
index a8fa8e6..e7e8756 100644
--- a/src/PhenX.EntityFrameworkCore.BulkInsert/Abstractions/IBulkInsertProvider.cs
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert/Abstractions/IBulkInsertProvider.cs
@@ -20,7 +20,7 @@ internal IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
         TableMetadata tableInfo,
         IEnumerable<T> entities,
         BulkInsertOptions options,
-        OnConflictOptions? onConflict = null,
+        OnConflictOptions<T>? onConflict = null,
         CancellationToken ctk = default
     ) where T : class;
 
@@ -33,7 +33,7 @@ internal Task BulkInsert<T>(
         TableMetadata tableInfo,
         IEnumerable<T> entities,
         BulkInsertOptions options,
-        OnConflictOptions? onConflict = null,
+        OnConflictOptions<T>? onConflict = null,
         CancellationToken ctk = default
     ) where T : class;
 
@@ -42,5 +42,5 @@ internal Task BulkInsert<T>(
     /// <summary>
     /// Make the default options for the provider, can be a subclass of <see cref="BulkInsertOptions"/>.
     /// </summary>
-    internal BulkInsertOptions InternalCreateDefaultOptions();
+    internal BulkInsertOptions CreateDefaultOptions();
 }
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertOptionsExtension.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertOptionsExtension.cs
index b62d69c..6060e64 100644
--- a/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertOptionsExtension.cs
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertOptionsExtension.cs
@@ -26,7 +26,6 @@ public void Validate(IDbContextOptions options)
 
     private class BulkInsertOptionsExtensionInfo(IDbContextOptionsExtension extension) : DbContextOptionsExtensionInfo(extension)
     {
-
         /// <inheritdoc />
         public override int GetServiceProviderHashCode() => 0;
 
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertProviderBase.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertProviderBase.cs
index 0e1d11e..bf9ea0f 100644
--- a/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertProviderBase.cs
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertProviderBase.cs
@@ -4,7 +4,6 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Logging;
 
-using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
 using PhenX.EntityFrameworkCore.BulkInsert.Dialect;
 using PhenX.EntityFrameworkCore.BulkInsert.Extensions;
 using PhenX.EntityFrameworkCore.BulkInsert.Metadata;
@@ -12,41 +11,25 @@
 
 namespace PhenX.EntityFrameworkCore.BulkInsert;
 
-internal abstract class BulkInsertProviderBase<TDialect, TOptions>(ILogger<BulkInsertProviderBase<TDialect, TOptions>> logger) : IBulkInsertProvider
+internal abstract class BulkInsertProviderBase<TDialect, TOptions>(ILogger? logger) : BulkInsertProviderUntyped<TDialect, TOptions>
     where TDialect : SqlDialectBuilder, new()
     where TOptions : BulkInsertOptions, new()
 {
-    protected readonly TDialect SqlDialect = new();
-
     protected virtual string BulkInsertId => "_bulk_insert_id";
 
     protected abstract string AddTableCopyBulkInsertId { get; }
 
     protected virtual string GetTempTableName(string tableName) => $"_temp_bulk_insert_{tableName}";
 
-    SqlDialectBuilder IBulkInsertProvider.SqlDialect => SqlDialect;
-
-    public BulkInsertOptions InternalCreateDefaultOptions() => CreateDefaultOptions();
-
-    /// <summary>
-    /// Create the default options for the provider, can be a subclass of <see cref="BulkInsertOptions"/>.
-    /// </summary>
-    protected abstract TOptions CreateDefaultOptions();
-
-    public virtual async IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
+    protected override async IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
         bool sync,
         DbContext context,
         TableMetadata tableInfo,
         IEnumerable<T> entities,
-        BulkInsertOptions options,
-        OnConflictOptions? onConflict,
+        TOptions options,
+        OnConflictOptions<T>? onConflict,
         [EnumeratorCancellation] CancellationToken ctk) where T : class
     {
-        if (options is not TOptions providerOptions)
-        {
-            throw new InvalidOperationException($"Invalid options type: {options.GetType().Name}. Expected: {typeof(TOptions).Name}");
-        }
-
         using var activity = Telemetry.ActivitySource.StartActivity("BulkInsertReturnEntities");
         activity?.AddTag("tableName", tableInfo.TableName);
         activity?.AddTag("synchronous", sync);
@@ -59,10 +42,10 @@ public virtual async IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
                 Log.UsingTempTableToReturnData(logger);
             }
 
-            var tableName = await PerformBulkInsertAsync(sync, context, tableInfo, entities, providerOptions, tempTableRequired: true, ctk: ctk);
+            var tableName = await PerformBulkInsertAsync(sync, context, tableInfo, entities, options, tempTableRequired: true, ctk: ctk);
 
             var result =
-                await CopyFromTempTableAsync<T, T>(sync, context, tableInfo, tableName, true, providerOptions, onConflict, ctk: ctk)
+                await CopyFromTempTableAsync<T, T>(sync, context, tableInfo, tableName, true, options, onConflict, ctk: ctk)
                     ?? throw new InvalidOperationException("Copy returns null enumerable.");
 
             await foreach (var item in result.WithCancellation(ctk))
@@ -79,20 +62,15 @@ await CopyFromTempTableAsync<T, T>(sync, context, tableInfo, tableName, true, pr
         }
     }
 
-    public virtual async Task BulkInsert<T>(
+    protected override async Task BulkInsert<T>(
         bool sync,
         DbContext context,
         TableMetadata tableInfo,
         IEnumerable<T> entities,
-        BulkInsertOptions options,
-        OnConflictOptions? onConflict,
+        TOptions options,
+        OnConflictOptions<T>? onConflict,
         CancellationToken ctk) where T : class
     {
-        if (options is not TOptions providerOptions)
-        {
-            throw new InvalidOperationException($"Invalid options type: {options.GetType().Name}. Expected: {typeof(TOptions).Name}");
-        }
-
         using var activity = Telemetry.ActivitySource.StartActivity("BulkInsert");
         activity?.AddTag("tableName", tableInfo.TableName);
         activity?.AddTag("synchronous", sync);
@@ -107,9 +85,9 @@ public virtual async Task BulkInsert<T>(
                     Log.UsingTempTableToResolveConflicts(logger);
                 }
 
-                var tableName = await PerformBulkInsertAsync(sync, context, tableInfo, entities, providerOptions, tempTableRequired: true, ctk: ctk);
+                var tableName = await PerformBulkInsertAsync(sync, context, tableInfo, entities, options, tempTableRequired: true, ctk: ctk);
 
-                await CopyFromTempTableAsync<T, T>(sync, context, tableInfo, tableName, false, providerOptions, onConflict, ctk);
+                await CopyFromTempTableAsync<T, T>(sync, context, tableInfo, tableName, false, options, onConflict, ctk);
             }
             else
             {
@@ -118,7 +96,7 @@ public virtual async Task BulkInsert<T>(
                     Log.UsingDirectInsert(logger);
                 }
 
-                await PerformBulkInsertAsync(sync, context, tableInfo, entities, providerOptions, tempTableRequired: false, ctk: ctk);
+                await PerformBulkInsertAsync(sync, context, tableInfo, entities, options, tempTableRequired: false, ctk: ctk);
             }
 
             // Commit the transaction if we own them.
@@ -207,7 +185,7 @@ protected virtual async Task AddBulkInsertIdColumn<T>(
         string tempTableName,
         bool returnData,
         TOptions options,
-        OnConflictOptions? onConflict,
+        OnConflictOptions<T>? onConflict,
         CancellationToken ctk) where T : class where TResult : class
     {
         var query =
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertProviderUntyped.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertProviderUntyped.cs
new file mode 100644
index 0000000..baab9b2
--- /dev/null
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert/BulkInsertProviderUntyped.cs
@@ -0,0 +1,76 @@
+using Microsoft.EntityFrameworkCore;
+
+using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+using PhenX.EntityFrameworkCore.BulkInsert.Dialect;
+using PhenX.EntityFrameworkCore.BulkInsert.Metadata;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert;
+
+internal abstract class BulkInsertProviderUntyped<TDialect, TOptions> : IBulkInsertProvider
+    where TDialect : SqlDialectBuilder, new()
+    where TOptions : BulkInsertOptions, new()
+{
+    protected readonly TDialect SqlDialect = new();
+
+    SqlDialectBuilder IBulkInsertProvider.SqlDialect => SqlDialect;
+
+    BulkInsertOptions IBulkInsertProvider.CreateDefaultOptions() => CreateDefaultOptions();
+
+    /// <summary>
+    /// Create the default options for the provider, can be a subclass of <see cref="BulkInsertOptions"/>.
+    /// </summary>
+    protected abstract TOptions CreateDefaultOptions();
+
+    public IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
+        bool sync,
+        DbContext context,
+        TableMetadata tableInfo,
+        IEnumerable<T> entities,
+        BulkInsertOptions options,
+        OnConflictOptions<T>? onConflict,
+        CancellationToken ctk) where T : class
+    {
+        if (options is not TOptions providerOptions)
+        {
+            throw new InvalidOperationException($"Invalid options type: {options.GetType().Name}. Expected: {typeof(TOptions).Name}");
+        }
+
+        return BulkInsertReturnEntities(sync, context, tableInfo, entities, providerOptions, onConflict, ctk);
+    }
+
+    protected abstract IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
+        bool sync,
+        DbContext context,
+        TableMetadata tableInfo,
+        IEnumerable<T> entities,
+        TOptions options,
+        OnConflictOptions<T>? onConflict,
+        CancellationToken ctk) where T : class;
+
+    public Task BulkInsert<T>(
+        bool sync,
+        DbContext context,
+        TableMetadata tableInfo,
+        IEnumerable<T> entities,
+        BulkInsertOptions options,
+        OnConflictOptions<T>? onConflict,
+        CancellationToken ctk) where T : class
+    {
+        if (options is not TOptions providerOptions)
+        {
+            throw new InvalidOperationException($"Invalid options type: {options.GetType().Name}. Expected: {typeof(TOptions).Name}");
+        }
+
+        return BulkInsert(sync, context, tableInfo, entities, providerOptions, onConflict, ctk);
+    }
+
+    protected abstract Task BulkInsert<T>(
+        bool sync,
+        DbContext context,
+        TableMetadata tableInfo,
+        IEnumerable<T> entities,
+        TOptions options,
+        OnConflictOptions<T>? onConflict,
+        CancellationToken ctk) where T : class;
+}
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/Dialect/SqlDialectBuilder.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/Dialect/SqlDialectBuilder.cs
index 3dc961a..801d044 100644
--- a/src/PhenX.EntityFrameworkCore.BulkInsert/Dialect/SqlDialectBuilder.cs
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert/Dialect/SqlDialectBuilder.cs
@@ -154,7 +154,7 @@ public string QuoteTableName(string? schema, string tableName)
     /// <summary>
     /// Gets column names for the insert statement, from an object initializer.
     /// </summary>
-    protected string[] GetColumns<T>(TableMetadata table, Expression<Func<T, object>> columns)
+    protected static string[] GetColumns<T>(TableMetadata table, Expression<Func<T, object>> columns)
     {
         return columns.Body switch
         {
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.DbContext.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.DbContext.cs
index 9bc410b..d4f14e4 100644
--- a/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.DbContext.cs
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.DbContext.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 
 using PhenX.EntityFrameworkCore.BulkInsert.Options;
 
@@ -60,7 +60,7 @@ public static Task<List<T>> ExecuteBulkInsertReturnEntitiesAsync<T, TConfig>(
         IEnumerable<T> entities,
         Action<TConfig> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
         where TConfig : BulkInsertOptions
@@ -68,7 +68,7 @@ public static Task<List<T>> ExecuteBulkInsertReturnEntitiesAsync<T, TConfig>(
         var dbSet = dbContext.Set<T>() ??
                     throw new InvalidOperationException($"DbSet of type {typeof(T).Name} not found in DbContext.");
 
-        return ExecuteBulkInsertReturnEntitiesCoreAsync(dbSet,false, entities, configure, onConflict, ctk);
+        return ExecuteBulkInsertReturnEntitiesCoreAsync(dbSet,false, entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -79,11 +79,11 @@ public static Task<List<T>> ExecuteBulkInsertReturnEntitiesAsync<T>(
         IEnumerable<T> entities,
         Action<BulkInsertOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        return ExecuteBulkInsertReturnEntitiesAsync<T, BulkInsertOptions>(dbContext, entities, configure, onConflict, ctk);
+        return ExecuteBulkInsertReturnEntitiesAsync<T, BulkInsertOptions>(dbContext, entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -93,11 +93,11 @@ public static Task<List<T>> ExecuteBulkInsertReturnEntitiesAsync<T>(
         this DbContext dbContext,
         IEnumerable<T> entities,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        return ExecuteBulkInsertReturnEntitiesAsync<T, BulkInsertOptions>(dbContext, entities, _ => { }, onConflict, ctk);
+        return ExecuteBulkInsertReturnEntitiesAsync<T, BulkInsertOptions>(dbContext, entities, _ => { }, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -108,7 +108,7 @@ public static IAsyncEnumerable<T> ExecuteBulkInsertReturnEnumerableAsync<T, TCon
         IEnumerable<T> entities,
         Action<TConfig> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
         where TConfig : BulkInsertOptions
@@ -116,7 +116,7 @@ public static IAsyncEnumerable<T> ExecuteBulkInsertReturnEnumerableAsync<T, TCon
         var dbSet = dbContext.Set<T>() ??
                     throw new InvalidOperationException($"DbSet of type {typeof(T).Name} not found in DbContext.");
 
-        return dbSet.ExecuteBulkInsertReturnEnumerableAsync(entities, configure, onConflict, ctk);
+        return dbSet.ExecuteBulkInsertReturnEnumerableAsync(entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -127,10 +127,10 @@ public static IAsyncEnumerable<T> ExecuteBulkInsertReturnEnumerableAsync<T>(
         IEnumerable<T> entities,
         Action<BulkInsertOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     ) where T : class
     {
-        return ExecuteBulkInsertReturnEnumerableAsync<T, BulkInsertOptions>(dbContext, entities, configure, onConflict, ctk);
+        return ExecuteBulkInsertReturnEnumerableAsync<T, BulkInsertOptions>(dbContext, entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -140,10 +140,10 @@ public static IAsyncEnumerable<T> ExecuteBulkInsertReturnEnumerableAsync<T>(
         this DbContext dbContext,
         IEnumerable<T> entities,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     ) where T : class
     {
-        return ExecuteBulkInsertReturnEnumerableAsync<T, BulkInsertOptions>(dbContext, entities, _ => { }, onConflict, ctk);
+        return ExecuteBulkInsertReturnEnumerableAsync<T, BulkInsertOptions>(dbContext, entities, _ => { }, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -154,7 +154,7 @@ public static async Task ExecuteBulkInsertAsync<T, TConfig>(
         IEnumerable<T> entities,
         Action<TConfig> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
         where TConfig : BulkInsertOptions
@@ -162,7 +162,7 @@ public static async Task ExecuteBulkInsertAsync<T, TConfig>(
         var dbSet = dbContext.Set<T>() ??
                     throw new InvalidOperationException($"DbSet of type {typeof(T).Name} not found in DbContext.");
 
-        await dbSet.ExecuteBulkInsertAsync(entities, configure, onConflict, ctk);
+        await dbSet.ExecuteBulkInsertAsync(entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -173,11 +173,11 @@ public static async Task ExecuteBulkInsertAsync<T>(
         IEnumerable<T> entities,
         Action<BulkInsertOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        await ExecuteBulkInsertAsync<T, BulkInsertOptions>(dbContext, entities, configure, onConflict, ctk);
+        await ExecuteBulkInsertAsync<T, BulkInsertOptions>(dbContext, entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -187,11 +187,11 @@ public static async Task ExecuteBulkInsertAsync<T>(
         this DbContext dbContext,
         IEnumerable<T> entities,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        await ExecuteBulkInsertAsync<T, BulkInsertOptions>(dbContext, entities, _ => { }, onConflict, ctk);
+        await ExecuteBulkInsertAsync<T, BulkInsertOptions>(dbContext, entities, _ => { }, onConflict, cancellationToken);
     }
 
     /// <summary>
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.DbSet.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.DbSet.cs
index 5aa9aef..83ab641 100644
--- a/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.DbSet.cs
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.DbSet.cs
@@ -57,12 +57,12 @@ public static Task<List<T>> ExecuteBulkInsertReturnEntitiesAsync<T, TOptions>(
         IEnumerable<T> entities,
         Action<TOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
         where TOptions : BulkInsertOptions
     {
-        return ExecuteBulkInsertReturnEntitiesCoreAsync(dbSet, false, entities, configure, onConflict, ctk);
+        return ExecuteBulkInsertReturnEntitiesCoreAsync(dbSet, false, entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -73,11 +73,11 @@ public static Task<List<T>> ExecuteBulkInsertReturnEntitiesAsync<T>(
         IEnumerable<T> entities,
         Action<BulkInsertOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        return ExecuteBulkInsertReturnEntitiesAsync<T, BulkInsertOptions>(dbSet, entities, configure, onConflict, ctk);
+        return ExecuteBulkInsertReturnEntitiesAsync<T, BulkInsertOptions>(dbSet, entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -87,11 +87,11 @@ public static Task<List<T>> ExecuteBulkInsertReturnEntitiesAsync<T>(
         this DbSet<T> dbSet,
         IEnumerable<T> entities,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        return ExecuteBulkInsertReturnEntitiesAsync<T, BulkInsertOptions>(dbSet, entities, _ => { }, onConflict, ctk);
+        return ExecuteBulkInsertReturnEntitiesAsync<T, BulkInsertOptions>(dbSet, entities, _ => { }, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -102,7 +102,7 @@ public static IAsyncEnumerable<T> ExecuteBulkInsertReturnEnumerableAsync<T, TOpt
         IEnumerable<T> entities,
         Action<TOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
         where TOptions : BulkInsertOptions
@@ -110,7 +110,7 @@ public static IAsyncEnumerable<T> ExecuteBulkInsertReturnEnumerableAsync<T, TOpt
         var (provider, context, options) = InitProvider(dbSet, configure);
 
         return provider.BulkInsertReturnEntities(false, context, dbSet.GetDbContext().GetTableInfo<T>(), entities,
-            options, onConflict, ctk);
+            options, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -121,11 +121,11 @@ public static IAsyncEnumerable<T> ExecuteBulkInsertReturnEnumerableAsync<T>(
         IEnumerable<T> entities,
         Action<BulkInsertOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        return ExecuteBulkInsertReturnEnumerableAsync<T, BulkInsertOptions>(dbSet, entities, configure, onConflict, ctk);
+        return ExecuteBulkInsertReturnEnumerableAsync<T, BulkInsertOptions>(dbSet, entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -135,11 +135,11 @@ public static IAsyncEnumerable<T> ExecuteBulkInsertReturnEnumerableAsync<T>(
         this DbSet<T> dbSet,
         IEnumerable<T> entities,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        return ExecuteBulkInsertReturnEnumerableAsync<T, BulkInsertOptions>(dbSet, entities, _ => { }, onConflict, ctk);
+        return ExecuteBulkInsertReturnEnumerableAsync<T, BulkInsertOptions>(dbSet, entities, _ => { }, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -150,7 +150,7 @@ public static async Task ExecuteBulkInsertAsync<T, TOptions>(
         IEnumerable<T> entities,
         Action<TOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
         where TOptions : BulkInsertOptions
@@ -158,7 +158,7 @@ public static async Task ExecuteBulkInsertAsync<T, TOptions>(
         var (provider, context, options) = InitProvider(dbSet, configure);
 
         await provider.BulkInsert(false, context, dbSet.GetDbContext().GetTableInfo<T>(), entities, options, onConflict,
-            ctk);
+            cancellationToken);
     }
 
     /// <summary>
@@ -169,11 +169,11 @@ public static async Task ExecuteBulkInsertAsync<T>(
         IEnumerable<T> entities,
         Action<BulkInsertOptions> configure,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        await ExecuteBulkInsertAsync<T, BulkInsertOptions>(dbSet, entities, configure, onConflict, ctk);
+        await ExecuteBulkInsertAsync<T, BulkInsertOptions>(dbSet, entities, configure, onConflict, cancellationToken);
     }
 
     /// <summary>
@@ -183,11 +183,11 @@ public static async Task ExecuteBulkInsertAsync<T>(
         this DbSet<T> dbSet,
         IEnumerable<T> entities,
         OnConflictOptions<T>? onConflict = null,
-        CancellationToken ctk = default
+        CancellationToken cancellationToken = default
     )
         where T : class
     {
-        await ExecuteBulkInsertAsync<T, BulkInsertOptions>(dbSet, entities, _ => { }, onConflict, ctk);
+        await ExecuteBulkInsertAsync<T, BulkInsertOptions>(dbSet, entities, _ => { }, onConflict, cancellationToken);
     }
 
     /// <summary>
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.cs
index cdcdf6e..25e46ed 100644
--- a/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.cs
+++ b/src/PhenX.EntityFrameworkCore.BulkInsert/Extensions/PublicExtensions.cs
@@ -49,8 +49,7 @@ private static (IBulkInsertProvider, DbContext, TOptions) InitProvider<T, TOptio
     {
         var context = dbSet.GetDbContext();
         var provider = context.GetService<IBulkInsertProvider>();
-        var options = provider.InternalCreateDefaultOptions();
-
+        var options = provider.CreateDefaultOptions();
         if (options is not TOptions castedOptions)
         {
             throw new InvalidOperationException($"Options type mismatch. Expected {options.GetType().Name}, but got {typeof(TOptions).Name}.");