diff --git a/appveyor.yml b/appveyor.yml
index ad68c172..0a57f93e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.5.{build}
+version: 3.6.{build}
 branches:
   only:
   - master
diff --git a/src/EcsRx.Examples/EcsRx.Examples.csproj b/src/EcsRx.Examples/EcsRx.Examples.csproj
index 06ac0acb..1f70a3e3 100644
--- a/src/EcsRx.Examples/EcsRx.Examples.csproj
+++ b/src/EcsRx.Examples/EcsRx.Examples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
diff --git a/src/EcsRx.Infrastructure.Ninject/EcsRx.Infrastructure.Ninject.csproj b/src/EcsRx.Infrastructure.Ninject/EcsRx.Infrastructure.Ninject.csproj
index c9f8f6ce..cdf7ee63 100644
--- a/src/EcsRx.Infrastructure.Ninject/EcsRx.Infrastructure.Ninject.csproj
+++ b/src/EcsRx.Infrastructure.Ninject/EcsRx.Infrastructure.Ninject.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Infrastructure.Ninject</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/src/EcsRx.Infrastructure/EcsRx.Infrastructure.csproj b/src/EcsRx.Infrastructure/EcsRx.Infrastructure.csproj
index ab9d3502..dd4aa576 100644
--- a/src/EcsRx.Infrastructure/EcsRx.Infrastructure.csproj
+++ b/src/EcsRx.Infrastructure/EcsRx.Infrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
     <Title>EcsRx.Infrastructure</Title>
     <Authors>Grofit (LP)</Authors>
     <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/src/EcsRx.Infrastructure/Modules/FrameworkModule.cs b/src/EcsRx.Infrastructure/Modules/FrameworkModule.cs
index b00ac567..6c9e3188 100644
--- a/src/EcsRx.Infrastructure/Modules/FrameworkModule.cs
+++ b/src/EcsRx.Infrastructure/Modules/FrameworkModule.cs
@@ -32,14 +32,16 @@ public void Setup(IDependencyContainer container)
             container.Bind<IConventionalSystemHandler, ManualSystemHandler>();
             container.Bind<ISystemExecutor, SystemExecutor>();
             container.Bind<IObservableScheduler, DefaultObservableScheduler>();
-            
-            var componentTypeAssigner = new DefaultComponentTypeAssigner();
-            var allComponents = componentTypeAssigner.GenerateComponentLookups();
-            var componentLookup = new ComponentTypeLookup(allComponents);
-            
-            container.Bind<IComponentTypeAssigner>(new BindingConfiguration{ToInstance = componentTypeAssigner});
-            container.Bind<IComponentTypeLookup>(new BindingConfiguration{ToInstance = componentLookup});           
+            container.Bind<IComponentTypeAssigner, DefaultComponentTypeAssigner>();
+            container.Bind<IComponentTypeLookup>(new BindingConfiguration{ToMethod = CreateDefaultTypeLookup});           
             container.Bind<IComponentDatabase, ComponentDatabase>();
         }
+
+        private object CreateDefaultTypeLookup(IDependencyContainer container)
+        {
+            var componentTypeAssigner = container.Resolve<IComponentTypeAssigner>();
+            var allComponents = componentTypeAssigner.GenerateComponentLookups();
+            return new ComponentTypeLookup(allComponents);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/EcsRx.MicroRx/EcsRx.MicroRx.csproj b/src/EcsRx.MicroRx/EcsRx.MicroRx.csproj
index 4daf830a..6aa69ade 100644
--- a/src/EcsRx.MicroRx/EcsRx.MicroRx.csproj
+++ b/src/EcsRx.MicroRx/EcsRx.MicroRx.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/EcsRx.Plugins.Batching/EcsRx.Plugins.Batching.csproj b/src/EcsRx.Plugins.Batching/EcsRx.Plugins.Batching.csproj
index 13c972ee..72b4000e 100644
--- a/src/EcsRx.Plugins.Batching/EcsRx.Plugins.Batching.csproj
+++ b/src/EcsRx.Plugins.Batching/EcsRx.Plugins.Batching.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Plugins.Batching</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/src/EcsRx.Plugins.Computeds/EcsRx.Plugins.Computeds.csproj b/src/EcsRx.Plugins.Computeds/EcsRx.Plugins.Computeds.csproj
index c1c80d36..7150153a 100644
--- a/src/EcsRx.Plugins.Computeds/EcsRx.Plugins.Computeds.csproj
+++ b/src/EcsRx.Plugins.Computeds/EcsRx.Plugins.Computeds.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Plugins.Computeds</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/src/EcsRx.Plugins.ReactiveSystems/EcsRx.Plugins.ReactiveSystems.csproj b/src/EcsRx.Plugins.ReactiveSystems/EcsRx.Plugins.ReactiveSystems.csproj
index 93a1c419..40a0539e 100644
--- a/src/EcsRx.Plugins.ReactiveSystems/EcsRx.Plugins.ReactiveSystems.csproj
+++ b/src/EcsRx.Plugins.ReactiveSystems/EcsRx.Plugins.ReactiveSystems.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Plugins.ReactiveSystems</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/src/EcsRx.Plugins.Views/EcsRx.Plugins.Views.csproj b/src/EcsRx.Plugins.Views/EcsRx.Plugins.Views.csproj
index 72c9fc59..3d779a56 100644
--- a/src/EcsRx.Plugins.Views/EcsRx.Plugins.Views.csproj
+++ b/src/EcsRx.Plugins.Views/EcsRx.Plugins.Views.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Plugins.Views</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/src/EcsRx.ReactiveData/EcsRx.ReactiveData.csproj b/src/EcsRx.ReactiveData/EcsRx.ReactiveData.csproj
index 6013e2e5..bff43e0e 100644
--- a/src/EcsRx.ReactiveData/EcsRx.ReactiveData.csproj
+++ b/src/EcsRx.ReactiveData/EcsRx.ReactiveData.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
     <Title>EcsRx.ReactiveData</Title>
     <Authors>Grofit (LP)</Authors>
     <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>
diff --git a/src/EcsRx.Tests/EcsRx.Tests.csproj b/src/EcsRx.Tests/EcsRx.Tests.csproj
index 6d71c2a8..9c2c85b0 100644
--- a/src/EcsRx.Tests/EcsRx.Tests.csproj
+++ b/src/EcsRx.Tests/EcsRx.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/src/EcsRx/EcsRx.csproj b/src/EcsRx/EcsRx.csproj
index 5fe961e6..407a291e 100644
--- a/src/EcsRx/EcsRx.csproj
+++ b/src/EcsRx/EcsRx.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
     <Title>EcsRx</Title>
     <Authors>Grofit (LP)</Authors>
     <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>