diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index b53da50..42173e4 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -3,10 +3,11 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="IvAt.CommonFramework" Version="2.0.4" />
-    <PackageVersion Include="IvAt.CommonFramework.DependencyInjection" Version="2.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
+    <PackageVersion Include="IvAt.CommonFramework" Version="2.1.4" />
+    <PackageVersion Include="IvAt.CommonFramework.DependencyInjection" Version="2.1.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
   </ItemGroup>
   <!-- Tests -->
   <ItemGroup>
@@ -14,7 +15,7 @@
     <PackageVersion Include="FluentValidation" Version="12.0.0" />
     <PackageVersion Include="FluentAssertions" Version="8.8.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
-    <PackageVersion Include="xunit.v3" Version="3.2.1" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/GenericQueryable/Fetching/FetchPath.cs b/src/GenericQueryable.Abstractions/Fetching/FetchPath.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/FetchPath.cs
rename to src/GenericQueryable.Abstractions/Fetching/FetchPath.cs
diff --git a/src/GenericQueryable/Fetching/FetchRule.cs b/src/GenericQueryable.Abstractions/Fetching/FetchRule.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/FetchRule.cs
rename to src/GenericQueryable.Abstractions/Fetching/FetchRule.cs
diff --git a/src/GenericQueryable/Fetching/IFetchService.cs b/src/GenericQueryable.Abstractions/Fetching/IFetchService.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/IFetchService.cs
rename to src/GenericQueryable.Abstractions/Fetching/IFetchService.cs
diff --git a/src/GenericQueryable/Fetching/IPropertyFetchRule.cs b/src/GenericQueryable.Abstractions/Fetching/IPropertyFetchRule.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/IPropertyFetchRule.cs
rename to src/GenericQueryable.Abstractions/Fetching/IPropertyFetchRule.cs
diff --git a/src/GenericQueryable/Fetching/PropertyFetchRule.cs b/src/GenericQueryable.Abstractions/Fetching/PropertyFetchRule.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/PropertyFetchRule.cs
rename to src/GenericQueryable.Abstractions/Fetching/PropertyFetchRule.cs
diff --git a/src/GenericQueryable/Fetching/UntypedFetchRule.cs b/src/GenericQueryable.Abstractions/Fetching/UntypedFetchRule.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/UntypedFetchRule.cs
rename to src/GenericQueryable.Abstractions/Fetching/UntypedFetchRule.cs
diff --git a/src/GenericQueryable.Abstractions/GenericQueryable.Abstractions.csproj b/src/GenericQueryable.Abstractions/GenericQueryable.Abstractions.csproj
new file mode 100644
index 0000000..6921ac2
--- /dev/null
+++ b/src/GenericQueryable.Abstractions/GenericQueryable.Abstractions.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <PackageId>IvAt.GenericQueryable.Abstractions</PackageId>
+    <RootNamespace>GenericQueryable</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="IvAt.CommonFramework" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/GenericQueryable/GenericQueryableExtensions.cs b/src/GenericQueryable.Abstractions/GenericQueryableExtensions.cs
similarity index 100%
rename from src/GenericQueryable/GenericQueryableExtensions.cs
rename to src/GenericQueryable.Abstractions/GenericQueryableExtensions.cs
diff --git a/src/GenericQueryable/GenericQueryableFetchExtensions.cs b/src/GenericQueryable.Abstractions/GenericQueryableFetchExtensions.cs
similarity index 100%
rename from src/GenericQueryable/GenericQueryableFetchExtensions.cs
rename to src/GenericQueryable.Abstractions/GenericQueryableFetchExtensions.cs
diff --git a/src/GenericQueryable/PropertyFetchRuleExtensions.cs b/src/GenericQueryable.Abstractions/PropertyFetchRuleExtensions.cs
similarity index 100%
rename from src/GenericQueryable/PropertyFetchRuleExtensions.cs
rename to src/GenericQueryable.Abstractions/PropertyFetchRuleExtensions.cs
diff --git a/src/GenericQueryable/Services/AsyncEnumerableMethodExtractor.cs b/src/GenericQueryable.Abstractions/Services/AsyncEnumerableMethodExtractor.cs
similarity index 100%
rename from src/GenericQueryable/Services/AsyncEnumerableMethodExtractor.cs
rename to src/GenericQueryable.Abstractions/Services/AsyncEnumerableMethodExtractor.cs
diff --git a/src/GenericQueryable/Services/AsyncEnumerableMethodRedirector.cs b/src/GenericQueryable.Abstractions/Services/AsyncEnumerableMethodRedirector.cs
similarity index 100%
rename from src/GenericQueryable/Services/AsyncEnumerableMethodRedirector.cs
rename to src/GenericQueryable.Abstractions/Services/AsyncEnumerableMethodRedirector.cs
diff --git a/src/GenericQueryable/Services/GenericQueryableExecutor.cs b/src/GenericQueryable.Abstractions/Services/GenericQueryableExecutor.cs
similarity index 100%
rename from src/GenericQueryable/Services/GenericQueryableExecutor.cs
rename to src/GenericQueryable.Abstractions/Services/GenericQueryableExecutor.cs
diff --git a/src/GenericQueryable/Services/IGenericQueryProvider.cs b/src/GenericQueryable.Abstractions/Services/IGenericQueryProvider.cs
similarity index 100%
rename from src/GenericQueryable/Services/IGenericQueryProvider.cs
rename to src/GenericQueryable.Abstractions/Services/IGenericQueryProvider.cs
diff --git a/src/GenericQueryable/Services/IGenericQueryableExecutor.cs b/src/GenericQueryable.Abstractions/Services/IGenericQueryableExecutor.cs
similarity index 100%
rename from src/GenericQueryable/Services/IGenericQueryableExecutor.cs
rename to src/GenericQueryable.Abstractions/Services/IGenericQueryableExecutor.cs
diff --git a/src/GenericQueryable/Services/IMethodRedirector.cs b/src/GenericQueryable.Abstractions/Services/IMethodRedirector.cs
similarity index 100%
rename from src/GenericQueryable/Services/IMethodRedirector.cs
rename to src/GenericQueryable.Abstractions/Services/IMethodRedirector.cs
diff --git a/src/GenericQueryable/Services/ITargetMethodExtractor.cs b/src/GenericQueryable.Abstractions/Services/ITargetMethodExtractor.cs
similarity index 100%
rename from src/GenericQueryable/Services/ITargetMethodExtractor.cs
rename to src/GenericQueryable.Abstractions/Services/ITargetMethodExtractor.cs
diff --git a/src/GenericQueryable/Fetching/IgnoreFetchService.cs b/src/GenericQueryable.Abstractions/Services/IgnoreFetchService.cs
similarity index 100%
rename from src/GenericQueryable/Fetching/IgnoreFetchService.cs
rename to src/GenericQueryable.Abstractions/Services/IgnoreFetchService.cs
diff --git a/src/GenericQueryable/Services/MethodRedirector.cs b/src/GenericQueryable.Abstractions/Services/MethodRedirector.cs
similarity index 100%
rename from src/GenericQueryable/Services/MethodRedirector.cs
rename to src/GenericQueryable.Abstractions/Services/MethodRedirector.cs
diff --git a/src/GenericQueryable/Services/SyncMethodRedirector.cs b/src/GenericQueryable.Abstractions/Services/SyncMethodRedirector.cs
similarity index 100%
rename from src/GenericQueryable/Services/SyncMethodRedirector.cs
rename to src/GenericQueryable.Abstractions/Services/SyncMethodRedirector.cs
diff --git a/src/GenericQueryable/Services/SyncTargetMethodExtractor.cs b/src/GenericQueryable.Abstractions/Services/SyncTargetMethodExtractor.cs
similarity index 100%
rename from src/GenericQueryable/Services/SyncTargetMethodExtractor.cs
rename to src/GenericQueryable.Abstractions/Services/SyncTargetMethodExtractor.cs
diff --git a/src/GenericQueryable/Services/TargetMethodExtractor.cs b/src/GenericQueryable.Abstractions/Services/TargetMethodExtractor.cs
similarity index 100%
rename from src/GenericQueryable/Services/TargetMethodExtractor.cs
rename to src/GenericQueryable.Abstractions/Services/TargetMethodExtractor.cs
diff --git a/src/GenericQueryable.UnitTests/GenericQueryable.UnitTests.csproj b/src/GenericQueryable.UnitTests/GenericQueryable.UnitTests.csproj
index 8bfa56f..72a5741 100644
--- a/src/GenericQueryable.UnitTests/GenericQueryable.UnitTests.csproj
+++ b/src/GenericQueryable.UnitTests/GenericQueryable.UnitTests.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\GenericQueryable\GenericQueryable.csproj" />
+    <ProjectReference Include="..\GenericQueryable.Abstractions\GenericQueryable.Abstractions.csproj" />
   </ItemGroup>
 
 
