diff --git a/Pure.DI.sln b/Pure.DI.sln
index 68b67ed6..348a5ffc 100644
--- a/Pure.DI.sln
+++ b/Pure.DI.sln
@@ -94,6 +94,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorWebAssemblyApp", "sam
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherForecast", "samples\WeatherForecast\WeatherForecast.csproj", "{9A3E2271-3090-4BCE-BB48-6C0724CFBE44}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pure.DI.Kafka", "src\Pure.DI.Kafka\Pure.DI.Kafka.csproj", "{38E5C6EC-E1FB-4C9D-A054-D5F7BF6AF250}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -192,6 +194,10 @@ Global
 		{9A3E2271-3090-4BCE-BB48-6C0724CFBE44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A3E2271-3090-4BCE-BB48-6C0724CFBE44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A3E2271-3090-4BCE-BB48-6C0724CFBE44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38E5C6EC-E1FB-4C9D-A054-D5F7BF6AF250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38E5C6EC-E1FB-4C9D-A054-D5F7BF6AF250}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38E5C6EC-E1FB-4C9D-A054-D5F7BF6AF250}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38E5C6EC-E1FB-4C9D-A054-D5F7BF6AF250}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7C9E056B-CBA9-4548-9CDB-C5CE03C491B0} = {8163CDD7-7018-4301-A984-803C3807A6A6}
@@ -216,5 +222,6 @@ Global
 		{6C95BC87-DA77-4CE7-8CAB-9BEC254CEF51} = {FA80D231-C641-4A49-99C6-0C065D818B07}
 		{D1C043C4-ED8F-45C5-8077-EF10AA71B951} = {FA80D231-C641-4A49-99C6-0C065D818B07}
 		{9A3E2271-3090-4BCE-BB48-6C0724CFBE44} = {FA80D231-C641-4A49-99C6-0C065D818B07}
+		{38E5C6EC-E1FB-4C9D-A054-D5F7BF6AF250} = {8163CDD7-7018-4301-A984-803C3807A6A6}
 	EndGlobalSection
 EndGlobal
diff --git a/build/build.csproj b/build/build.csproj
index 5b5c913e..21e1fe8b 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -7,7 +7,10 @@
 
     <ItemGroup>
         <PackageReference Include="CSharpInteractive" Version="1.0.2"/>
-        <PackageReference Include="Pure.DI" Version="2.0.20" />
+        <PackageReference Include="Pure.DI" Version="2.0.21">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
         <ProjectReference Include="..\benchmarks\Pure.DI.Benchmarks\Pure.DI.Benchmarks.csproj"/>
     </ItemGroup>
diff --git a/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.csproj b/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.csproj
index c0505bcf..97dc568c 100644
--- a/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.csproj
+++ b/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.0.19">
+        <PackageReference Include="Pure.DI" Version="2.0.21">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Library.props b/src/Library.props
index 522cda1a..20324c76 100644
--- a/src/Library.props
+++ b/src/Library.props
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <IsPackable>true</IsPackable>
+        <ImplicitUsings>false</ImplicitUsings>
         <PackageId>$(BasePackageId).$(Library)</PackageId>
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <ContentTargetFolders>contentFiles</ContentTargetFolders>
diff --git a/src/Pure.DI.Core/Components/Api.g.cs b/src/Pure.DI.Core/Components/Api.g.cs
index 9db4d495..fae27689 100644
--- a/src/Pure.DI.Core/Components/Api.g.cs
+++ b/src/Pure.DI.Core/Components/Api.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
 #pragma warning disable
 
 #if NET20 || NET35 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
diff --git a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
index ef44cfed..2dc1de41 100644
--- a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
+++ b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
 #pragma warning disable
 namespace Pure.DI
 {    
diff --git a/src/Pure.DI.Core/Components/GenericTypeArguments.g.tt b/src/Pure.DI.Core/Components/GenericTypeArguments.g.tt
index 3c7a6fb6..fe949ab3 100644
--- a/src/Pure.DI.Core/Components/GenericTypeArguments.g.tt
+++ b/src/Pure.DI.Core/Components/GenericTypeArguments.g.tt
@@ -3,7 +3,7 @@
 <#@ assembly name="netstandard" #>
 <#@ import namespace="System.Collections.Generic" #>
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
 #pragma warning disable
 namespace Pure.DI
 {    
diff --git a/src/Pure.DI.Core/Features/Default.g.cs b/src/Pure.DI.Core/Features/Default.g.cs
index 079f9f5e..5ae30fe7 100644
--- a/src/Pure.DI.Core/Features/Default.g.cs
+++ b/src/Pure.DI.Core/Features/Default.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
 #pragma warning disable
 
 namespace Pure.DI
diff --git a/src/Pure.DI.Core/Pure.DI.Core.csproj b/src/Pure.DI.Core/Pure.DI.Core.csproj
index 1a2c4ba4..9bdfec94 100644
--- a/src/Pure.DI.Core/Pure.DI.Core.csproj
+++ b/src/Pure.DI.Core/Pure.DI.Core.csproj
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <RootNamespace>$(BasePackageId)</RootNamespace>
-        <DefineConstants>$(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V1</DefineConstants>
+        <DefineConstants>$(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V2</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.0.20">
+        <PackageReference Include="Pure.DI" Version="2.0.21">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Pure.DI.MS/ServiceCollectionFactory.g.cs b/src/Pure.DI.MS/ServiceCollectionFactory.g.cs
index c8987dbb..4ba01685 100644
--- a/src/Pure.DI.MS/ServiceCollectionFactory.g.cs
+++ b/src/Pure.DI.MS/ServiceCollectionFactory.g.cs
@@ -3,6 +3,9 @@
 
 namespace Pure.DI.MS;
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
diff --git a/src/Pure.DI.MS/ServiceProviderFactory.g.cs b/src/Pure.DI.MS/ServiceProviderFactory.g.cs
index 2963449f..868921b0 100644
--- a/src/Pure.DI.MS/ServiceProviderFactory.g.cs
+++ b/src/Pure.DI.MS/ServiceProviderFactory.g.cs
@@ -3,6 +3,7 @@
 
 namespace Pure.DI.MS;
 
+using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -36,7 +37,7 @@ internal class ServiceProviderFactory<TComposition>: IServiceProviderFactory<ISe
     /// </code>
     /// </example>
     /// </summary>
-    protected const string Base = $"Pure.DI.MS.ServiceProviderFactory";
+    protected const string Base = "Pure.DI.MS.ServiceProviderFactory";
     
     /// <summary>
     /// An instance of <see cref="Pure.DI.MS.ServiceCollectionFactory"/>.