diff --git a/src/GenericQueryable.slnx b/src/GenericQueryable.slnx
index c020c8e..b5ca9cf 100644
--- a/src/GenericQueryable.slnx
+++ b/src/GenericQueryable.slnx
@@ -8,6 +8,7 @@
   <Project Path="GenericQueryable.IntegrationTests/GenericQueryable.IntegrationTests.csproj" />
   <Project Path="GenericQueryable.UnitTests/GenericQueryable.UnitTests.csproj" />
   <Project Path="GenericQueryable/GenericQueryable.csproj" />
+  <Project Path="GenericQueryable.Abstractions/GenericQueryable.Abstractions.csproj" />
   <Project Path="GenericQueryable.EntityFramework/GenericQueryable.EntityFramework.csproj" />
   
 </Solution>
diff --git a/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs b/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs
index efa2109..6c0b51e 100644
--- a/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs
+++ b/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs
@@ -1,29 +1,51 @@
-using GenericQueryable.Fetching;
+using CommonFramework.DependencyInjection;
+
+using GenericQueryable.Fetching;
 using GenericQueryable.Services;
 
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace GenericQueryable.DependencyInjection;
 
 public class GenericQueryableSetup : IGenericQueryableSetup
 {
-    private Type targetMethodExtractorType = typeof(SyncTargetMethodExtractor);
-
     private Type fetchServiceType = typeof(IgnoreFetchService);
 
-    private readonly List<Type> fetchRuleExpanderTypeList = [typeof(FetchRuleHeaderExpander)];
+    private Type targetMethodExtractorType = typeof(SyncTargetMethodExtractor);
+
+    private readonly List<Type> fetchRuleExpanderTypeList = [];
 
-    private readonly List<FetchRuleHeaderInfo> fetchRuleHeaderInfoList = new();
+    private readonly List<FetchRuleHeaderInfo> fetchRuleHeaderInfoList = [];
 
     public void Initialize(IServiceCollection services)
     {
-        services.AddSingleton<IGenericQueryableExecutor, GenericQueryableExecutor>();
-        services.AddSingleton<IMethodRedirector, MethodRedirector>();
+        if (!services.AlreadyInitialized<IFetchRuleExpander>())
+        {
+            services.TryAddSingleton<IGenericQueryableExecutor, GenericQueryableExecutor>();
+            services.TryAddSingleton<IMethodRedirector, MethodRedirector>();
+
+            services.AddSingleton<IFetchRuleExpander, FetchRuleHeaderExpander>();
+            services.AddKeyedSingleton<IFetchRuleExpander, RootFetchRuleExpander>(RootFetchRuleExpander.Key);
+        }
 
-        services.AddSingleton(typeof(IFetchService), this.fetchServiceType);
-        services.AddSingleton(typeof(ITargetMethodExtractor), this.targetMethodExtractorType);
+        if (services.AlreadyInitialized<IFetchService, IgnoreFetchService>())
+        {
+            services.ReplaceSingleton(typeof(IFetchService), this.fetchServiceType);
+        }
+        else
+        {
+            services.AddSingleton(typeof(IFetchService), this.fetchServiceType);
+        }
 
-        services.AddKeyedSingleton<IFetchRuleExpander, RootFetchRuleExpander>(RootFetchRuleExpander.Key);
+        if (services.AlreadyInitialized<ITargetMethodExtractor, SyncTargetMethodExtractor>())
+        {
+            services.ReplaceSingleton(typeof(ITargetMethodExtractor), this.targetMethodExtractorType);
+        }
+        else
+        {
+            services.AddSingleton(typeof(ITargetMethodExtractor), this.targetMethodExtractorType);
+        }
 
         foreach (var fetchRuleExpanderType in this.fetchRuleExpanderTypeList)
         {
diff --git a/src/GenericQueryable/GenericQueryable.csproj b/src/GenericQueryable/GenericQueryable.csproj
index 648f9e5..5b18b6a 100644
--- a/src/GenericQueryable/GenericQueryable.csproj
+++ b/src/GenericQueryable/GenericQueryable.csproj
@@ -5,8 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IvAt.CommonFramework" />
     <PackageReference Include="IvAt.CommonFramework.DependencyInjection" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\GenericQueryable.Abstractions\GenericQueryable.Abstractions.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs
index 6d3d68b..776f033 100644
--- a/src/__SolutionItems/CommonAssemblyInfo.cs
+++ b/src/__SolutionItems/CommonAssemblyInfo.cs
@@ -3,7 +3,7 @@
 [assembly: AssemblyProduct("GenericQueryable")]
 [assembly: AssemblyCompany("IvAt")]
 
-[assembly: AssemblyVersion("2.0.6.0")]
+[assembly: AssemblyVersion("2.1.4.0")]
 [assembly: AssemblyInformationalVersion("changes at build")]
 
 #if DEBUG