diff --git a/.gitignore b/.gitignore
index 77845e48..e149ced9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ _ReSharper.*
 *.ReSharper.user
 *.resharper.user
 *.pfx
+/src/.vs
diff --git a/src/Z.EntityFramework.Plus.EF5.NET40/Z.EntityFramework.Plus.EF5.NET40.csproj b/src/Z.EntityFramework.Plus.EF5.NET40/Z.EntityFramework.Plus.EF5.NET40.csproj
index 31767f0a..ca37ce2d 100644
--- a/src/Z.EntityFramework.Plus.EF5.NET40/Z.EntityFramework.Plus.EF5.NET40.csproj
+++ b/src/Z.EntityFramework.Plus.EF5.NET40/Z.EntityFramework.Plus.EF5.NET40.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.5.0.0\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\EntityFramework.5.0.0\lib\net40\EntityFramework.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Z.EntityFramework.Plus.EF5.sln b/src/Z.EntityFramework.Plus.EF5.sln
new file mode 100644
index 00000000..18b3c3f6
--- /dev/null
+++ b/src/Z.EntityFramework.Plus.EF5.sln
@@ -0,0 +1,104 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.6
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{14D8985E-0AA8-444A-A32E-D766ABA114D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{45D50C58-9B18-475A-9839-D6754E87352B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus._Core.Shared", "shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.shproj", "{27CBB38C-9814-4251-B919-905514D6D8A0}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus._ExceptionMessage.Shared", "shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.shproj", "{9D4357AC-9E62-4CF0-AE5E-29142CFC0A97}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.Audit.Shared", "shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.shproj", "{6BFA5473-A429-4F9E-AA40-1387716DE22D}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.BatchDelete.Shared", "shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.shproj", "{5B3FA372-A872-4CA1-B7C0-5352052AC75A}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.BatchUpdate.Shared", "shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.shproj", "{CE6171C3-84CC-4AE1-82D0-CDAC97EF5AB2}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryCache.Shared", "shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.shproj", "{287A066E-6FCC-42B2-BACC-E24FAF056E4C}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryDeferred.Shared", "shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.shproj", "{B9FCE31E-4830-408C-95F0-447ACB0B7490}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryExtensions.Shared", "shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.shproj", "{C3DF9DE1-3C26-42C8-B972-902214161BD7}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFilter.Shared", "shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.shproj", "{B8DB9C52-11B7-4D06-8E01-E25903F560CA}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFilterInterceptor.Shared", "shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.shproj", "{6731E6CF-D2EA-4ED2-9B32-02C462271D80}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFuture.Shared", "shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.shproj", "{5CA1ED0D-1322-49F0-920B-F0C4BA36560E}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryIncludeFilter.Shared", "shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.shproj", "{DC4C972B-6AE7-4620-B2CB-2AFD106E638B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryIncludeOptimized.Shared", "shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.shproj", "{D1953D60-B322-4CAF-92DF-0581A1FD758F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z.EntityFramework.Plus.EF5", "Z.EntityFramework.Plus.EF5\Z.EntityFramework.Plus.EF5.csproj", "{1B28EFB7-E679-4275-ACA9-DA7CD589A56A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z.Test.EntityFramework.Plus.EF5", "test\Z.Test.EntityFramework.Plus.EF5\Z.Test.EntityFramework.Plus.EF5.csproj", "{149EC03D-4F7D-4EBA-9F24-0777FB7AB7F2}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems*{1b28efb7-e679-4275-aca9-da7cd589a56a}*SharedItemsImports = 4
+		shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems*{27cbb38c-9814-4251-b919-905514d6d8a0}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{287a066e-6fcc-42b2-bacc-e24faf056e4c}*SharedItemsImports = 13
+		shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems*{5b3fa372-a872-4ca1-b7c0-5352052ac75a}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{5ca1ed0d-1322-49f0-920b-f0c4ba36560e}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems*{6731e6cf-d2ea-4ed2-9b32-02c462271d80}*SharedItemsImports = 13
+		shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems*{6bfa5473-a429-4f9e-aa40-1387716de22d}*SharedItemsImports = 13
+		shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems*{9d4357ac-9e62-4cf0-ae5e-29142cfc0a97}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{b8db9c52-11b7-4d06-8e01-e25903f560ca}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{b9fce31e-4830-408c-95f0-447acb0b7490}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{c3df9de1-3c26-42c8-b972-902214161bd7}*SharedItemsImports = 13
+		shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems*{ce6171c3-84cc-4ae1-82d0-cdac97ef5ab2}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems*{d1953d60-b322-4caf-92df-0581a1fd758f}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{dc4c972b-6ae7-4620-b2cb-2afd106e638b}*SharedItemsImports = 13
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1B28EFB7-E679-4275-ACA9-DA7CD589A56A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B28EFB7-E679-4275-ACA9-DA7CD589A56A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B28EFB7-E679-4275-ACA9-DA7CD589A56A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B28EFB7-E679-4275-ACA9-DA7CD589A56A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{149EC03D-4F7D-4EBA-9F24-0777FB7AB7F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{149EC03D-4F7D-4EBA-9F24-0777FB7AB7F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{149EC03D-4F7D-4EBA-9F24-0777FB7AB7F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{149EC03D-4F7D-4EBA-9F24-0777FB7AB7F2}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{27CBB38C-9814-4251-B919-905514D6D8A0} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{9D4357AC-9E62-4CF0-AE5E-29142CFC0A97} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{6BFA5473-A429-4F9E-AA40-1387716DE22D} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{5B3FA372-A872-4CA1-B7C0-5352052AC75A} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{CE6171C3-84CC-4AE1-82D0-CDAC97EF5AB2} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{287A066E-6FCC-42B2-BACC-E24FAF056E4C} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{B9FCE31E-4830-408C-95F0-447ACB0B7490} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{C3DF9DE1-3C26-42C8-B972-902214161BD7} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{B8DB9C52-11B7-4D06-8E01-E25903F560CA} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{6731E6CF-D2EA-4ED2-9B32-02C462271D80} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{5CA1ED0D-1322-49F0-920B-F0C4BA36560E} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{DC4C972B-6AE7-4620-B2CB-2AFD106E638B} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{D1953D60-B322-4CAF-92DF-0581A1FD758F} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{149EC03D-4F7D-4EBA-9F24-0777FB7AB7F2} = {14D8985E-0AA8-444A-A32E-D766ABA114D6}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AEE441E3-DEE9-48F2-9212-1F3A573007AE}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Z.EntityFramework.Plus.EF5/Z.EntityFramework.Plus.EF5.csproj b/src/Z.EntityFramework.Plus.EF5/Z.EntityFramework.Plus.EF5.csproj
index 061cb3f9..f0e4e011 100644
--- a/src/Z.EntityFramework.Plus.EF5/Z.EntityFramework.Plus.EF5.csproj
+++ b/src/Z.EntityFramework.Plus.EF5/Z.EntityFramework.Plus.EF5.csproj
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -68,6 +68,7 @@
   <Import Project="..\shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems" Label="Shared" />
+  <Import Project="..\shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/Z.EntityFramework.Plus.EF6.NET40.csproj b/src/Z.EntityFramework.Plus.EF6.NET40/Z.EntityFramework.Plus.EF6.NET40.csproj
index f359eb22..72f4eaaa 100644
--- a/src/Z.EntityFramework.Plus.EF6.NET40/Z.EntityFramework.Plus.EF6.NET40.csproj
+++ b/src/Z.EntityFramework.Plus.EF6.NET40/Z.EntityFramework.Plus.EF6.NET40.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Z.EntityFramework.Plus.EF6.sln b/src/Z.EntityFramework.Plus.EF6.sln
new file mode 100644
index 00000000..c1e166d3
--- /dev/null
+++ b/src/Z.EntityFramework.Plus.EF6.sln
@@ -0,0 +1,106 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.16
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{14D8985E-0AA8-444A-A32E-D766ABA114D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{45D50C58-9B18-475A-9839-D6754E87352B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus._Core.Shared", "shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.shproj", "{27CBB38C-9814-4251-B919-905514D6D8A0}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus._ExceptionMessage.Shared", "shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.shproj", "{9D4357AC-9E62-4CF0-AE5E-29142CFC0A97}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.Audit.Shared", "shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.shproj", "{6BFA5473-A429-4F9E-AA40-1387716DE22D}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.BatchDelete.Shared", "shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.shproj", "{5B3FA372-A872-4CA1-B7C0-5352052AC75A}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.BatchUpdate.Shared", "shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.shproj", "{CE6171C3-84CC-4AE1-82D0-CDAC97EF5AB2}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryCache.Shared", "shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.shproj", "{287A066E-6FCC-42B2-BACC-E24FAF056E4C}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryDeferred.Shared", "shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.shproj", "{B9FCE31E-4830-408C-95F0-447ACB0B7490}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryExtensions.Shared", "shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.shproj", "{C3DF9DE1-3C26-42C8-B972-902214161BD7}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFilter.Shared", "shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.shproj", "{B8DB9C52-11B7-4D06-8E01-E25903F560CA}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFilterInterceptor.Shared", "shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.shproj", "{6731E6CF-D2EA-4ED2-9B32-02C462271D80}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFuture.Shared", "shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.shproj", "{5CA1ED0D-1322-49F0-920B-F0C4BA36560E}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryIncludeFilter.Shared", "shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.shproj", "{DC4C972B-6AE7-4620-B2CB-2AFD106E638B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryIncludeOptimized.Shared", "shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.shproj", "{D1953D60-B322-4CAF-92DF-0581A1FD758F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z.Test.EntityFramework.Plus.EF6", "test\Z.Test.EntityFramework.Plus.EF6\Z.Test.EntityFramework.Plus.EF6.csproj", "{063FA382-DFDA-4BCB-BBB6-AAC04D0ED88E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z.EntityFramework.Plus.EF6", "Z.EntityFramework.Plus.EF6\Z.EntityFramework.Plus.EF6.csproj", "{6EA3675A-AB66-4ABA-94D1-3DA69FA88D4E}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems*{27cbb38c-9814-4251-b919-905514d6d8a0}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{287a066e-6fcc-42b2-bacc-e24faf056e4c}*SharedItemsImports = 13
+		shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems*{5b3fa372-a872-4ca1-b7c0-5352052ac75a}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{5ca1ed0d-1322-49f0-920b-f0c4ba36560e}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems*{6731e6cf-d2ea-4ed2-9b32-02c462271d80}*SharedItemsImports = 13
+		shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems*{6bfa5473-a429-4f9e-aa40-1387716de22d}*SharedItemsImports = 13
+		shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared_dev\Z.EF.Plus.QueryInterceptor.Shared\Z.EF.Plus.QueryInterceptor.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
+		shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems*{9d4357ac-9e62-4cf0-ae5e-29142cfc0a97}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{b8db9c52-11b7-4d06-8e01-e25903f560ca}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{b9fce31e-4830-408c-95f0-447acb0b7490}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{c3df9de1-3c26-42c8-b972-902214161bd7}*SharedItemsImports = 13
+		shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems*{ce6171c3-84cc-4ae1-82d0-cdac97ef5ab2}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems*{d1953d60-b322-4caf-92df-0581a1fd758f}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{dc4c972b-6ae7-4620-b2cb-2afd106e638b}*SharedItemsImports = 13
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{063FA382-DFDA-4BCB-BBB6-AAC04D0ED88E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{063FA382-DFDA-4BCB-BBB6-AAC04D0ED88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{063FA382-DFDA-4BCB-BBB6-AAC04D0ED88E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{063FA382-DFDA-4BCB-BBB6-AAC04D0ED88E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EA3675A-AB66-4ABA-94D1-3DA69FA88D4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EA3675A-AB66-4ABA-94D1-3DA69FA88D4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EA3675A-AB66-4ABA-94D1-3DA69FA88D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EA3675A-AB66-4ABA-94D1-3DA69FA88D4E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{27CBB38C-9814-4251-B919-905514D6D8A0} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{9D4357AC-9E62-4CF0-AE5E-29142CFC0A97} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{6BFA5473-A429-4F9E-AA40-1387716DE22D} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{5B3FA372-A872-4CA1-B7C0-5352052AC75A} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{CE6171C3-84CC-4AE1-82D0-CDAC97EF5AB2} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{287A066E-6FCC-42B2-BACC-E24FAF056E4C} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{B9FCE31E-4830-408C-95F0-447ACB0B7490} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{C3DF9DE1-3C26-42C8-B972-902214161BD7} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{B8DB9C52-11B7-4D06-8E01-E25903F560CA} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{6731E6CF-D2EA-4ED2-9B32-02C462271D80} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{5CA1ED0D-1322-49F0-920B-F0C4BA36560E} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{DC4C972B-6AE7-4620-B2CB-2AFD106E638B} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{D1953D60-B322-4CAF-92DF-0581A1FD758F} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{063FA382-DFDA-4BCB-BBB6-AAC04D0ED88E} = {14D8985E-0AA8-444A-A32E-D766ABA114D6}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AEE441E3-DEE9-48F2-9212-1F3A573007AE}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Z.EntityFramework.Plus.EF6/Z.EntityFramework.Plus.EF6.csproj b/src/Z.EntityFramework.Plus.EF6/Z.EntityFramework.Plus.EF6.csproj
index 2242c58c..05138bd1 100644
--- a/src/Z.EntityFramework.Plus.EF6/Z.EntityFramework.Plus.EF6.csproj
+++ b/src/Z.EntityFramework.Plus.EF6/Z.EntityFramework.Plus.EF6.csproj
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -64,13 +64,13 @@
   <Import Project="..\shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems" Label="Shared" />
-  <Import Project="..\shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems" Label="Shared" />
   <Import Project="..\shared_dev\Z.EF.Plus.QueryInterceptor.Shared\Z.EF.Plus.QueryInterceptor.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems" Label="Shared" />
+  <Import Project="..\shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Z.EntityFramework.Plus.EFCore.NET451.sln b/src/Z.EntityFramework.Plus.EFCore.NET451.sln
new file mode 100644
index 00000000..6e942dee
--- /dev/null
+++ b/src/Z.EntityFramework.Plus.EFCore.NET451.sln
@@ -0,0 +1,101 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.6
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{14D8985E-0AA8-444A-A32E-D766ABA114D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{45D50C58-9B18-475A-9839-D6754E87352B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus._Core.Shared", "shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.shproj", "{27CBB38C-9814-4251-B919-905514D6D8A0}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus._ExceptionMessage.Shared", "shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.shproj", "{9D4357AC-9E62-4CF0-AE5E-29142CFC0A97}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.Audit.Shared", "shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.shproj", "{6BFA5473-A429-4F9E-AA40-1387716DE22D}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.BatchDelete.Shared", "shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.shproj", "{5B3FA372-A872-4CA1-B7C0-5352052AC75A}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.BatchUpdate.Shared", "shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.shproj", "{CE6171C3-84CC-4AE1-82D0-CDAC97EF5AB2}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryCache.Shared", "shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.shproj", "{287A066E-6FCC-42B2-BACC-E24FAF056E4C}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryDeferred.Shared", "shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.shproj", "{B9FCE31E-4830-408C-95F0-447ACB0B7490}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryExtensions.Shared", "shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.shproj", "{C3DF9DE1-3C26-42C8-B972-902214161BD7}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFilter.Shared", "shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.shproj", "{B8DB9C52-11B7-4D06-8E01-E25903F560CA}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFilterInterceptor.Shared", "shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.shproj", "{6731E6CF-D2EA-4ED2-9B32-02C462271D80}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFuture.Shared", "shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.shproj", "{5CA1ED0D-1322-49F0-920B-F0C4BA36560E}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryIncludeFilter.Shared", "shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.shproj", "{DC4C972B-6AE7-4620-B2CB-2AFD106E638B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryIncludeOptimized.Shared", "shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.shproj", "{D1953D60-B322-4CAF-92DF-0581A1FD758F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z.Test.EntityFramework.Plus.EFCore", "test\Z.Test.EntityFramework.Plus.EFCore\Z.Test.EntityFramework.Plus.EFCore.csproj", "{C47F920B-8064-44B0-BF3F-CD29298597A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z.EntityFramework.Plus.EFCore.NET451", "Z.EntityFramework.Plus.EFCore.NET451\Z.EntityFramework.Plus.EFCore.NET451.csproj", "{035D058A-0DD2-4A74-B1E7-68E482C7C806}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems*{035d058a-0dd2-4a74-b1e7-68e482c7c806}*SharedItemsImports = 4
+		shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems*{27cbb38c-9814-4251-b919-905514d6d8a0}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{287a066e-6fcc-42b2-bacc-e24faf056e4c}*SharedItemsImports = 13
+		shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems*{5b3fa372-a872-4ca1-b7c0-5352052ac75a}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{5ca1ed0d-1322-49f0-920b-f0c4ba36560e}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems*{6731e6cf-d2ea-4ed2-9b32-02c462271d80}*SharedItemsImports = 13
+		shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems*{6bfa5473-a429-4f9e-aa40-1387716de22d}*SharedItemsImports = 13
+		shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems*{9d4357ac-9e62-4cf0-ae5e-29142cfc0a97}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{b8db9c52-11b7-4d06-8e01-e25903f560ca}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{b9fce31e-4830-408c-95f0-447acb0b7490}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{c3df9de1-3c26-42c8-b972-902214161bd7}*SharedItemsImports = 13
+		shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems*{ce6171c3-84cc-4ae1-82d0-cdac97ef5ab2}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems*{d1953d60-b322-4caf-92df-0581a1fd758f}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{dc4c972b-6ae7-4620-b2cb-2afd106e638b}*SharedItemsImports = 13
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C47F920B-8064-44B0-BF3F-CD29298597A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C47F920B-8064-44B0-BF3F-CD29298597A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C47F920B-8064-44B0-BF3F-CD29298597A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C47F920B-8064-44B0-BF3F-CD29298597A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{035D058A-0DD2-4A74-B1E7-68E482C7C806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{035D058A-0DD2-4A74-B1E7-68E482C7C806}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{035D058A-0DD2-4A74-B1E7-68E482C7C806}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{035D058A-0DD2-4A74-B1E7-68E482C7C806}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{27CBB38C-9814-4251-B919-905514D6D8A0} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{9D4357AC-9E62-4CF0-AE5E-29142CFC0A97} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{6BFA5473-A429-4F9E-AA40-1387716DE22D} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{5B3FA372-A872-4CA1-B7C0-5352052AC75A} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{CE6171C3-84CC-4AE1-82D0-CDAC97EF5AB2} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{287A066E-6FCC-42B2-BACC-E24FAF056E4C} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{B9FCE31E-4830-408C-95F0-447ACB0B7490} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{C3DF9DE1-3C26-42C8-B972-902214161BD7} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{B8DB9C52-11B7-4D06-8E01-E25903F560CA} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{6731E6CF-D2EA-4ED2-9B32-02C462271D80} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{5CA1ED0D-1322-49F0-920B-F0C4BA36560E} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{DC4C972B-6AE7-4620-B2CB-2AFD106E638B} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{D1953D60-B322-4CAF-92DF-0581A1FD758F} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{C47F920B-8064-44B0-BF3F-CD29298597A0} = {14D8985E-0AA8-444A-A32E-D766ABA114D6}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AEE441E3-DEE9-48F2-9212-1F3A573007AE}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Z.EntityFramework.Plus.EFCore.NET451/Z.EntityFramework.Plus.EFCore.NET451.csproj b/src/Z.EntityFramework.Plus.EFCore.NET451/Z.EntityFramework.Plus.EFCore.NET451.csproj
index 8962dc9d..1f46d34d 100644
--- a/src/Z.EntityFramework.Plus.EFCore.NET451/Z.EntityFramework.Plus.EFCore.NET451.csproj
+++ b/src/Z.EntityFramework.Plus.EFCore.NET451/Z.EntityFramework.Plus.EFCore.NET451.csproj
@@ -34,60 +34,67 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>zzzproject.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.EntityFrameworkCore, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.EntityFrameworkCore.1.0.0\lib\net451\Microsoft.EntityFrameworkCore.dll</HintPath>
+    <Reference Include="Microsoft.EntityFrameworkCore, Version=1.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.1.1.3\lib\net451\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.1.0.0\lib\net451\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=1.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.1.1.3\lib\net451\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.1.1.2\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.1.0.0\lib\net451\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.1.1.2\lib\net451\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.1.1.2\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.1.1.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Options.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Options.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Options, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.1.1.2\lib\netstandard1.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Primitives.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll</HintPath>
+      <HintPath>..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\portable-net45+win8+wpa81\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
-    <Reference Include="System.Interactive.Async, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll</HintPath>
+    <Reference Include="System.Interactive.Async, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -100,8 +107,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
-    <None Include="zzzproject.pfx" />
   </ItemGroup>
   <Import Project="..\shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems" Label="Shared" />
   <Import Project="..\shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems" Label="Shared" />
diff --git a/src/Z.EntityFramework.Plus.EFCore.NET451/app.config b/src/Z.EntityFramework.Plus.EFCore.NET451/app.config
new file mode 100644
index 00000000..fb49e689
--- /dev/null
+++ b/src/Z.EntityFramework.Plus.EFCore.NET451/app.config
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.EntityFrameworkCore" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.3.0" newVersion="1.1.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Z.EntityFramework.Plus.EFCore.NET451/packages.config b/src/Z.EntityFramework.Plus.EFCore.NET451/packages.config
index 46b33eec..79da50ae 100644
--- a/src/Z.EntityFramework.Plus.EFCore.NET451/packages.config
+++ b/src/Z.EntityFramework.Plus.EFCore.NET451/packages.config
@@ -1,34 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.EntityFrameworkCore" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.EntityFrameworkCore.Relational" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Options" version="1.0.0" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Primitives" version="1.0.0" targetFramework="net451" />
-  <package id="Remotion.Linq" version="2.1.1" targetFramework="net451" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net451" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net451" />
-  <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net451" />
-  <package id="System.ComponentModel" version="4.0.1" targetFramework="net451" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net451" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net451" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="net451" />
-  <package id="System.Interactive.Async" version="3.0.0" targetFramework="net451" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net451" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net451" />
-  <package id="System.Linq.Queryable" version="4.0.1" targetFramework="net451" />
-  <package id="System.ObjectModel" version="4.0.12" targetFramework="net451" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net451" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net451" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net451" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net451" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net451" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net451" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net451" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore" version="1.1.3" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore.Relational" version="1.1.3" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="1.1.1" targetFramework="net451" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.1" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Logging" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Options" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Primitives" version="1.1.1" targetFramework="net451" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net451" />
+  <package id="NETStandard.Library" version="1.6.1" targetFramework="net451" />
+  <package id="Remotion.Linq" version="2.1.2" targetFramework="net451" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net451" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net451" />
+  <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net451" />
+  <package id="System.ComponentModel" version="4.3.0" targetFramework="net451" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net451" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net451" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net451" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net451" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net451" />
+  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net451" />
+  <package id="System.IO" version="4.3.0" targetFramework="net451" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net451" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net451" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net451" />
+  <package id="System.Net.Http" version="4.3.3" targetFramework="net451" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net451" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="net451" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net451" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net451" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net451" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net451" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net451" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net451" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net451" />
+  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net451" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net451" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/src/Z.EntityFramework.Plus.EFCore.NETStandard.sln b/src/Z.EntityFramework.Plus.EFCore.NETStandard.sln
new file mode 100644
index 00000000..1302ece3
--- /dev/null
+++ b/src/Z.EntityFramework.Plus.EFCore.NETStandard.sln
@@ -0,0 +1,88 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.16
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{14D8985E-0AA8-444A-A32E-D766ABA114D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{45D50C58-9B18-475A-9839-D6754E87352B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus._Core.Shared", "shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.shproj", "{27CBB38C-9814-4251-B919-905514D6D8A0}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus._ExceptionMessage.Shared", "shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.shproj", "{9D4357AC-9E62-4CF0-AE5E-29142CFC0A97}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.Audit.Shared", "shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.shproj", "{6BFA5473-A429-4F9E-AA40-1387716DE22D}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.BatchDelete.Shared", "shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.shproj", "{5B3FA372-A872-4CA1-B7C0-5352052AC75A}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.BatchUpdate.Shared", "shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.shproj", "{CE6171C3-84CC-4AE1-82D0-CDAC97EF5AB2}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryCache.Shared", "shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.shproj", "{287A066E-6FCC-42B2-BACC-E24FAF056E4C}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryDeferred.Shared", "shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.shproj", "{B9FCE31E-4830-408C-95F0-447ACB0B7490}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryExtensions.Shared", "shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.shproj", "{C3DF9DE1-3C26-42C8-B972-902214161BD7}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFilter.Shared", "shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.shproj", "{B8DB9C52-11B7-4D06-8E01-E25903F560CA}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryFuture.Shared", "shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.shproj", "{5CA1ED0D-1322-49F0-920B-F0C4BA36560E}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryIncludeFilter.Shared", "shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.shproj", "{DC4C972B-6AE7-4620-B2CB-2AFD106E638B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Z.EF.Plus.QueryIncludeOptimized.Shared", "shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.shproj", "{D1953D60-B322-4CAF-92DF-0581A1FD758F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Z.EntityFramework.Plus.EFCore.NETStandard", "Z.EntityFramework.Plus.EFCore.NETStandard\Z.EntityFramework.Plus.EFCore.NETStandard.csproj", "{03763659-34A0-4EF1-9974-78059A2F4EB9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Z.Test.EntityFramework.Plus.EFCore.NETStandard", "test\Z.Test.EntityFramework.Plus.EFCore\Z.Test.EntityFramework.Plus.EFCore.NETStandard.csproj", "{C47F920B-8064-44B0-BF3F-CD29298597A0}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems*{27cbb38c-9814-4251-b919-905514d6d8a0}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{287a066e-6fcc-42b2-bacc-e24faf056e4c}*SharedItemsImports = 13
+		shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems*{5b3fa372-a872-4ca1-b7c0-5352052ac75a}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{5ca1ed0d-1322-49f0-920b-f0c4ba36560e}*SharedItemsImports = 13
+		shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems*{6bfa5473-a429-4f9e-aa40-1387716de22d}*SharedItemsImports = 13
+		shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems*{9d4357ac-9e62-4cf0-ae5e-29142cfc0a97}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{b8db9c52-11b7-4d06-8e01-e25903f560ca}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{b9fce31e-4830-408c-95f0-447acb0b7490}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{c3df9de1-3c26-42c8-b972-902214161bd7}*SharedItemsImports = 13
+		shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems*{ce6171c3-84cc-4ae1-82d0-cdac97ef5ab2}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems*{d1953d60-b322-4caf-92df-0581a1fd758f}*SharedItemsImports = 13
+		shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{dc4c972b-6ae7-4620-b2cb-2afd106e638b}*SharedItemsImports = 13
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{03763659-34A0-4EF1-9974-78059A2F4EB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03763659-34A0-4EF1-9974-78059A2F4EB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03763659-34A0-4EF1-9974-78059A2F4EB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03763659-34A0-4EF1-9974-78059A2F4EB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C47F920B-8064-44B0-BF3F-CD29298597A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C47F920B-8064-44B0-BF3F-CD29298597A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C47F920B-8064-44B0-BF3F-CD29298597A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C47F920B-8064-44B0-BF3F-CD29298597A0}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{27CBB38C-9814-4251-B919-905514D6D8A0} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{9D4357AC-9E62-4CF0-AE5E-29142CFC0A97} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{6BFA5473-A429-4F9E-AA40-1387716DE22D} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{5B3FA372-A872-4CA1-B7C0-5352052AC75A} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{CE6171C3-84CC-4AE1-82D0-CDAC97EF5AB2} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{287A066E-6FCC-42B2-BACC-E24FAF056E4C} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{B9FCE31E-4830-408C-95F0-447ACB0B7490} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{C3DF9DE1-3C26-42C8-B972-902214161BD7} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{B8DB9C52-11B7-4D06-8E01-E25903F560CA} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{5CA1ED0D-1322-49F0-920B-F0C4BA36560E} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{DC4C972B-6AE7-4620-B2CB-2AFD106E638B} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{D1953D60-B322-4CAF-92DF-0581A1FD758F} = {45D50C58-9B18-475A-9839-D6754E87352B}
+		{C47F920B-8064-44B0-BF3F-CD29298597A0} = {14D8985E-0AA8-444A-A32E-D766ABA114D6}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AEE441E3-DEE9-48F2-9212-1F3A573007AE}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Z.EntityFramework.Plus.EFCore.NETStandard/Z.EntityFramework.Plus.EFCore.NETStandard.csproj b/src/Z.EntityFramework.Plus.EFCore.NETStandard/Z.EntityFramework.Plus.EFCore.NETStandard.csproj
index fea0e280..dfa53848 100644
--- a/src/Z.EntityFramework.Plus.EFCore.NETStandard/Z.EntityFramework.Plus.EFCore.NETStandard.csproj
+++ b/src/Z.EntityFramework.Plus.EFCore.NETStandard/Z.EntityFramework.Plus.EFCore.NETStandard.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
-    <SignAssembly>True</SignAssembly>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <SignAssembly>False</SignAssembly>
     <AssemblyOriginatorKeyFile>zzzproject.pfx</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
     <Version>1.6.7</Version>
@@ -20,25 +20,19 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>TRACE;RELEASE;NETSTANDARD1_3 EFCORE NET45 FULL</DefineConstants>
+    <DefineConstants>TRACE RELEASE NETSTANDARD1_6 EFCORE NET45 FULL</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_3 EFCORE NET45 FULL</DefineConstants>
+    <DefineConstants>DEBUG;TRACE DEBUG EFCORE FULL NETSTANDARD1_6</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.0.0" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.0.1" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
-  </ItemGroup>
-
   <Import Project="..\shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems" Label="Shared" />
 
-  <Import Project="..\shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems" Label="Shared" />
-
   <Import Project="..\shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems" Label="Shared" />
 
+  <Import Project="..\shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems" Label="Shared" />
+
   <Import Project="..\shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems" Label="Shared" />
 
   <Import Project="..\shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems" Label="Shared" />
@@ -47,8 +41,24 @@
 
   <Import Project="..\shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems" Label="Shared" />
 
+  <Import Project="..\shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems" Label="Shared" />
+
   <Import Project="..\shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems" Label="Shared" />
 
   <Import Project="..\shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems" Label="Shared" />
 
+  <Import Project="..\shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems" Label="Shared" />
+
+  <Import Project="..\shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems" Label="Shared" />
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.3" />
+    <PackageReference Include="System.Data.Common" Version="4.3.0" />
+    <PackageReference Include="System.Reflection" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+	<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Z.EntityFramework.Plus.EFCore.NETStandard20/Z.EntityFramework.Plus.EFCore.NETStandard20.csproj b/src/Z.EntityFramework.Plus.EFCore.NETStandard20/Z.EntityFramework.Plus.EFCore.NETStandard20.csproj
index 2ca4db03..718f492a 100644
--- a/src/Z.EntityFramework.Plus.EFCore.NETStandard20/Z.EntityFramework.Plus.EFCore.NETStandard20.csproj
+++ b/src/Z.EntityFramework.Plus.EFCore.NETStandard20/Z.EntityFramework.Plus.EFCore.NETStandard20.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Globals">
     <SccProjectName>SAK</SccProjectName>
@@ -10,7 +10,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Z.EntityFramework.Plus.EFCore</AssemblyName>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>False</SignAssembly>
     <AssemblyOriginatorKeyFile>zzzproject.pfx</AssemblyOriginatorKeyFile>
     <PackageId>Z.EntityFramework.Plus.EFCore</PackageId>
     <Version>1.6.11</Version>
diff --git a/src/shared/Z.EF.Plus.Audit.Shared/Audit.cs b/src/shared/Z.EF.Plus.Audit.Shared/Audit.cs
index 5738c185..b9a40d5d 100644
--- a/src/shared/Z.EF.Plus.Audit.Shared/Audit.cs
+++ b/src/shared/Z.EF.Plus.Audit.Shared/Audit.cs
@@ -38,7 +38,7 @@ public Audit()
 
             try
             {
-#if !NETSTANDARD1_3
+#if !NETSTANDARD1_6
                 CreatedBy = System.Threading.Thread.CurrentPrincipal.Identity.Name;
 #endif
 
diff --git a/src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs b/src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs
index 1f31c954..79b613b0 100644
--- a/src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs
+++ b/src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs
@@ -13,16 +13,17 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+#if EF5 || EF6
+using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
+using Z.EF.Plus.BatchUpdate.Shared.Extensions;
+using Z.EF.Plus.BatchUpdate.Shared.Model;
+#endif
 
 #if EF5
 using System.Data.Objects;
-using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
-
 #elif EF6
 using System.Data.Entity.Core.Objects;
 using System.Data.Entity.Infrastructure.Interception;
-using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
-
 #elif EFCORE
 using System.Reflection;
 using Microsoft.EntityFrameworkCore;
@@ -186,7 +187,7 @@ public int Execute<T>(IQueryable<T> query) where T : class
                 return 0;
             }
 
-            // GET model and info
+			// GET model and info
 #if EF5 || EF6
             var dbContext = query.GetDbContext();
 
@@ -203,179 +204,186 @@ public int Execute<T>(IQueryable<T> query) where T : class
 #endif
 
             var model = dbContext.GetModel();
-            var entity = model.Entity<T>();
-            var keys = entity.Info.Key.PropertyRefs;
 
-            // SELECT keys names
-            var queryKeys = query.SelectByName(keys.Select(x => x.Name).ToList());
-            var innerObjectQuery = queryKeys.GetObjectQuery();
-             
-            // CREATE command
-            var command = CreateCommand(innerObjectQuery, entity);
+			//get our table definitions for the requested type
+	        IEnumerable<TableDefinition> lsTableDefinitions = model.GetTableDefinitions<T>();
 
-            // WHERE 1 = 0
-            if (command == null)
-            {
-                return 0;
-            }
+	        //reverse the order so the most base table is the first
+			TableDefinition tdBaseTableDefinition = lsTableDefinitions.OrderByDescending(i => i.Order).FirstOrDefault();
 
-            // EXECUTE
-            var ownConnection = false;
+			//stop if there's nothing
+	        if (tdBaseTableDefinition == null)
+	        {
+		        throw new Exception("Could not find Entity meta data");
+	        }
 
-            try
-            {
-                if (innerObjectQuery.Context.Connection.State != ConnectionState.Open)
-                {
-                    ownConnection = true;
-                    innerObjectQuery.Context.Connection.Open();
-                }
+			int rowsAffected = 0;
 
-                if (Executing != null)
-                {
-                    Executing(command);
-                }
+	        // SELECT keys names
+	        var queryKeys = query.SelectByName(tdBaseTableDefinition.Keys.Select(x => x.ColumnName).ToList());
+	        var innerObjectQuery = queryKeys.GetObjectQuery();
 
-#if EF5
-                if (command.GetType().Name == "NpgsqlCommand")
-                {
-                    command.CommandText = command.CommandText.Replace("[", "\"").Replace("]", "\"");
-                    int totalRowAffecteds = command.ExecuteNonQuery();
-                    return totalRowAffecteds;
-                }
-                else if (command.Connection.GetType().Name.Contains("MySql"))
-                {
-                    int totalRowAffecteds = command.ExecuteNonQuery();
-                    return totalRowAffecteds;
-                }
-                else if (command.Connection.GetType().Name.Contains("Oracle"))
-                {
-                    int totalRowAffecteds = command.ExecuteNonQuery();
-                    return totalRowAffecteds;
-                }
-                else if (command.GetType().Name == "SqlCeCommand")
-                {
-                    int totalRowAffecteds = command.ExecuteNonQuery();
-                    return totalRowAffecteds;
-                }
-                else
-                {
-                    var rowAffecteds = (int)command.ExecuteScalar();
-                    return rowAffecteds;
-                }
-#elif EF6
-                var interceptionContext = new DbCommandInterceptionContext(dbContext.GetObjectContext().GetInterceptionContext());
+	        // CREATE command
+	        var command = CreateCommand(innerObjectQuery, tdBaseTableDefinition);
 
-                if (command.GetType().Name == "NpgsqlCommand")
-                {
-                    command.CommandText = command.CommandText.Replace("[", "\"").Replace("]", "\"");
-                    int totalRowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
-                    return totalRowAffecteds;
-                }
-                else if (command.Connection.GetType().Name.Contains("MySql"))
-                {
-                    int totalRowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
-                    return totalRowAffecteds;
-                }
-                else if (command.Connection.GetType().Name.Contains("Oracle") || command.Connection.GetType().Name.Contains("SQLite"))
-                {
-                    int totalRowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
-                    return totalRowAffecteds;
-                }
-                else if (command.GetType().Name == "SqlCeCommand")
-                {
-                    int totalRowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
-                    return totalRowAffecteds;
-                }
-                else
-                {
-                    var rowAffecteds = (int)DbInterception.Dispatch.Command.Scalar(command, interceptionContext);
-                    return rowAffecteds;
-                }
-#endif
+	        // WHERE 1 = 0
+	        if (command == null)
+	        {
+		        return 0;
+	        }
 
-            }
-            finally
-            {
-                if (ownConnection && innerObjectQuery.Context.Connection.State != ConnectionState.Closed)
-                {
-                    innerObjectQuery.Context.Connection.Close();
-                }
-            }
-#elif EFCORE
-            if (BatchDeleteManager.InMemoryDbContextFactory != null && query.IsInMemoryQueryContext())
-            {
-                var context = BatchDeleteManager.InMemoryDbContextFactory();
+	        // EXECUTE
+	        var ownConnection = false;
 
-                var list = query.ToList();
-                context.RemoveRange(list);
-                context.SaveChanges();
-                return list.Count;
-            }
-
-            var dbContext = query.GetDbContext();
-            var entity = dbContext.Model.FindEntityType(typeof(T));
-            var keys = entity.GetKeys().ToList()[0].Properties;
-
-            var queryKeys = query.SelectByName(keys.Select(x => x.Name).ToList());
-
-            // CREATE command
-            var command = CreateCommand(queryKeys, entity);
+	        try
+	        {
+		        if (innerObjectQuery.Context.Connection.State != ConnectionState.Open)
+		        {
+			        ownConnection = true;
+			        innerObjectQuery.Context.Connection.Open();
+		        }
 
-            // EXECUTE
-            var ownConnection = false;
+		        Executing?.Invoke(command);
 
-            try
-            {
-                if (dbContext.Database.GetDbConnection().State != ConnectionState.Open)
-                {
-                    ownConnection = true;
-                    dbContext.Database.OpenConnection();
-                }
+#if EF5
+				if (command.GetType().Name == "NpgsqlCommand")
+				{
+					command.CommandText = command.CommandText.Replace("[", "\"").Replace("]", "\"");
+					rowsAffected += command.ExecuteNonQuery();
+				}
+				else if (command.Connection.GetType().Name.Contains("MySql"))
+				{
+					rowsAffected += command.ExecuteNonQuery();
+				}
+				else if (command.Connection.GetType().Name.Contains("Oracle"))
+				{
+					rowsAffected += command.ExecuteNonQuery();
+				}
+				else if (command.GetType().Name == "SqlCeCommand")
+				{
+					rowsAffected += command.ExecuteNonQuery();
+				}
+				else
+				{
+					rowsAffected += (int)command.ExecuteScalar();
+				}
+#elif EF6
+		        var interceptionContext = new DbCommandInterceptionContext(dbContext.GetObjectContext().GetInterceptionContext());
+
+		        if (command.GetType().Name == "NpgsqlCommand")
+		        {
+			        command.CommandText = command.CommandText.Replace("[", "\"").Replace("]", "\"");
+			        rowsAffected += DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+		        }
+		        else if (command.Connection.GetType().Name.Contains("MySql"))
+		        {
+			        rowsAffected += DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+		        }
+		        else if (command.Connection.GetType().Name.Contains("Oracle") || command.Connection.GetType().Name.Contains("SQLite"))
+		        {
+			        rowsAffected += DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+		        }
+		        else if (command.GetType().Name == "SqlCeCommand")
+		        {
+			        rowsAffected += DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+		        }
+		        else
+		        {
+			        rowsAffected += (int)DbInterception.Dispatch.Command.Scalar(command, interceptionContext);
+		        }
+#endif
+	        }
+	        finally
+	        {
+		        if (ownConnection && innerObjectQuery.Context.Connection.State != ConnectionState.Closed)
+		        {
+			        innerObjectQuery.Context.Connection.Close();
+		        }
+	        }
 
-                if (Executing != null)
-                {
-                    Executing(command);
-                }
+			return rowsAffected;
 
-                if (command.GetType().Name == "NpgsqlCommand")
-                {
-                    command.CommandText = command.CommandText.Replace("[", "\"").Replace("]", "\"");
-                    int totalRowAffecteds = command.ExecuteNonQuery();
-                    return totalRowAffecteds;
-                }
-                else if (command.Connection.GetType().Name.Contains("MySql"))
-                {
-                    int totalRowAffecteds = command.ExecuteNonQuery();
-                    return totalRowAffecteds;
-                }
-                else if (command.GetType().Name.Contains("Sqlite"))
-                {
-                    int totalRowAffecteds = command.ExecuteNonQuery();
-                    return totalRowAffecteds;
-                }
-
-                var rowAffecteds = (int)command.ExecuteScalar();
-                return rowAffecteds;
-            }
-            finally
-            {
-                if (ownConnection && dbContext.Database.GetDbConnection().State != ConnectionState.Closed)
-                {
-                    dbContext.Database.CloseConnection();
-                }
-            }
+#elif EFCORE
+			if (BatchDeleteManager.InMemoryDbContextFactory != null && query.IsInMemoryQueryContext())
+			{
+				var context = BatchDeleteManager.InMemoryDbContextFactory();
+
+				var list = query.ToList();
+				context.RemoveRange(list);
+				context.SaveChanges();
+				return list.Count;
+			}
+
+			var dbContext = query.GetDbContext();
+			var entity = dbContext.Model.FindEntityType(typeof(T));
+
+			//go all the way to our base type
+	        while (entity.BaseType != null)
+	        {
+		        entity = entity.BaseType;
+	        }
+
+			//get our keys
+	        var keys = entity.GetKeys().SelectMany(i => i.Properties);
+
+			var queryKeys = query.SelectByName(keys.Select(x => x.Name).ToList());
+
+			// CREATE command
+			var command = CreateCommand(queryKeys, entity);
+
+			// EXECUTE
+			var ownConnection = false;
+
+	        int intRowsAffected = 0;
+
+			try
+			{
+				if (dbContext.Database.GetDbConnection().State != ConnectionState.Open)
+				{
+					ownConnection = true;
+					dbContext.Database.OpenConnection();
+				}
+
+				Executing?.Invoke(command);
+
+				if (command.GetType().Name == "NpgsqlCommand")
+				{
+					command.CommandText = command.CommandText.Replace("[", "\"").Replace("]", "\"");
+					intRowsAffected = command.ExecuteNonQuery();
+				}
+				else if (command.Connection.GetType().Name.Contains("MySql"))
+				{
+					intRowsAffected = command.ExecuteNonQuery();
+				}
+				else if (command.GetType().Name.Contains("Sqlite"))
+				{
+					intRowsAffected = command.ExecuteNonQuery();
+				}
+				else
+				{
+					intRowsAffected = (int)command.ExecuteScalar();
+				}
+			}
+			finally
+			{
+				if (ownConnection && dbContext.Database.GetDbConnection().State != ConnectionState.Closed)
+				{
+					dbContext.Database.CloseConnection();
+				}
+			}
+
+	        return intRowsAffected;
 #endif
-            }
+        }
 
 #if EF5 || EF6
-        /// <summary>Creates a command to execute the batch operation.</summary>
-        /// <exception cref="Exception">Thrown when an exception error condition occurs.</exception>
-        /// <typeparam name="T">Generic type parameter.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="entity">The schema entity.</param>
-        /// <param name="visitor">The visitor.</param>
-        /// <returns>The new command to execute the batch operation.</returns>
-        internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entity)
+		/// <summary>Creates a command to execute the batch operation.</summary>
+		/// <exception cref="Exception">Thrown when an exception error condition occurs.</exception>
+		/// <typeparam name="T">Generic type parameter.</typeparam>
+		/// <param name="query">The query.</param>
+		/// <param name="tdTableDefinition">The schema entity.</param>
+		/// <returns>The new command to execute the batch operation.</returns>
+		public DbCommand CreateCommand(ObjectQuery query, TableDefinition tdTableDefinition)
         {
             // GET command
             var command = query.Context.CreateStoreCommand();
@@ -396,49 +404,31 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
                 }
             }
 
-            // GET mapping
-            var mapping = entity.Info.EntityTypeMapping.MappingFragment;
-            var store = mapping.StoreEntitySet;
-
             string tableName;
 
             if (isMySql)
             {
-                tableName = string.Concat("`", store.Table, "`");
+                tableName = string.Concat("`", tdTableDefinition.Table, "`");
             }
             else if (isSqlCe)
             {
-                tableName = string.Concat("[", store.Table, "]");
+                tableName = string.Concat("[", tdTableDefinition.Table, "]");
             }
             else if (isSQLite)
             {
-                tableName = string.Concat("\"", store.Table, "\"");
+                tableName = string.Concat("\"", tdTableDefinition.Table, "\"");
             }
             else if (isOracle)
             {
-                tableName = string.IsNullOrEmpty(store.Schema) || store.Schema == "dbo" ?
-string.Concat("\"", store.Table, "\"") :
-string.Concat("\"", store.Schema, "\".\"", store.Table, "\"");
+                tableName = string.IsNullOrEmpty(tdTableDefinition.Schema) || tdTableDefinition.Schema == "dbo" ?
+					string.Concat("\"", tdTableDefinition.Table, "\"") :
+					string.Concat("\"", tdTableDefinition.Schema, "\".\"", tdTableDefinition.Table, "\"");
             }
             else
             {
-                tableName = string.IsNullOrEmpty(store.Schema) ?
-    string.Concat("[", store.Table, "]") :
-    string.Concat("[", store.Schema, "].[", store.Table, "]");
-            }
-
-            // GET keys mappings
-            var columnKeys = new List<string>();
-            foreach (var propertyKey in entity.Info.Key.PropertyRefs)
-            {
-                var mappingProperty = mapping.ScalarProperties.Find(x => x.Name == propertyKey.Name);
-
-                if (mappingProperty == null)
-                {
-                    throw new Exception(string.Format(ExceptionMessage.BatchOperations_PropertyNotFound, propertyKey.Name));
-                }
-
-                columnKeys.Add(mappingProperty.ColumnName);
+                tableName = string.IsNullOrEmpty(tdTableDefinition.Schema) ?
+					string.Concat("[", tdTableDefinition.Table, "]") :
+					string.Concat("[", tdTableDefinition.Schema, "].[", tdTableDefinition.Table, "]");
             }
 
             // GET command text template
@@ -477,11 +467,11 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
             string primaryKeys;
             if (isSqlCe || isOracle || isSQLite)
             {
-                primaryKeys = string.Join(Environment.NewLine + "AND ", columnKeys.Select(x => string.Concat(tableName + ".", EscapeName(x, isMySql, isOracle), " = B.", EscapeName(x, isMySql, isOracle), "")));
+                primaryKeys = string.Join(Environment.NewLine + "AND ", tdTableDefinition.Keys.Select(x => string.Concat(tableName + ".", EscapeName(x.ColumnName, isMySql, isOracle), " = B.", EscapeName(x.ColumnName, isMySql, isOracle), "")));
             }
             else
             {
-                primaryKeys = string.Join(Environment.NewLine + "AND ", columnKeys.Select(x => string.Concat("A.", EscapeName(x, isMySql, isOracle), " = B.", EscapeName(x, isMySql, isOracle), "")));
+                primaryKeys = string.Join(Environment.NewLine + "AND ", tdTableDefinition.Keys.Select(x => string.Concat("A.", EscapeName(x.ColumnName, isMySql, isOracle), " = B.", EscapeName(x.ColumnName, isMySql, isOracle), "")));
             }
 
             // REPLACE template
diff --git a/src/shared/Z.EF.Plus.BatchDelete.Shared/Extensions/Delete.cs b/src/shared/Z.EF.Plus.BatchDelete.Shared/Extensions/Delete.cs
index 8a02dbc9..b154373e 100644
--- a/src/shared/Z.EF.Plus.BatchDelete.Shared/Extensions/Delete.cs
+++ b/src/shared/Z.EF.Plus.BatchDelete.Shared/Extensions/Delete.cs
@@ -36,17 +36,11 @@ public static int Delete<T>(this IQueryable<T> query, Action<BatchDelete> batchD
         {
             var batchDelete = new BatchDelete();
 
-            if (BatchDeleteManager.BatchDeleteBuilder != null)
-            {
-                BatchDeleteManager.BatchDeleteBuilder(batchDelete);
-            }
+			BatchDeleteManager.BatchDeleteBuilder?.Invoke(batchDelete);
 
-            if (batchDeleteBuilder != null)
-            {
-                batchDeleteBuilder(batchDelete);
-            }
+			batchDeleteBuilder?.Invoke(batchDelete);
 
-            return batchDelete.Execute(query);
+			return batchDelete.Execute(query);
         }
     }
 }
\ No newline at end of file
diff --git a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs
index e56bf92a..ec7bd048 100644
--- a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs
+++ b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs
@@ -15,15 +15,18 @@
 #if EF5
 using System.Data.Objects;
 using System.Data.SqlClient;
-using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
-
+using Z.EF.Plus.BatchUpdate.Shared.Extensions;
+using Z.EF.Plus.BatchUpdate.Shared.Model;
+using Z.EntityFramework.Plus.Internal.Core.Mapping;
 #elif EF6
+using Z.EF.Plus.BatchUpdate.Shared.Extensions;
+using Z.EF.Plus.BatchUpdate.Shared.Model;
 using System.Data.Entity.Core.Objects;
 using System.Data.Entity.Infrastructure.Interception;
 using System.Data.SqlClient;
 using System.Reflection;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
-
+using Z.EntityFramework.Plus.Internal.Core.Mapping;
 #elif EFCORE
 using System.Reflection;
 using Microsoft.EntityFrameworkCore;
@@ -31,7 +34,7 @@
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
-
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 #endif
 
 namespace Z.EntityFramework.Plus
@@ -222,7 +225,21 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
 
             // GET model and info
             var model = dbContext.GetModel();
-            var entity = model.Entity<T>();
+
+            //get our list of update entities for this model
+            IEnumerable<TableDefinition> lsTableDefinitions = model
+                .GetTableDefinitions<T>();
+
+			Dictionary<string, TableDefinition> dicTableDefinitionIndex = new Dictionary<string, TableDefinition>();
+
+			//index for easy lookup
+	        foreach (TableDefinition tdTableDefinition in lsTableDefinitions)
+	        {
+		        foreach (ScalarPropertyMapping spmProperty in tdTableDefinition.Properties)
+		        {
+			        dicTableDefinitionIndex[spmProperty.Name] = tdTableDefinition;
+		        }
+	        }
 
             // TODO: Select only key + lambda columns
             // var keys = entity.Info.Key.PropertyRefs;
@@ -230,49 +247,54 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
             //var innerObjectQuery = queryKeys.GetObjectQuery();
             var innerObjectQuery = objectQuery;
 
-            // GET UpdateSetValues
-            var values = GetInnerValues(query, updateFactory, entity);
+            // this will populate the values for all the update entities
+            GetInnerValues(query, updateFactory, dicTableDefinitionIndex);
 
-            // CREATE command
-            var command = CreateCommand(innerObjectQuery, entity, values);
+            int rowAffecteds = 0;
 
-            // WHERE 1 = 0
-            if (command == null)
+			//loop through and process them one at a time
+			foreach (TableDefinition ueUpdateEntity in lsTableDefinitions.OrderByDescending(i => i.Order))
             {
-                return 0;
-            }
-
-            // EXECUTE
-            var ownConnection = false;
+				// CREATE command
+				DbCommand command = CreateCommand(innerObjectQuery, ueUpdateEntity);
 
-            try
-            {
-                if (innerObjectQuery.Context.Connection.State != ConnectionState.Open)
+                // WHERE 1 = 0
+                if (command == null)
                 {
-                    ownConnection = true;
-                    innerObjectQuery.Context.Connection.Open();
+                    return 0;
                 }
 
-                if (Executing != null)
+                // EXECUTE
+                var ownConnection = false;
+
+                try
                 {
-                    Executing(command);
-                }
+                    if (innerObjectQuery.Context.Connection.State != ConnectionState.Open)
+                    {
+                        ownConnection = true;
+                        innerObjectQuery.Context.Connection.Open();
+                    }
+
+                    Executing?.Invoke(command);
 
 #if EF5
-                var rowAffecteds = command.ExecuteNonQuery();
+                    rowAffecteds += command.ExecuteNonQuery();
 #elif EF6
-                var interceptionContext = new DbCommandInterceptionContext(dbContext.GetObjectContext().GetInterceptionContext());
-                var rowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+                    var interceptionContext = new DbCommandInterceptionContext(dbContext.GetObjectContext().GetInterceptionContext());
+                    rowAffecteds += DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
 #endif
-                return rowAffecteds;
-            }
-            finally
-            {
-                if (ownConnection && innerObjectQuery.Context.Connection.State != ConnectionState.Closed)
+                }
+                finally
                 {
-                    innerObjectQuery.Context.Connection.Close();
+                    if (ownConnection && innerObjectQuery.Context.Connection.State != ConnectionState.Closed)
+                    {
+                        innerObjectQuery.Context.Connection.Close();
+                    }
                 }
             }
+
+            return rowAffecteds;
+
 #elif EFCORE
             if (BatchUpdateManager.InMemoryDbContextFactory != null && query.IsInMemoryQueryContext())
             {
@@ -301,60 +323,93 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
                 return list.Count;
             }
 
-            var dbContext = query.GetDbContext();
-            var entity = dbContext.Model.FindEntityType(typeof(T));
+            DbContext dbContext = query.GetDbContext();
 
-            // TODO: Select only key + lambda columns
-            //  var keys = entity.GetKeys().ToList()[0].Properties;
-            //var queryKeys = query.SelectByName(keys.Select(x => x.Name).ToList());
-            //var innerObjectQuery = queryKeys.GetObjectQuery();
-            var queryKeys = query;
+			//get the top most entity
+            IEntityType entity = dbContext.Model.FindEntityType(typeof(T));
 
-            // GET UpdateSetValues
-            var values = GetInnerValues(query, updateFactory, entity);
+			int rowAffecteds = 0;
 
-            // CREATE command
-            var command = CreateCommand(queryKeys, entity, values);
+			// TODO: Select only key + lambda columns
+			//  var keys = entity.GetKeys().ToList()[0].Properties;
+			//var queryKeys = query.SelectByName(keys.Select(x => x.Name).ToList());
+			//var innerObjectQuery = queryKeys.GetObjectQuery();
+			IQueryable<T> queryKeys = query;
 
-            // EXECUTE
-            var ownConnection = false;
+			//holds the tables we've updated
+			HashSet<string> hsUpdated = new HashSet<string>();
 
-            try
-            {
-                if (dbContext.Database.GetDbConnection().State != ConnectionState.Open)
-                {
-                    ownConnection = true;
-                    dbContext.Database.OpenConnection();
-                }
+			//so basically we'll loop iteratively over the root model and it's base types until we have all the tables updated
+			while (true)
+			{
+				IRelationalEntityTypeAnnotations relational = entity.Relational();
 
-                if (Executing != null)
-                {
-                    Executing(command);
-                }
+				//if we've already updated this table, skip it
+				if (hsUpdated.Contains(relational.Schema + "-" + relational.TableName))
+				{
+					//stop if there's nothing more to process
+					if (entity.BaseType == null)
+					{
+						break;
+					}
 
-                var rowAffecteds = command.ExecuteNonQuery();
-                return rowAffecteds;
-            }
-            finally
-            {
-                if (ownConnection && dbContext.Database.GetDbConnection().State != ConnectionState.Closed)
-                {
-                    dbContext.Database.CloseConnection();
-                }
-            }
+					entity = entity.BaseType;
+
+					continue;
+				}
+
+				//add to our index
+				hsUpdated.Add(relational.Schema + "-" + relational.TableName);
+
+				//get the values for this model
+				List<Tuple<string, object>> values = GetInnerValues(query, updateFactory, entity);
+
+				// CREATE command
+				DbCommand command = CreateCommand(queryKeys, entity, values);
+
+				// EXECUTE
+				bool ownConnection = false;
+
+				try
+				{
+					if (dbContext.Database.GetDbConnection().State != ConnectionState.Open)
+					{
+						ownConnection = true;
+						dbContext.Database.OpenConnection();
+					}
+
+					Executing?.Invoke(command);
+
+					rowAffecteds += command.ExecuteNonQuery();
+				}
+				finally
+				{
+					if (ownConnection && dbContext.Database.GetDbConnection().State != ConnectionState.Closed)
+					{
+						dbContext.Database.CloseConnection();
+					}
+				}
+
+				//stop if there's nothing more to process
+				if(entity.BaseType == null)
+				{
+					break;
+				}
+
+				entity = entity.BaseType;
+			}
+
+			return rowAffecteds;
 #endif
-            }
+		}
 
 #if EF5 || EF6
         /// <summary>Creates a command to execute the batch operation.</summary>
         /// <param name="query">The query.</param>
-        /// <param name="entity">The schema entity.</param>
+        /// <param name="ueTableDefinition">The schema entity.</param>
         /// <returns>The new command to execute the batch operation.</returns>
-        internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entity, List<Tuple<string, object>> values)
+        public DbCommand CreateCommand(ObjectQuery query, TableDefinition ueTableDefinition)
         {
-            var objectParameters = values.Where(x => x.Item2 is ObjectParameter);
-            values = values.Except(objectParameters).ToList();
-
             var command = query.Context.CreateStoreCommand();
             bool isMySql = command.GetType().FullName.Contains("MySql");
             var isSqlCe = command.GetType().Name == "SqlCeCommand";
@@ -372,59 +427,39 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
                 }
             }
 
-            // GET mapping
-            var mapping = entity.Info.EntityTypeMapping.MappingFragment;
-            var store = mapping.StoreEntitySet;
-
             string tableName;
 
             if (isMySql)
             {
-                tableName = string.Concat("`", store.Table, "`");
+                tableName = string.Concat("`", ueTableDefinition.Table, "`");
             }
             else if (isSqlCe)
             {
-                tableName = string.Concat("[", store.Table, "]");
+                tableName = string.Concat("[", ueTableDefinition.Table, "]");
             }
             else if (isOracle)
             {
-                tableName = string.IsNullOrEmpty(store.Schema) || store.Schema == "dbo" ?
-                    string.Concat("\"", store.Table, "\"") :
-                    string.Concat("\"", store.Schema, "\".\"", store.Table, "\"");
+                tableName = string.IsNullOrEmpty(ueTableDefinition.Schema) || ueTableDefinition.Schema == "dbo" ?
+                    string.Concat("\"", ueTableDefinition.Table, "\"") :
+                    string.Concat("\"", ueTableDefinition.Schema, "\".\"", ueTableDefinition.Table, "\"");
             }
             else if (isPostgreSQL)
             {
-                tableName = string.IsNullOrEmpty(store.Schema) ?
-                    string.Concat("\"", store.Table, "\"") :
-                    string.Concat("\"", store.Schema, "\".\"", store.Table, "\"");
+                tableName = string.IsNullOrEmpty(ueTableDefinition.Schema) ?
+                    string.Concat("\"", ueTableDefinition.Table, "\"") :
+                    string.Concat("\"", ueTableDefinition.Schema, "\".\"", ueTableDefinition.Table, "\"");
             }
             else if (isSQLite)
             {
-                tableName = string.Concat("\"", store.Table, "\"");
+                tableName = string.Concat("\"", ueTableDefinition.Table, "\"");
             }
             else
             {
-                tableName = string.IsNullOrEmpty(store.Schema) ?
-    string.Concat("[", store.Table, "]") :
-    string.Concat("[", store.Schema, "].[", store.Table, "]");
-            }
-
-
-            // GET keys mappings
-            var columnKeys = new List<string>();
-            foreach (var propertyKey in entity.Info.Key.PropertyRefs)
-            {
-                var mappingProperty = mapping.ScalarProperties.Find(x => x.Name == propertyKey.Name);
-
-                if (mappingProperty == null)
-                {
-                    throw new Exception(string.Format(ExceptionMessage.BatchOperations_PropertyNotFound, propertyKey.Name));
-                }
-
-                columnKeys.Add(mappingProperty.ColumnName);
+                tableName = string.IsNullOrEmpty(ueTableDefinition.Schema) ?
+                    string.Concat("[", ueTableDefinition.Table, "]") :
+                    string.Concat("[", ueTableDefinition.Schema, "].[", ueTableDefinition.Table, "]");
             }
 
-
             // GET command text template
             var commandTextTemplate =
 #if TODO
@@ -456,36 +491,36 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
 
             if (isSqlCe)
             {
-                primaryKeys = string.Join(Environment.NewLine + "AND ", columnKeys.Select(x => string.Concat(tableName + ".", EscapeName(x, isMySql, isOracle, isPostgreSQL), " = B.", EscapeName(x, isMySql, isOracle, isPostgreSQL), "")));
+                primaryKeys = string.Join(Environment.NewLine + "AND ", ueTableDefinition.Keys.Select(x => string.Concat(tableName + ".", EscapeName(x.ColumnName, isMySql, isOracle, isPostgreSQL), " = B.", EscapeName(x.ColumnName, isMySql, isOracle, isPostgreSQL), "")));
 
-                setValues = string.Join("," + Environment.NewLine, values.Select((x, i) => x.Item2 is ConstantExpression ?
+                setValues = string.Join("," + Environment.NewLine, ueTableDefinition.Values.Select((x, i) => x.Item2 is ConstantExpression ?
                     string.Concat(EscapeName(x.Item1, isMySql, isOracle, isPostgreSQL), " = ", ((ConstantExpression) x.Item2).Value.ToString().Replace("B.[", "[")) :
                     string.Concat(EscapeName(x.Item1, isMySql, isOracle, isPostgreSQL), " = @zzz_BatchUpdate_", i)));
             }
             else if (isOracle || isPostgreSQL)
             {
-                primaryKeys = string.Join(Environment.NewLine + "AND ", columnKeys.Select(x => string.Concat(tableName + ".", EscapeName(x, isMySql, isOracle, isPostgreSQL), " = B.", EscapeName(x, isMySql, isOracle, isPostgreSQL), "")));
+                primaryKeys = string.Join(Environment.NewLine + "AND ", ueTableDefinition.Keys.Select(x => string.Concat(tableName + ".", EscapeName(x.ColumnName, isMySql, isOracle, isPostgreSQL), " = B.", EscapeName(x.ColumnName, isMySql, isOracle, isPostgreSQL), "")));
 
                 // GET updateSetValues
-                setValues = string.Join("," + Environment.NewLine, values.Select((x, i) => x.Item2 is ConstantExpression ?
+                setValues = string.Join("," + Environment.NewLine, ueTableDefinition.Values.Select((x, i) => x.Item2 is ConstantExpression ?
                     string.Concat(EscapeName(x.Item1, isMySql, isOracle, isPostgreSQL), " = ", ((ConstantExpression)x.Item2).Value) :
                     string.Concat(EscapeName(x.Item1, isMySql, isOracle, isPostgreSQL), " = :zzz_BatchUpdate_", i)));
             }
             else if (isSQLite)
             {
-                primaryKeys = string.Join(Environment.NewLine + "AND ", columnKeys.Select(x => string.Concat(tableName + ".", EscapeName(x, isMySql, isOracle, isPostgreSQL), " = B.", EscapeName(x, isMySql, isOracle, isPostgreSQL), "")));
+                primaryKeys = string.Join(Environment.NewLine + "AND ", ueTableDefinition.Keys.Select(x => string.Concat(tableName + ".", EscapeName(x.ColumnName, isMySql, isOracle, isPostgreSQL), " = B.", EscapeName(x.ColumnName, isMySql, isOracle, isPostgreSQL), "")));
 
                 // GET updateSetValues
-                setValues = string.Join("," + Environment.NewLine, values.Select((x, i) => x.Item2 is ConstantExpression ?
+                setValues = string.Join("," + Environment.NewLine, ueTableDefinition.Values.Select((x, i) => x.Item2 is ConstantExpression ?
                     string.Concat(EscapeName(x.Item1, isMySql, isOracle, isPostgreSQL), " = ", ((ConstantExpression)x.Item2).Value) :
                     string.Concat(EscapeName(x.Item1, isMySql, isOracle, isPostgreSQL), " = @zzz_BatchUpdate_", i)));
             }
             else
             {
-                primaryKeys = string.Join(Environment.NewLine + "AND ", columnKeys.Select(x => string.Concat("A.", EscapeName(x, isMySql, isOracle, isPostgreSQL), " = B.", EscapeName(x, isMySql, isOracle, isPostgreSQL), "")));
+                primaryKeys = string.Join(Environment.NewLine + "AND ", ueTableDefinition.Keys.Select(x => string.Concat("A.", EscapeName(x.ColumnName, isMySql, isOracle, isPostgreSQL), " = B.", EscapeName(x.ColumnName, isMySql, isOracle, isPostgreSQL), "")));
 
                 // GET updateSetValues
-                setValues = string.Join("," + Environment.NewLine, values.Select((x, i) => x.Item2 is ConstantExpression ?
+                setValues = string.Join("," + Environment.NewLine, ueTableDefinition.Values.Select((x, i) => x.Item2 is ConstantExpression ?
                     string.Concat("A.", EscapeName(x.Item1, isMySql, isOracle, isPostgreSQL), " = ", ((ConstantExpression) x.Item2).Value) :
                     string.Concat("A.", EscapeName(x.Item1, isMySql, isOracle, isPostgreSQL), " = @zzz_BatchUpdate_", i)));
             }
@@ -520,46 +555,50 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
             }
 #endif
 
-            for (var i = 0; i < values.Count; i++)
+            for (int i = 0; i < ueTableDefinition.Values.Count; i++)
             {
-                var value = values[i];
+                Tuple<string, object> value = ueTableDefinition.Values[i];
 
                 if (value.Item2 is ConstantExpression)
                 {
                     continue;
                 }
 
-                var parameterPrefix = isOracle ? ":" : "@";
-
-                var parameter = command.CreateParameter();
-                parameter.ParameterName = parameterPrefix + "zzz_BatchUpdate_" + i;
-                parameter.Value = values[i].Item2 ?? DBNull.Value;
+                DbParameter parameter;
 
-                if (parameter is SqlParameter)
+                //handle object parameters
+                ObjectParameter opItem = value.Item2 as ObjectParameter;
+                if (opItem != null)
                 {
-                    var sqlParameter = (SqlParameter)parameter;
-                    if (sqlParameter.DbType == DbType.DateTime)
-                    {
-                        sqlParameter.DbType = DbType.DateTime2;
-                    }
+                    parameter = command.CreateParameter();
+
+                    parameter.Value = opItem.Value ?? DBNull.Value;
+                    parameter.ParameterName = opItem.Name;
+                    command.Parameters.Add(parameter);
+
+                    //stop here
+                    continue;
                 }
 
-                command.Parameters.Add(parameter);
-            }
+                string parameterPrefix = isOracle ? ":" : "@";
 
-            foreach (var value in objectParameters)
-            {
-                var objectParameter = (ObjectParameter)value.Item2;
+                parameter = command.CreateParameter();
+                parameter.ParameterName = parameterPrefix + "zzz_BatchUpdate_" + i;
+                parameter.Value = value.Item2 ?? DBNull.Value;
 
-                var parameter = command.CreateParameter();
+                //use datetime 2 where applicable
+                SqlParameter sqParameter = parameter as SqlParameter;
+                if (sqParameter?.DbType == DbType.DateTime)
+                {
+                    sqParameter.DbType = DbType.DateTime2;
+                }
 
-                parameter.Value = objectParameter.Value ?? DBNull.Value;
-                parameter.ParameterName = objectParameter.Name;
                 command.Parameters.Add(parameter);
             }
 
             return command;
         }
+
 #elif EFCORE
         public DbCommand CreateCommand(IQueryable query, IEntityType entity, List<Tuple<string, object>> values)
         {
@@ -741,15 +780,10 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity, List<Tuple<
                 CommandTextTemplate;
 
             // GET inner query
-#if EFCORE
             RelationalQueryContext queryContext;
             var relationalCommand = query.CreateCommand(out queryContext);
-#else
-            var relationalCommand = query.CreateCommand();
-#endif
-            var querySelect = relationalCommand.CommandText;
-
 
+            var querySelect = relationalCommand.CommandText;
 
             // GET updateSetValues
             var setValues = "";
@@ -782,7 +816,6 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity, List<Tuple<
             var command = query.GetDbContext().CreateStoreCommand();
             command.CommandText = commandTextTemplate;
 
-#if EFCORE
             // ADD Parameter
             foreach (var relationalParameter in relationalCommand.Parameters)
             {
@@ -793,17 +826,6 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity, List<Tuple<
 
                 command.Parameters.Add(param);
             }
-#else
-            // ADD Parameter
-            var parameterCollection = relationalCommand.Parameters;
-            foreach (var parameter in parameterCollection)
-            {
-                var param = command.CreateParameter();
-                param.CopyFrom(parameter);
-
-                command.Parameters.Add(param);
-            }
-#endif
 
             for (var i = 0; i < values.Count; i++)
             {
@@ -825,104 +847,33 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity, List<Tuple<
 #endif
 
 #if EF5 || EF6
-        internal List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory, SchemaEntityType<T> entity) where T : class
-#elif EFCORE
-        public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory, IEntityType entity) where T : class
-#endif
+        public void GetInnerValues<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory, IDictionary<string, TableDefinition> dicColumns) where T : class
         {
-#if EF5 || EF6
-            // GET mapping
-            var mapping = entity.Info.EntityTypeMapping.MappingFragment;
-#elif EFCORE
-            var context = query.GetDbContext();
-
-            var databaseCreator = context.Database.GetService<IDatabaseCreator>();
-
-            var assembly = databaseCreator.GetType().GetTypeInfo().Assembly;
-            var assemblyName = assembly.GetName().Name;
-
-            MethodInfo dynamicProviderEntityType = null;
-            MethodInfo dynamicProviderProperty = null;
-
-            bool isSqlServer = false;
-            bool isPostgreSQL = false;
-            bool isMySql = false;
-            bool isMySqlPomelo = false;
-            bool isSQLite = false;
-
-            if (assemblyName == "Microsoft.EntityFrameworkCore.SqlServer")
-            {
-                isSqlServer = true;
-                var type = assembly.GetType("Microsoft.EntityFrameworkCore.SqlServerMetadataExtensions");
-                dynamicProviderEntityType = type.GetMethod("SqlServer", new[] { typeof(IEntityType) });
-                dynamicProviderProperty = type.GetMethod("SqlServer", new[] { typeof(IProperty) });
-            }
-            else if (assemblyName == "Npgsql.EntityFrameworkCore.PostgreSQL")
-            {
-                isPostgreSQL = true;
-                var type = assembly.GetType("Microsoft.EntityFrameworkCore.NpgsqlMetadataExtensions");
-                dynamicProviderEntityType = type.GetMethod("Npgsql", new[] { typeof(IEntityType) });
-                dynamicProviderProperty = type.GetMethod("Npgsql", new[] { typeof(IProperty) });
-            }
-            else if (assemblyName == "MySql.Data.EntityFrameworkCore")
-            {
-                isMySql = true;
-                var type = assembly.GetType("MySQL.Data.EntityFrameworkCore.MySQLMetadataExtensions");
-                dynamicProviderEntityType = type.GetMethod("MySQL", new[] { typeof(IEntityType) });
-                dynamicProviderProperty = type.GetMethod("MySQL", new[] { typeof(IProperty) });
-            }
-            else if (assemblyName == "Pomelo.EntityFrameworkCore.MySql")
-            {
-                isMySqlPomelo = true;
-                var type = assembly.GetType("Microsoft.EntityFrameworkCore.MySqlMetadataExtensions");
-                dynamicProviderEntityType = type.GetMethod("MySql", new[] { typeof(IEntityType) });
-                dynamicProviderProperty = type.GetMethod("MySql", new[] { typeof(IProperty) });
-            }
-            else if (assemblyName == "Microsoft.EntityFrameworkCore.Sqlite")
-            {
-                isSQLite = true;
-
-                // CHANGE all for this one?
-                dynamicProviderEntityType = typeof(RelationalMetadataExtensions).GetMethod("Relational", new[] { typeof(IEntityType) });
-                dynamicProviderProperty = typeof(RelationalMetadataExtensions).GetMethod("Relational", new[] { typeof(IProperty) });
-            }
-            else
-            {
-                throw new Exception(string.Format(ExceptionMessage.Unsupported_Provider, assemblyName));
-            }
-
-#endif
-            // GET updateFactory command
+            
             var values = ResolveUpdateFromQueryDictValues(updateFactory);
-            var destinationValues = new List<Tuple<string, object>>();
 
             int valueI = -1;
             foreach (var value in values)
             {
                 valueI++;
 
-#if EF5 || EF6
                 // FIND the mapped column
-                var column = mapping.ScalarProperties.Find(x => x.Name == value.Key);
-                if (column == null)
+                TableDefinition ueTableDefinition = dicColumns.ContainsKey(value.Key) ? dicColumns[value.Key] : null;
+
+                if (ueTableDefinition == null)
                 {
                     throw new Exception("The destination column could not be found:" + value.Key);
                 }
-                var columnName = column.ColumnName;
-#elif EFCORE
 
-                var property = entity.FindProperty(value.Key);
-                var mappingProperty = dynamicProviderProperty.Invoke(null, new[] { property });
+                //get our property 
+                ScalarPropertyMapping spmProperty = ueTableDefinition.Properties.FirstOrDefault(i => i.Name == value.Key);
 
-                var columnNameProperty = mappingProperty.GetType().GetProperty("ColumnName", BindingFlags.Public | BindingFlags.Instance);
-                var columnName = (string)columnNameProperty.GetValue(mappingProperty);
-#endif
-
-                if (value.Value is Expression)
+                Expression exValue = value.Value as Expression;
+                if (exValue != null)
                 {
                     // Oops! the value is not resolved yet!
                     ParameterExpression parameterExpression = null;
-                    ((Expression)value.Value).Visit((ParameterExpression p) =>
+                    exValue.Visit((ParameterExpression p) =>
                     {
                         if (p.Type == typeof(T))
                             parameterExpression = p;
@@ -931,8 +882,8 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
                     });
 
                     // GET the update value by creating a new select command
-                    Type[] typeArguments = { typeof(T), ((Expression)value.Value).Type };
-                    var lambdaExpression = Expression.Lambda(((Expression)value.Value), parameterExpression);
+                    Type[] typeArguments = { typeof(T), exValue.Type };
+                    var lambdaExpression = Expression.Lambda(exValue, parameterExpression);
                     var selectExpression = Expression.Call(
                         typeof(Queryable),
                         "Select",
@@ -940,7 +891,7 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
                         Expression.Constant(query),
                         lambdaExpression);
                     var result = Expression.Lambda(selectExpression).Compile().DynamicInvoke();
-#if EF5 || EF6
+
                     // GET the select command text
                     var commandText = ((IQueryable)result).ToString();
                     var parameters = ((IQueryable) result).GetObjectQuery().Parameters;
@@ -1015,12 +966,125 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
                         valueSql = valueSql.Substring(0, valueSql.LastIndexOf('`') - 4);
                     }
 
+                    foreach (var additionalParameter in parameters)
+                    {
+                        var newName = additionalParameter.Name + "_" + valueI;
+                        var newParameter = new ObjectParameter(newName, additionalParameter.ParameterType)
+                        {
+                            Value = additionalParameter.Value
+                        };
+
+                        ueTableDefinition.Values.Add(new Tuple<string, object>(spmProperty.ColumnName, newParameter));
+
+                        valueSql = valueSql.Replace(additionalParameter.Name, newName);
+                    }
+
+                    ueTableDefinition.Values.Add(new Tuple<string, object>(spmProperty.ColumnName, Expression.Constant(valueSql)));
+                }
+                else
+                {
+                    ueTableDefinition.Values.Add(new Tuple<string, object>(spmProperty.ColumnName, value.Value ?? DBNull.Value));
+                }
+            }
+        }
 #elif EFCORE
+        public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory, IEntityType entity) where T : class
+		{ 
+            var context = query.GetDbContext();
+
+            var databaseCreator = context.Database.GetService<IDatabaseCreator>();
+
+            var assembly = databaseCreator.GetType().GetTypeInfo().Assembly;
+            var assemblyName = assembly.GetName().Name;
+
+            MethodInfo dynamicProviderEntityType = null;
+            MethodInfo dynamicProviderProperty = null;
+
+			if (assemblyName == "Microsoft.EntityFrameworkCore.SqlServer")
+            {
+	            var type = assembly.GetType("Microsoft.EntityFrameworkCore.SqlServerMetadataExtensions");
+                dynamicProviderEntityType = type.GetMethod("SqlServer", new[] { typeof(IEntityType) });
+                dynamicProviderProperty = type.GetMethod("SqlServer", new[] { typeof(IProperty) });
+            }
+            else if (assemblyName == "Npgsql.EntityFrameworkCore.PostgreSQL")
+            {
+	            var type = assembly.GetType("Microsoft.EntityFrameworkCore.NpgsqlMetadataExtensions");
+                dynamicProviderEntityType = type.GetMethod("Npgsql", new[] { typeof(IEntityType) });
+                dynamicProviderProperty = type.GetMethod("Npgsql", new[] { typeof(IProperty) });
+            }
+            else if (assemblyName == "MySql.Data.EntityFrameworkCore")
+            {
+	            var type = assembly.GetType("MySQL.Data.EntityFrameworkCore.MySQLMetadataExtensions");
+                dynamicProviderEntityType = type.GetMethod("MySQL", new[] { typeof(IEntityType) });
+                dynamicProviderProperty = type.GetMethod("MySQL", new[] { typeof(IProperty) });
+            }
+            else if (assemblyName == "Pomelo.EntityFrameworkCore.MySql")
+            {
+	            var type = assembly.GetType("Microsoft.EntityFrameworkCore.MySqlMetadataExtensions");
+                dynamicProviderEntityType = type.GetMethod("MySql", new[] { typeof(IEntityType) });
+                dynamicProviderProperty = type.GetMethod("MySql", new[] { typeof(IProperty) });
+            }
+            else if (assemblyName == "Microsoft.EntityFrameworkCore.Sqlite")
+            {
+	            // CHANGE all for this one?
+                dynamicProviderEntityType = typeof(RelationalMetadataExtensions).GetMethod("Relational", new[] { typeof(IEntityType) });
+                dynamicProviderProperty = typeof(RelationalMetadataExtensions).GetMethod("Relational", new[] { typeof(IProperty) });
+            }
+            else
+            {
+                throw new Exception(string.Format(ExceptionMessage.Unsupported_Provider, assemblyName));
+            }
+
+            // GET updateFactory command
+            var values = ResolveUpdateFromQueryDictValues(updateFactory);
+            var destinationValues = new List<Tuple<string, object>>();
+
+            int valueI = -1;
+            foreach (var value in values)
+            {
+                valueI++;
+
+                var property = entity.FindProperty(value.Key);
+
+				//if we couldn't find the property, skip to the next
+	            if (property == null)
+	            {
+		            continue;
+	            }
+
+                var mappingProperty = dynamicProviderProperty.Invoke(null, new[] { property });
+
+                var columnNameProperty = mappingProperty.GetType().GetProperty("ColumnName", BindingFlags.Public | BindingFlags.Instance);
+                var columnName = (string)columnNameProperty.GetValue(mappingProperty);
+
+                if (value.Value is Expression)
+                {
+                    // Oops! the value is not resolved yet!
+                    ParameterExpression parameterExpression = null;
+                    ((Expression)value.Value).Visit((ParameterExpression p) =>
+                    {
+                        if (p.Type == typeof(T))
+                            parameterExpression = p;
+
+                        return p;
+                    });
+
+                    // GET the update value by creating a new select command
+                    Type[] typeArguments = { typeof(T), ((Expression)value.Value).Type };
+                    var lambdaExpression = Expression.Lambda(((Expression)value.Value), parameterExpression);
+                    var selectExpression = Expression.Call(
+                        typeof(Queryable),
+                        "Select",
+                        typeArguments,
+                        Expression.Constant(query),
+                        lambdaExpression);
+                    var result = Expression.Lambda(selectExpression).Compile().DynamicInvoke();
+
                     RelationalQueryContext queryContext;
                     var command = ((IQueryable)result).CreateCommand(out queryContext);
                     var commandText = command.CommandText;
 
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
                     // GET the 'value' part
                     var pos = commandText.IndexOf("AS [value]" + Environment.NewLine + "FROM", StringComparison.CurrentCultureIgnoreCase) != -1 ?
                         commandText.IndexOf("AS [value]" + Environment.NewLine + "FROM", StringComparison.CurrentCultureIgnoreCase) - 6 :
@@ -1062,22 +1126,6 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
                         var tagToReplace = valueSql.Substring(0, valueSql.IndexOf("]", StringComparison.CurrentCultureIgnoreCase) + 1);
                         valueSql = valueSql.Replace(tagToReplace, "B");
                     }
-#endif
-#if EF5 || EF6
-                    foreach (var additionalParameter in parameters)
-                    {
-                        var newName = additionalParameter.Name + "_" + valueI;
-                        var newParameter = new ObjectParameter(newName, additionalParameter.ParameterType)
-                        {
-                            Value = additionalParameter.Value
-                        };
-                        destinationValues.Add(new Tuple<string, object>(columnName, newParameter));
-
-                        valueSql = valueSql.Replace(additionalParameter.Name, newName);
-                    }
-
-                    // TODO: For EF Core?
-#endif
 
                     destinationValues.Add(new Tuple<string, object>(columnName, Expression.Constant(valueSql)));
                 }
@@ -1089,6 +1137,7 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
 
             return destinationValues;
         }
+#endif
 
         public string EscapeName(string name, bool isMySql, bool isOracle, bool isPostgreSQL)
         {
diff --git a/src/shared/Z.EF.Plus.BatchUpdate.Shared/Extensions/DbModelPlusExtentions.cs b/src/shared/Z.EF.Plus.BatchUpdate.Shared/Extensions/DbModelPlusExtentions.cs
new file mode 100644
index 00000000..290dcc01
--- /dev/null
+++ b/src/shared/Z.EF.Plus.BatchUpdate.Shared/Extensions/DbModelPlusExtentions.cs
@@ -0,0 +1,146 @@
+namespace Z.EF.Plus._Core.Shared.Extensions
+{
+#if FULL || BATCH_DELETE || BATCH_UPDATE
+#if EF5 || EF6
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Z.EF.Plus.BatchUpdate.Shared.Model;
+using Z.EntityFramework.Plus;
+using Z.EntityFramework.Plus.Internal.Core.Infrastructure;
+using Z.EntityFramework.Plus.Internal.Core.Mapping;
+using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
+
+namespace Z.EF.Plus.BatchUpdate.Shared.Extensions
+{
+    public static class DbModelPlusExtentions
+    {
+	    public static IEnumerable<TableDefinition> GetTableDefinitions<T>(this DbModelPlus model)
+	    {
+		    string strName = typeof(T).Name;
+
+			//get our table definitions
+		    IEnumerable<TableDefinition> lsTableDefinitions = GetTableDefinitions(model, strName);
+
+			//holds our new order which everything will be presented
+		    int intCurrentOrder = 0;
+
+			//this will assist with building our new list of combined definitions
+			Dictionary<string, TableDefinition> dicCombinedTableDefinitions = new Dictionary<string, TableDefinition>();
+
+			//loop through our table definitions and combine them
+		    foreach (TableDefinition tdTableDefinition in lsTableDefinitions)
+		    {
+			    string strKey = tdTableDefinition.Schema + "-" + tdTableDefinition.Table;
+
+				//index or retrieve depending if we've hit it before
+				if (!dicCombinedTableDefinitions.ContainsKey(strKey))
+				{
+					//change the order
+					tdTableDefinition.Order = intCurrentOrder;
+
+					//index
+					dicCombinedTableDefinitions[strKey] = tdTableDefinition;
+
+					//increment
+					intCurrentOrder++;
+				}
+				else
+				{
+					TableDefinition tdCurrent = dicCombinedTableDefinitions[strKey];
+
+					//merge our keys
+					tdCurrent.Keys = tdCurrent
+						.Keys
+						.Union(tdTableDefinition.Keys)
+						.GroupBy(i => i.Name)
+						.Select(i => i.FirstOrDefault())
+						.Where(i => i != null)
+						.ToList();
+
+					//merge our properties
+					tdCurrent.Properties = tdCurrent
+						.Properties
+						.Union(tdTableDefinition.Properties)
+						.GroupBy(i => i.Name)
+						.Select(i => i.FirstOrDefault())
+						.Where(i => i != null)
+						.ToList();
+				}
+			}
+
+		    return dicCombinedTableDefinitions.Values;
+	    }
+
+	    private static IEnumerable<TableDefinition> GetTableDefinitions(DbModelPlus model, string strName)
+	    {
+		    //get our entity type
+		    SchemaEntityType setEntityType = model.ConceptualModel.Index_EntityTypes_Name[strName];
+
+			//create our update entity
+		    TableDefinition ueEntity = new TableDefinition();
+
+		    //create our return list and add our definition
+		    List<TableDefinition> lsTableDefinitions = new List<TableDefinition>();
+		    
+			//if we have mapping data, leverage it
+			if (setEntityType.EntityTypeMapping != null)
+		    {
+			    lsTableDefinitions.Add(ueEntity);
+
+				ueEntity.Schema = setEntityType.EntityTypeMapping.MappingFragment.StoreEntitySet.Schema;
+			    ueEntity.Table = setEntityType.EntityTypeMapping.MappingFragment.StoreEntitySet.Table;
+
+			    //map our keys for this model
+			    List<ScalarPropertyMapping> lsKeys = new List<ScalarPropertyMapping>();
+			    foreach (PropertyRefElement propertyKey in setEntityType.EntityTypeMapping.MappingFragment.StoreEntitySet.EntityType.Key.PropertyRefs)
+			    {
+				    ScalarPropertyMapping mappingProperty = setEntityType.EntityTypeMapping.MappingFragment.ScalarProperties.Find(x => x.Name == propertyKey.Name);
+
+				    if (mappingProperty == null)
+				    {
+					    throw new Exception(string.Format(ExceptionMessage.BatchOperations_PropertyNotFound, propertyKey.Name));
+				    }
+
+				    lsKeys.Add(mappingProperty);
+			    }
+			    ueEntity.Keys = lsKeys;
+
+			    //clone our list of properties
+			    ueEntity.Properties = setEntityType.EntityTypeMapping.MappingFragment.ScalarProperties.ToList();
+
+			    //if there's no base type, stop here
+			    if (string.IsNullOrEmpty(setEntityType.BaseType))
+			    {
+				    return lsTableDefinitions;
+			    }
+			}
+
+			//stop here if there's no base type
+		    if (string.IsNullOrEmpty(setEntityType.BaseType))
+		    {
+			    return lsTableDefinitions;
+		    }
+
+		    //strip the alias bit
+		    string strBaseType = setEntityType.BaseType.Replace(model.ConceptualModel.Alias + ".", "");
+
+		    //get the columns for our base class
+		    IEnumerable<TableDefinition> lsBaseTableDefinitions = GetTableDefinitions(model, strBaseType);
+
+		    //increment the order of the base column entities by one
+		    foreach (TableDefinition ueBaseEntity in lsBaseTableDefinitions)
+		    {
+			    ueBaseEntity.Order += 1;
+
+			    lsTableDefinitions.Add(ueBaseEntity);
+		    }
+
+		    return lsTableDefinitions;
+	    }
+	}
+}
+#endif
+#endif
+}
\ No newline at end of file
diff --git a/src/shared/Z.EF.Plus.BatchUpdate.Shared/Extensions/Update.cs b/src/shared/Z.EF.Plus.BatchUpdate.Shared/Extensions/Update.cs
index 1bb04c43..68e69c88 100644
--- a/src/shared/Z.EF.Plus.BatchUpdate.Shared/Extensions/Update.cs
+++ b/src/shared/Z.EF.Plus.BatchUpdate.Shared/Extensions/Update.cs
@@ -39,17 +39,11 @@ public static int Update<T>(this IQueryable<T> query, Expression<Func<T, T>> upd
         {
             var batchUpdate = new BatchUpdate();
 
-            if (BatchUpdateManager.BatchUpdateBuilder != null)
-            {
-                BatchUpdateManager.BatchUpdateBuilder(batchUpdate);
-            }
+			BatchUpdateManager.BatchUpdateBuilder?.Invoke(batchUpdate);
 
-            if (batchUpdateBuilder != null)
-            {
-                batchUpdateBuilder(batchUpdate);
-            }
+			batchUpdateBuilder?.Invoke(batchUpdate);
 
-            return batchUpdate.Execute(query, updateFactory);
+			return batchUpdate.Execute(query, updateFactory);
         }
     }
 }
\ No newline at end of file
diff --git a/src/shared/Z.EF.Plus.QueryDeferred.Shared/QueryDeferredExtensions.cs b/src/shared/Z.EF.Plus.QueryDeferred.Shared/QueryDeferredExtensions.cs
index a582d656..ad3ed92f 100644
--- a/src/shared/Z.EF.Plus.QueryDeferred.Shared/QueryDeferredExtensions.cs
+++ b/src/shared/Z.EF.Plus.QueryDeferred.Shared/QueryDeferredExtensions.cs
@@ -23,7 +23,7 @@ public static partial class QueryDeferredExtensions
     {
         private static MethodInfo GetMethodInfo<T1, T2>(Func<T1, T2> f, T1 unused1)
         {
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
             return f.GetMethodInfo();
 #else
             return f.Method;
@@ -32,7 +32,7 @@ private static MethodInfo GetMethodInfo<T1, T2>(Func<T1, T2> f, T1 unused1)
 
         private static MethodInfo GetMethodInfo<T1, T2, T3>(Func<T1, T2, T3> f, T1 unused1, T2 unused2)
         {
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
             return f.GetMethodInfo();
 #else
             return f.Method;
@@ -41,7 +41,7 @@ private static MethodInfo GetMethodInfo<T1, T2, T3>(Func<T1, T2, T3> f, T1 unuse
 
         private static MethodInfo GetMethodInfo<T1, T2, T3, T4>(Func<T1, T2, T3, T4> f, T1 unused1, T2 unused2, T3 unused3)
         {
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
             return f.GetMethodInfo();
 #else
             return f.Method;
@@ -50,7 +50,7 @@ private static MethodInfo GetMethodInfo<T1, T2, T3, T4>(Func<T1, T2, T3, T4> f,
 
         private static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5>(Func<T1, T2, T3, T4, T5> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4)
         {
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
             return f.GetMethodInfo();
 #else
             return f.Method;
diff --git a/src/shared/Z.EF.Plus.QueryExtensions.Shared/QueryAddOrAppendOrderExpressionVisitor`.cs b/src/shared/Z.EF.Plus.QueryExtensions.Shared/QueryAddOrAppendOrderExpressionVisitor`.cs
index b29eeb6b..f112be7c 100644
--- a/src/shared/Z.EF.Plus.QueryExtensions.Shared/QueryAddOrAppendOrderExpressionVisitor`.cs
+++ b/src/shared/Z.EF.Plus.QueryExtensions.Shared/QueryAddOrAppendOrderExpressionVisitor`.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 
 #if NETCORE50
 using System.Reflection;
diff --git a/src/shared/Z.EF.Plus.QueryExtensions.Shared/QueryAddOrAppendOrderExpressionVisitor`2.cs b/src/shared/Z.EF.Plus.QueryExtensions.Shared/QueryAddOrAppendOrderExpressionVisitor`2.cs
index 36c8c7df..d3b2d108 100644
--- a/src/shared/Z.EF.Plus.QueryExtensions.Shared/QueryAddOrAppendOrderExpressionVisitor`2.cs
+++ b/src/shared/Z.EF.Plus.QueryExtensions.Shared/QueryAddOrAppendOrderExpressionVisitor`2.cs
@@ -10,6 +10,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
+
 #if NETCORE50
 using System.Reflection;
 #endif
diff --git a/src/shared/Z.EF.Plus.QueryFilter.Shared/QueryFilterContext.cs b/src/shared/Z.EF.Plus.QueryFilter.Shared/QueryFilterContext.cs
index 0ba6722f..2f2d4e8f 100644
--- a/src/shared/Z.EF.Plus.QueryFilter.Shared/QueryFilterContext.cs
+++ b/src/shared/Z.EF.Plus.QueryFilter.Shared/QueryFilterContext.cs
@@ -262,7 +262,7 @@ public void LoadGenericContextInfo(DbContext context)
                         FilterSetByType.AddOrAppend(@interface, filterDbSet);
                     }
 
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
                     baseType = baseType.GetTypeInfo().BaseType;
 #else
                     baseType = baseType.BaseType;
diff --git a/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/BaseQueryFilterInterceptor.cs b/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/BaseQueryFilterInterceptor.cs
index 23106a44..40fe3584 100644
--- a/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/BaseQueryFilterInterceptor.cs
+++ b/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/BaseQueryFilterInterceptor.cs
@@ -7,8 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+#if NET45
 using System.Data.Entity.Core.Common.CommandTrees;
+using System.Data.Entity;
+#elif NETSTANDARD1_6
+using Microsoft.EntityFrameworkCore;
+#endif
 
 namespace Z.EntityFramework.Plus
 {
diff --git a/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptor.cs b/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptor.cs
index 17653b8f..3698d245 100644
--- a/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptor.cs
+++ b/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptor.cs
@@ -6,9 +6,13 @@
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
 using System;
-using System.Data.Entity;
-using System.Data.Entity.Core.Common.CommandTrees;
 using System.Linq;
+#if NET45
+using System.Data.Entity.Core.Common.CommandTrees;
+using System.Data.Entity;
+#elif NETSTANDARD1_6
+using Microsoft.EntityFrameworkCore;
+#endif
 
 namespace Z.EntityFramework.Plus
 {
@@ -33,7 +37,7 @@ public QueryFilterInterceptor(Func<IQueryable<T>, IQueryable<T>> filter)
         /// <param name="type">The type.</param>
         /// <returns>The database expression.</returns>
         public override DbExpression GetDbExpression(DbContext context, Type type)
-        {
+		{
             var contextFullName = context.GetType().AssemblyQualifiedName ?? context.GetType().FullName;
             var typeFullName = type.AssemblyQualifiedName ?? type.FullName;
             var hookId = QueryFilterManager.PrefixHook + contextFullName + ";" + typeFullName + ";" + UniqueKey;
diff --git a/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorContext.cs b/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorContext.cs
index 6941de0e..2b3e82f2 100644
--- a/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorContext.cs
+++ b/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorContext.cs
@@ -7,6 +7,9 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+#if NETSTANDARD1_6
+using Microsoft.EntityFrameworkCore;
+#endif
 
 namespace Z.EntityFramework.Plus
 {
diff --git a/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorManager.cs b/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorManager.cs
index 98a9d333..f030524e 100644
--- a/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorManager.cs
+++ b/src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorManager.cs
@@ -2,8 +2,12 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data.Common;
-using System.Data.Entity;
+#if EF5
+using System.Data.Common.CommandTrees;
+#elif EF6
 using System.Data.Entity.Core.Common.CommandTrees;
+#endif
+using System.Data.Entity;
 using System.Data.Entity.Infrastructure.Interception;
 using System.Linq;
 using System.Linq.Expressions;
diff --git a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs
index b9822ed0..3352b6e8 100644
--- a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs
+++ b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs
@@ -392,7 +392,7 @@ protected DbCommand CreateCommandCombined()
 
                     if (isOracle)
                     {
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
                         SetOracleDbType(command.GetType().GetTypeInfo().Assembly, param, 121);
 #else
                         SetOracleDbType(command.GetType().Assembly, param, 121);
@@ -400,7 +400,7 @@ protected DbCommand CreateCommandCombined()
                     }
                     else if (isOracleManaged)
                     {
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
                         SetOracleManagedDbType(command.GetType().GetTypeInfo().Assembly, param, 121);
 #else
                         SetOracleManagedDbType(command.GetType().Assembly, param, 121);
@@ -408,7 +408,7 @@ protected DbCommand CreateCommandCombined()
                     }
                     else if (isOracleDevArt)
                     {
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
                         SetOracleDevArtDbType(command.GetType().GetTypeInfo().Assembly, param, 7);
 #else
                         SetOracleDevArtDbType(command.GetType().Assembly, param, 7);
diff --git a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureEnumerable.cs b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureEnumerable.cs
index 873e7a73..5d9fbe40 100644
--- a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureEnumerable.cs
+++ b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureEnumerable.cs
@@ -17,18 +17,17 @@
 using System.Data.Entity.Core.Objects;
 
 #elif EFCORE
-using System.Linq;
 
 #endif
 
 namespace Z.EntityFramework.Plus
 {
-    /// <summary>Class for query future value.</summary>
-    /// <typeparam name="T">The type of elements of the query.</typeparam>
+	/// <summary>Class for query future value.</summary>
+	/// <typeparam name="T">The type of elements of the query.</typeparam>
 #if QUERY_INCLUDEOPTIMIZED
     internal class QueryFutureEnumerable<T> : BaseQueryFuture, IEnumerable<T>
 #else
-    public class QueryFutureEnumerable<T> : BaseQueryFuture, IEnumerable<T>
+	public class QueryFutureEnumerable<T> : BaseQueryFuture, IEnumerable<T>
 #endif
     {
         /// <summary>The result of the query future.</summary>
diff --git a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureOracleDbReader.cs b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureOracleDbReader.cs
index 37b2c1b3..5c356309 100644
--- a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureOracleDbReader.cs
+++ b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureOracleDbReader.cs
@@ -49,7 +49,7 @@ public override bool HasRows
             get { return Reader.HasRows; }
         }
 
-#if !NETSTANDARD1_3
+#if !NETSTANDARD1_6
         public override void Close()
         {
             Reader.Close();
diff --git a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureValue.cs b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureValue.cs
index 0548bf76..ce76e382 100644
--- a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureValue.cs
+++ b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureValue.cs
@@ -5,9 +5,6 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-using System;
-using System.Collections;
-using System.Data;
 using System.Data.Common;
 using System.Linq;
 using System.Threading.Tasks;
@@ -18,7 +15,6 @@
 using System.Data.Entity.Core.Objects;
 
 #elif EFCORE
-using System.Linq;
 
 #endif
 
diff --git a/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterParentQueryable`.cs b/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterParentQueryable`.cs
index 6a74f9ee..550d48d5 100644
--- a/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterParentQueryable`.cs
+++ b/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterParentQueryable`.cs
@@ -10,10 +10,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using System.Threading.Tasks;
 #if NET45
 using System.Data.Entity.Infrastructure;
-
 #endif
 
 namespace Z.EntityFramework.Plus
diff --git a/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterPathVisitor.cs b/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterPathVisitor.cs
index 432e845d..205caf37 100644
--- a/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterPathVisitor.cs
+++ b/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterPathVisitor.cs
@@ -47,6 +47,7 @@ protected override Expression VisitLambda<T>(Expression<T> node)
                     MethodCallExpression callExpression;
                     while ((callExpression = currentNode as MethodCallExpression) != null)
                     {
+						
                         var isSelectMethod = callExpression.Method.ReflectedType != null
                                              && callExpression.Method.ReflectedType.FullName == "System.Linq.Enumerable"
                                              && (callExpression.Method.Name == "Select"
diff --git a/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterProvider.cs b/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterProvider.cs
index d232e0d1..051ad74d 100644
--- a/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterProvider.cs
+++ b/src/shared/Z.EF.Plus.QueryIncludeFilter.Shared/QueryIncludeFilterProvider.cs
@@ -13,7 +13,6 @@
 using System.Threading.Tasks;
 #if NET45
 using System.Data.Entity.Infrastructure;
-
 #endif
 
 namespace Z.EntityFramework.Plus
@@ -110,8 +109,12 @@ public TResult Execute<TResult>(Expression expression)
             // CHECK if the internal expression can be supported
             var isExpressionSupported = false;
 
-            var firstExpression = methodCall.Arguments.FirstOrDefault(x => x.Type.IsSubclassOf(typeof (Expression)));
-            var unaryExpression = firstExpression as UnaryExpression;
+#if !(EFCORE && NETSTANDARD1_6)
+			var firstExpression = methodCall.Arguments.FirstOrDefault(x => x.Type.IsSubclassOf(typeof (Expression)));
+#else
+			var firstExpression = methodCall.Arguments.FirstOrDefault(x => x.Type.IsAssignableFrom(typeof (Expression)));
+#endif
+			var unaryExpression = firstExpression as UnaryExpression;
             if (firstExpression != null && unaryExpression != null && methodCall.Arguments.Count == 2)
             {
                 var lambdaExpression = unaryExpression.Operand as LambdaExpression;
diff --git a/src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedManager.cs b/src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedManager.cs
index 3df587ff..4a1aa5db 100644
--- a/src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedManager.cs
+++ b/src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedManager.cs
@@ -5,9 +5,6 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-using System;
-using System.Data.Entity;
-
 namespace Z.EntityFramework.Plus
 {
     public class QueryIncludeOptimizedManager
diff --git a/src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedProvider.cs b/src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedProvider.cs
index 3fdc671e..1be83830 100644
--- a/src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedProvider.cs
+++ b/src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedProvider.cs
@@ -7,7 +7,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
@@ -15,21 +15,18 @@
 #if EF5
 using System.Data.Metadata.Edm;
 using System.Data.Objects;
-using System.Linq;
-
 #elif EF6
 using System.Data.Entity.Core.Metadata.Edm;
 using System.Data.Entity.Core.Objects;
-using System.Linq;
-#elif EFCORE
+using System.Data.Entity;
+using System.Data.Entity.Infrastructure;
+#elif EFCORE && NET45
 using Microsoft.Data.Entity.Internal;
 using Microsoft.Data.Entity.Query.Internal;
+#elif EFCORE && NETSTANDARD1_6
+using Microsoft.EntityFrameworkCore.Internal;
+using Microsoft.EntityFrameworkCore.Query.Internal;
 using Remotion.Linq;
-
-#endif
-#if NET45
-using System.Data.Entity.Infrastructure;
-
 #endif
 
 namespace Z.EntityFramework.Plus
@@ -129,7 +126,11 @@ public TResult Execute<TResult>(Expression expression)
             // CHECK if the internal expression can be supported
             var isExpressionSupported = false;
 
-            var firstExpression = methodCall.Arguments.FirstOrDefault(x => x.Type.IsSubclassOf(typeof (Expression)));
+#if !(EFCORE && NETSTANDARD1_6)
+			var firstExpression = methodCall.Arguments.FirstOrDefault(x => x.Type.IsSubclassOf(typeof (Expression)));
+#else
+	        var firstExpression = methodCall.Arguments.FirstOrDefault(x => x.Type.IsAssignableFrom(typeof(Expression)));
+#endif
             if (firstExpression != null && methodCall.Arguments.Count == 2)
             {
                 var quoteExpression = ((UnaryExpression) firstExpression).Operand;
@@ -218,7 +219,10 @@ public TResult Execute<TResult>(Expression expression)
             }
             else
             {
-                value = immediateQuery.Execute(objectQuery.MergeOption).FirstOrDefault();
+#if NETSTANDARD1_6
+				throw new NotImplementedException();
+#else
+				value = immediateQuery.Execute(objectQuery.MergeOption).FirstOrDefault();
 
                 // RESOLVE child queries using .Future()
                 {
@@ -244,7 +248,7 @@ public TResult Execute<TResult>(Expression expression)
 
                     currentQuery.CreateQueryable(currentNewQuery);
                 }
-
+#endif
             }
 
 
@@ -272,7 +276,7 @@ public TResult Execute<TResult>(Expression expression)
 #endif
         }
 
-#if EF6 && NET45
+#if (EF6 && NET45) || EFCORE
         /// <summary>Executes the given expression asynchronously.</summary>
         /// <exception cref="Exception">Thrown when an exception error condition occurs.</exception>
         /// <param name="expression">The expression to execute.</param>
diff --git a/src/shared/Z.EF.Plus._Core.Shared/DynamicAnonymousType/DynamicAnonymousType.cs b/src/shared/Z.EF.Plus._Core.Shared/DynamicAnonymousType/DynamicAnonymousType.cs
index 9513c4c6..a89b0785 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/DynamicAnonymousType/DynamicAnonymousType.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/DynamicAnonymousType/DynamicAnonymousType.cs
@@ -20,7 +20,7 @@ internal static class DynamicAnonymousType
     {
 
         private static readonly AssemblyName AssemblyName = new AssemblyName { Name = "<>f__AnonymousType" };
-#if NETSTANDARD1_3 || NETSTANDARD2_0
+#if NETSTANDARD1_6 || NETSTANDARD2_0
         private static readonly ModuleBuilder ModuleBuilder = System.Reflection.Emit.AssemblyBuilder.DefineDynamicAssembly(AssemblyName, AssemblyBuilderAccess.Run).DefineDynamicModule(AssemblyName.Name);
 #else
         private static readonly ModuleBuilder ModuleBuilder = Thread.GetDomain().DefineDynamicAssembly(AssemblyName, AssemblyBuilderAccess.Run).DefineDynamicModule(AssemblyName.Name);
@@ -112,7 +112,7 @@ public static Type GetDynamicType(List<Tuple<string, Type>> fields)
                 foreach (var field in fields)
                     typeBuilder.DefineField(field.Item1, field.Item2, FieldAttributes.Public);
 
-#if NETSTANDARD1_3 || NETSTANDARD2_0
+#if NETSTANDARD1_6 || NETSTANDARD2_0
                 BuiltTypes[typeKey] = new Tuple<string, Type>(typeName, typeBuilder.CreateTypeInfo().AsType());
 #else
                 BuiltTypes[typeKey] = new Tuple<string, Type>(typeName, typeBuilder.CreateType());
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EF/DbContext/DbContext.GetDbSetProperties.cs b/src/shared/Z.EF.Plus._Core.Shared/EF/DbContext/DbContext.GetDbSetProperties.cs
index 76c3a4b4..59149222 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/EF/DbContext/DbContext.GetDbSetProperties.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/EF/DbContext/DbContext.GetDbSetProperties.cs
@@ -36,7 +36,7 @@ internal static List<PropertyInfo> GetDbSetProperties(this DbContext context)
 #if EF5 || EF6
                 var isDbSet = setType.IsGenericType && (typeof (IDbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()) || setType.GetInterface(typeof (IDbSet<>).FullName) != null);
 #elif EFCORE
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
                 var isDbSet = setType.GetTypeInfo().IsGenericType && (typeof (DbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()));
 #else
                 var isDbSet = setType.IsGenericType && (typeof(DbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()));
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EF/IQueryable`/IQueryable.Order.cs b/src/shared/Z.EF.Plus._Core.Shared/EF/IQueryable`/IQueryable.Order.cs
index 4bc7185f..c9e4d439 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/EF/IQueryable`/IQueryable.Order.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/EF/IQueryable`/IQueryable.Order.cs
@@ -8,7 +8,7 @@
 #if FULL
 using System.Linq;
 using System.Linq.Expressions;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
 using System.Reflection;
 #endif
 namespace Z.EntityFramework.Plus
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EF/Type/Type.GetDbSetElementType.cs b/src/shared/Z.EF.Plus._Core.Shared/EF/Type/Type.GetDbSetElementType.cs
index c142e749..86c479ba 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/EF/Type/Type.GetDbSetElementType.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/EF/Type/Type.GetDbSetElementType.cs
@@ -12,17 +12,13 @@
 #if EF5
 using System.Data.Entity;
 using System.Data.Objects;
-using System.Reflection;
-
 #elif EF6
 using System.Data.Entity;
-using System.Reflection;
-
 #endif
 
 namespace Z.EntityFramework.Plus
 {
-    internal static partial class InternalExtensions
+	internal static partial class InternalExtensions
     {
         public static Type GetDbSetElementType(this Type type)
         {
@@ -44,7 +40,7 @@ public static Type GetDbSetElementType(this Type type)
             return null;
 #elif EFCORE
 
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
             return type.GetTypeInfo().GenericTypeArguments[0];
 #else
             return type.GetGenericArguments()[0];
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EF5_EF6/IQueryable/IQueryable.SelectByName.cs b/src/shared/Z.EF.Plus._Core.Shared/EF5_EF6/IQueryable/IQueryable.SelectByName.cs
index 6b45c72e..6df98c7e 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/EF5_EF6/IQueryable/IQueryable.SelectByName.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/EF5_EF6/IQueryable/IQueryable.SelectByName.cs
@@ -11,7 +11,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
 using System.Reflection;
 #endif
 
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EFCore/CreateEntity/CreateEntityDataReader.cs b/src/shared/Z.EF.Plus._Core.Shared/EFCore/CreateEntity/CreateEntityDataReader.cs
index ccae3cd9..de3ea286 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/EFCore/CreateEntity/CreateEntityDataReader.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/EFCore/CreateEntity/CreateEntityDataReader.cs
@@ -57,7 +57,7 @@ public override int RecordsAffected
             get { return OriginalDataReader.RecordsAffected; }
         }
 
-        //#if !NETSTANDARD1_3
+        //#if !NETSTANDARD1_6
         //        public override void Close()
         //        {
         //            // DO NOT close reader
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EFCore/Type/GetTypeFromAssembly_Core.cs b/src/shared/Z.EF.Plus._Core.Shared/EFCore/Type/GetTypeFromAssembly_Core.cs
index a24395ce..9a349260 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/EFCore/Type/GetTypeFromAssembly_Core.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/EFCore/Type/GetTypeFromAssembly_Core.cs
@@ -17,7 +17,7 @@ internal static partial class InternalExtensions
     {
         internal static Type GetTypeFromAssembly_Core(this Type fromType, string name)
         {
-#if NETSTANDARD1_3
+#if NETSTANDARD1_6
             return fromType.GetTypeInfo().Assembly.GetType(name);
 #else
             return fromType.Assembly.GetType(name);
diff --git a/src/shared/Z.EF.Plus._Core.Shared/Extensions/DbModelPlusExtentions.cs b/src/shared/Z.EF.Plus._Core.Shared/Extensions/DbModelPlusExtentions.cs
new file mode 100644
index 00000000..946b4946
--- /dev/null
+++ b/src/shared/Z.EF.Plus._Core.Shared/Extensions/DbModelPlusExtentions.cs
@@ -0,0 +1,143 @@
+#if FULL || BATCH_DELETE || BATCH_UPDATE
+#if EF5 || EF6
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Z.EF.Plus.BatchUpdate.Shared.Model;
+using Z.EntityFramework.Plus;
+using Z.EntityFramework.Plus.Internal.Core.Infrastructure;
+using Z.EntityFramework.Plus.Internal.Core.Mapping;
+using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
+
+namespace Z.EF.Plus.BatchUpdate.Shared.Extensions
+{
+    public static class DbModelPlusExtentions
+    {
+	    public static IEnumerable<TableDefinition> GetTableDefinitions<T>(this DbModelPlus model)
+	    {
+		    string strName = typeof(T).Name;
+
+			//get our table definitions
+		    IEnumerable<TableDefinition> lsTableDefinitions = GetTableDefinitions(model, strName);
+
+			//holds our new order which everything will be presented
+		    int intCurrentOrder = 0;
+
+			//this will assist with building our new list of combined definitions
+			Dictionary<string, TableDefinition> dicCombinedTableDefinitions = new Dictionary<string, TableDefinition>();
+
+			//loop through our table definitions and combine them
+		    foreach (TableDefinition tdTableDefinition in lsTableDefinitions)
+		    {
+			    string strKey = tdTableDefinition.Schema + "-" + tdTableDefinition.Table;
+
+				//index or retrieve depending if we've hit it before
+				if (!dicCombinedTableDefinitions.ContainsKey(strKey))
+				{
+					//change the order
+					tdTableDefinition.Order = intCurrentOrder;
+
+					//index
+					dicCombinedTableDefinitions[strKey] = tdTableDefinition;
+
+					//increment
+					intCurrentOrder++;
+				}
+				else
+				{
+					TableDefinition tdCurrent = dicCombinedTableDefinitions[strKey];
+
+					//merge our keys
+					tdCurrent.Keys = tdCurrent
+						.Keys
+						.Union(tdTableDefinition.Keys)
+						.GroupBy(i => i.Name)
+						.Select(i => i.FirstOrDefault())
+						.Where(i => i != null)
+						.ToList();
+
+					//merge our properties
+					tdCurrent.Properties = tdCurrent
+						.Properties
+						.Union(tdTableDefinition.Properties)
+						.GroupBy(i => i.Name)
+						.Select(i => i.FirstOrDefault())
+						.Where(i => i != null)
+						.ToList();
+				}
+			}
+
+		    return dicCombinedTableDefinitions.Values;
+	    }
+
+	    private static IEnumerable<TableDefinition> GetTableDefinitions(DbModelPlus model, string strName)
+	    {
+		    //get our entity type
+		    SchemaEntityType setEntityType = model.ConceptualModel.Index_EntityTypes_Name[strName];
+
+			//create our update entity
+		    TableDefinition ueEntity = new TableDefinition();
+
+		    //create our return list and add our definition
+		    List<TableDefinition> lsTableDefinitions = new List<TableDefinition>();
+		    
+			//if we have mapping data, leverage it
+			if (setEntityType.EntityTypeMapping != null)
+		    {
+			    lsTableDefinitions.Add(ueEntity);
+
+				ueEntity.Schema = setEntityType.EntityTypeMapping.MappingFragment.StoreEntitySet.Schema;
+			    ueEntity.Table = setEntityType.EntityTypeMapping.MappingFragment.StoreEntitySet.Table;
+
+			    //map our keys for this model
+			    List<ScalarPropertyMapping> lsKeys = new List<ScalarPropertyMapping>();
+			    foreach (PropertyRefElement propertyKey in setEntityType.EntityTypeMapping.MappingFragment.StoreEntitySet.EntityType.Key.PropertyRefs)
+			    {
+				    ScalarPropertyMapping mappingProperty = setEntityType.EntityTypeMapping.MappingFragment.ScalarProperties.Find(x => x.Name == propertyKey.Name);
+
+				    if (mappingProperty == null)
+				    {
+					    throw new Exception(string.Format(ExceptionMessage.BatchOperations_PropertyNotFound, propertyKey.Name));
+				    }
+
+				    lsKeys.Add(mappingProperty);
+			    }
+			    ueEntity.Keys = lsKeys;
+
+			    //clone our list of properties
+			    ueEntity.Properties = setEntityType.EntityTypeMapping.MappingFragment.ScalarProperties.ToList();
+
+			    //if there's no base type, stop here
+			    if (string.IsNullOrEmpty(setEntityType.BaseType))
+			    {
+				    return lsTableDefinitions;
+			    }
+			}
+
+			//stop here if there's no base type
+		    if (string.IsNullOrEmpty(setEntityType.BaseType))
+		    {
+			    return lsTableDefinitions;
+		    }
+
+		    //strip the alias bit
+		    string strBaseType = setEntityType.BaseType.Replace(model.ConceptualModel.Alias + ".", "");
+
+		    //get the columns for our base class
+		    IEnumerable<TableDefinition> lsBaseTableDefinitions = GetTableDefinitions(model, strBaseType);
+
+		    //increment the order of the base column entities by one
+		    foreach (TableDefinition ueBaseEntity in lsBaseTableDefinitions)
+		    {
+			    ueBaseEntity.Order += 1;
+
+			    lsTableDefinitions.Add(ueBaseEntity);
+		    }
+
+		    return lsTableDefinitions;
+	    }
+	}
+}
+#endif
+#endif
\ No newline at end of file
diff --git a/src/shared/Z.EF.Plus._Core.Shared/Model/Extensions/TableDefinition.cs b/src/shared/Z.EF.Plus._Core.Shared/Model/Extensions/TableDefinition.cs
new file mode 100644
index 00000000..80552eca
--- /dev/null
+++ b/src/shared/Z.EF.Plus._Core.Shared/Model/Extensions/TableDefinition.cs
@@ -0,0 +1,32 @@
+#if FULL || BATCH_DELETE || BATCH_UPDATE
+#if EF5 || EF6
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Z.EntityFramework.Plus.Internal.Core.Mapping;
+using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
+
+namespace Z.EF.Plus.BatchUpdate.Shared.Model
+{
+    public class TableDefinition
+    {
+	    public TableDefinition()
+	    {
+		    Values = new List<Tuple<string, object>>();
+		    Keys = new List<ScalarPropertyMapping>();
+		}
+
+		public List<Tuple<string, object>> Values { get; set; }
+		public List<ScalarPropertyMapping> Keys { get; set; }
+		public List<ScalarPropertyMapping> Properties { get; set; }
+		public string Schema { get; set; }
+		public string Table { get; set; }
+
+		/// <summary>
+		/// When dealing with inherited types, update the entity with the highest order (no dependencies first)
+		/// </summary>
+		public int Order { get; set; }
+    }
+}
+#endif
+#endif
\ No newline at end of file
diff --git a/src/shared/Z.EF.Plus._Core.Shared/Model/Infrastructure/DbModelPlus.cs b/src/shared/Z.EF.Plus._Core.Shared/Model/Infrastructure/DbModelPlus.cs
index f9ce478a..7ce19a5e 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/Model/Infrastructure/DbModelPlus.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/Model/Infrastructure/DbModelPlus.cs
@@ -14,7 +14,7 @@
 namespace Z.EntityFramework.Plus.Internal.Core.Infrastructure
 {
     /// <summary>A data Model for the database.</summary>
-    internal class DbModelPlus
+    public class DbModelPlus
     {
         /// <summary>Gets or sets the conceptual model.</summary>
         /// <value>The conceptual model.</value>
diff --git a/src/shared/Z.EF.Plus._Core.Shared/Model/SchemaObjectModel/Schema.cs b/src/shared/Z.EF.Plus._Core.Shared/Model/SchemaObjectModel/Schema.cs
index a09e0ad5..79d18eb3 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/Model/SchemaObjectModel/Schema.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/Model/SchemaObjectModel/Schema.cs
@@ -25,6 +25,17 @@ public class Schema
 
         #region XmlDeserialization
 
+        /// <summary>
+        ///     Please visit the
+        ///     <see href="http://msdn.microsoft.com/en-us/library/vstudio/bb399292(v=vs.100).aspx">
+        ///         Microsoft documentation
+        ///     </see>
+        ///     for more detail.
+        /// </summary>
+        /// <value>Schema alias for referencing between schemas easily.</value>
+        [XmlAttribute("Alias")]
+        public string Alias { get; set; }
+
         /// <summary>
         ///     Please visit the
         ///     <see href="http://msdn.microsoft.com/en-us/library/vstudio/bb399292(v=vs.100).aspx">
diff --git a/src/shared/Z.EF.Plus._Core.Shared/Model/SchemaObjectModel/SchemaEntityType.cs b/src/shared/Z.EF.Plus._Core.Shared/Model/SchemaObjectModel/SchemaEntityType.cs
index 37e94b9c..b0194427 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/Model/SchemaObjectModel/SchemaEntityType.cs
+++ b/src/shared/Z.EF.Plus._Core.Shared/Model/SchemaObjectModel/SchemaEntityType.cs
@@ -55,6 +55,17 @@ public class SchemaEntityType
         [XmlAttribute("Name")]
         public string Name { get; set; }
 
+        /// <summary>
+        ///     Please visit the
+        ///     <see href="http://msdn.microsoft.com/en-us/library/vstudio/bb399292(v=vs.100).aspx">
+        ///         Microsoft documentation
+        ///     </see>
+        ///     for more detail.
+        /// </summary>
+        /// <value>The name.</value>
+        [XmlAttribute("BaseType")]
+        public string BaseType { get; set; }
+
         /// <summary>
         ///     Please visit the
         ///     <see href="http://msdn.microsoft.com/en-us/library/vstudio/bb399292(v=vs.100).aspx">
diff --git a/src/shared/Z.EF.Plus._Core.Shared/Z.EF.Plus._Core.Shared.projitems b/src/shared/Z.EF.Plus._Core.Shared/Z.EF.Plus._Core.Shared.projitems
index 87100f55..7c871e8f 100644
--- a/src/shared/Z.EF.Plus._Core.Shared/Z.EF.Plus._Core.Shared.projitems
+++ b/src/shared/Z.EF.Plus._Core.Shared/Z.EF.Plus._Core.Shared.projitems
@@ -67,6 +67,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)EF\IQueryable`\IQueryable.ThenBy.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF\IQueryable`\IQueryable.ThenByDescending.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF\Type\Type.GetDbSetElementType.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\DbModelPlusExtentions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\List`\List`.GetVersion.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)LazyAsyncEnumerator\LazyAsyncEnumerator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)LinqExpressionExtensions\LambdaExpression\LambdaExpression.GetPropertyOrFieldAccessor.cs" />
@@ -76,6 +77,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Model\DbContext.GetModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Model\Extensions\String\String.DeserializeXml.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Model\Extensions\String\String.SubstringLastIndexOf.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Model\Extensions\TableDefinition.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Model\Extensions\XElement\XElement.RemoveAllNamespaces.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Model\Infrastructure\DbModelPlus.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Model\Mapping\EntityContainerMapping.cs" />
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/App.config b/src/test/Z.Test.EntityFramework.Plus.EF5/App.config
index d4149b21..7feb23fe 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/App.config
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/App.config
@@ -6,7 +6,7 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <connectionStrings>
-    <add name="TestDatabase" connectionString="Server=XPS8700;Initial Catalog=Z.Test.EntityFramework.Plus.EF5;Integrated Security=True;" providerName="System.Data.SqlClient" />
+    <add name="TestDatabase" connectionString="Server=(local);Initial Catalog=Z.Test.EntityFramework.Plus.EF5;Integrated Security=True;" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Audit_Configuration_UseNullForDBNullValue.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Audit_Configuration_UseNullForDBNullValue.cs
new file mode 100644
index 00000000..ba531e59
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Audit_Configuration_UseNullForDBNullValue.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class Audit_Configuration_UseNullForDBNullValue
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_IncludeProperty/Single.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_IncludeProperty/Single.cs
index 2ee1172f..c4a185ab 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_IncludeProperty/Single.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_IncludeProperty/Single.cs
@@ -145,7 +145,6 @@ public void Single()
                         Assert.AreEqual(1, entries[0].Properties.Count);
                         Assert.AreEqual(3, entries[1].Properties.Count);
                         Assert.AreEqual(3, entries[2].Properties.Count);
-                        var s = (char) 13;
 
                         // ID
                         propertyIndex = 0;
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityAdded_IsFalse.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityAdded_IsFalse.cs
new file mode 100644
index 00000000..6e1fbca4
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityAdded_IsFalse.cs
@@ -0,0 +1,195 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+#if EF5 || EF6
+using System.Data.Entity;
+
+#elif EFCORE
+using Microsoft.Data.Entity;
+
+#endif
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class Audit_Configuration_UseNullForDBNullValue
+    {
+        [TestMethod]
+        public void EntityAdded_IsFalse()
+        {
+            var identitySeed = TestContext.GetIdentitySeed(x => x.Entity_Basic_WithStrings);
+
+            TestContext.DeleteAll(x => x.AuditEntryProperties);
+            TestContext.DeleteAll(x => x.AuditEntries);
+            TestContext.DeleteAll(x => x.Entity_Basic_WithStrings);
+
+            var audit = AuditHelper.AutoSaveAudit();
+            audit.Configuration.UseNullForDBNullValue = false;
+
+            using (var ctx = new TestContext())
+            {
+                TestContext.Insert(ctx, x => x.Entity_Basic_WithStrings, 3);
+                ctx.SaveChanges(audit);
+            }
+
+            // UnitTest - Audit
+            {
+                var entries = audit.Entries;
+
+                // Entries
+                {
+                    // Entries Count
+                    Assert.AreEqual(3, entries.Count);
+
+                    // Entries State
+                    Assert.AreEqual(AuditEntryState.EntityAdded, entries[0].State);
+                    Assert.AreEqual(AuditEntryState.EntityAdded, entries[1].State);
+                    Assert.AreEqual(AuditEntryState.EntityAdded, entries[2].State);
+
+                    // Entries EntitySetName
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[0].EntitySetName);
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[1].EntitySetName);
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[2].EntitySetName);
+
+                    // Entries TypeName
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[0].EntityTypeName);
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[1].EntityTypeName);
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[2].EntityTypeName);
+                }
+
+                // Properties
+                {
+                    var propertyIndex = -1;
+
+                    // Properties Count
+                    Assert.AreEqual(3, entries[0].Properties.Count);
+                    Assert.AreEqual(3, entries[1].Properties.Count);
+                    Assert.AreEqual(3, entries[2].Properties.Count);
+
+                    // ID
+                    propertyIndex = 0;
+                    Assert.AreEqual("ID", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ID", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ID", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(identitySeed + 1, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(identitySeed + 2, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(identitySeed + 3, entries[2].Properties[propertyIndex].NewValue);
+
+                    // ColumnInt
+                    propertyIndex = 1;
+                    Assert.AreEqual("ColumnInt", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnInt", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnInt", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(0, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(1, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(2, entries[2].Properties[propertyIndex].NewValue);
+
+                    // ColumnString
+                    propertyIndex = 2;
+                    Assert.AreEqual("ColumnString", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnString", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnString", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(DBNull.Value, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(DBNull.Value, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(DBNull.Value, entries[2].Properties[propertyIndex].NewValue);
+                }
+            }
+
+            // UnitTest - Audit (Database)
+            {
+                using (var ctx = new TestContext())
+                {
+                    // ENSURE order
+                    var entries = ctx.AuditEntries.OrderBy(x => x.AuditEntryID).Include(x => x.Properties).ToList();
+                    entries.ForEach(x => x.Properties = x.Properties.OrderBy(y => y.AuditEntryPropertyID).ToList());
+
+                    // Entries
+                    {
+                        // Entries Count
+                        Assert.AreEqual(3, entries.Count);
+
+                        // Entries State
+                        Assert.AreEqual(AuditEntryState.EntityAdded, entries[0].State);
+                        Assert.AreEqual(AuditEntryState.EntityAdded, entries[1].State);
+                        Assert.AreEqual(AuditEntryState.EntityAdded, entries[2].State);
+
+                        // Entries EntitySetName
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[0].EntitySetName);
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[1].EntitySetName);
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[2].EntitySetName);
+
+                        // Entries TypeName
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[0].EntityTypeName);
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[1].EntityTypeName);
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[2].EntityTypeName);
+                    }
+
+                    // Properties
+                    {
+                        var propertyIndex = -1;
+
+                        // Properties Count
+                        Assert.AreEqual(3, entries[0].Properties.Count);
+                        Assert.AreEqual(3, entries[1].Properties.Count);
+                        Assert.AreEqual(3, entries[2].Properties.Count);
+
+                        // ID
+                        propertyIndex = 0;
+                        Assert.AreEqual("ID", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ID", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ID", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual((identitySeed + 1).ToString(), entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual((identitySeed + 2).ToString(), entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual((identitySeed + 3).ToString(), entries[2].Properties[propertyIndex].NewValue);
+
+                        // ColumnInt
+                        propertyIndex = 1;
+                        Assert.AreEqual("ColumnInt", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnInt", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnInt", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual("0", entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual("1", entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual("2", entries[2].Properties[propertyIndex].NewValue);
+
+                        // ColumnString
+                        propertyIndex = 2;
+                        Assert.AreEqual("ColumnString", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnString", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnString", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].NewValue);
+                    }
+                }
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityAdded_IsTrue.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityAdded_IsTrue.cs
new file mode 100644
index 00000000..82b756bd
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityAdded_IsTrue.cs
@@ -0,0 +1,194 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+#if EF5 || EF6
+using System.Data.Entity;
+
+#elif EFCORE
+using Microsoft.Data.Entity;
+
+#endif
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class Audit_Configuration_UseNullForDBNullValue
+    {
+        [TestMethod]
+        public void EntityAdded_IsTrue()
+        {
+            var identitySeed = TestContext.GetIdentitySeed(x => x.Entity_Basic_WithStrings);
+
+            TestContext.DeleteAll(x => x.AuditEntryProperties);
+            TestContext.DeleteAll(x => x.AuditEntries);
+            TestContext.DeleteAll(x => x.Entity_Basic_WithStrings);
+
+            var audit = AuditHelper.AutoSaveAudit();
+
+            using (var ctx = new TestContext())
+            {
+                TestContext.Insert(ctx, x => x.Entity_Basic_WithStrings, 3);
+                ctx.SaveChanges(audit);
+            }
+
+            // UnitTest - Audit
+            {
+                var entries = audit.Entries;
+
+                // Entries
+                {
+                    // Entries Count
+                    Assert.AreEqual(3, entries.Count);
+
+                    // Entries State
+                    Assert.AreEqual(AuditEntryState.EntityAdded, entries[0].State);
+                    Assert.AreEqual(AuditEntryState.EntityAdded, entries[1].State);
+                    Assert.AreEqual(AuditEntryState.EntityAdded, entries[2].State);
+
+                    // Entries EntitySetName
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[0].EntitySetName);
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[1].EntitySetName);
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[2].EntitySetName);
+
+                    // Entries TypeName
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[0].EntityTypeName);
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[1].EntityTypeName);
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[2].EntityTypeName);
+                }
+
+                // Properties
+                {
+                    var propertyIndex = -1;
+
+                    // Properties Count
+                    Assert.AreEqual(3, entries[0].Properties.Count);
+                    Assert.AreEqual(3, entries[1].Properties.Count);
+                    Assert.AreEqual(3, entries[2].Properties.Count);
+
+                    // ID
+                    propertyIndex = 0;
+                    Assert.AreEqual("ID", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ID", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ID", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(identitySeed + 1, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(identitySeed + 2, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(identitySeed + 3, entries[2].Properties[propertyIndex].NewValue);
+
+                    // ColumnInt
+                    propertyIndex = 1;
+                    Assert.AreEqual("ColumnInt", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnInt", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnInt", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(0, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(1, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(2, entries[2].Properties[propertyIndex].NewValue);
+
+                    // ColumnString
+                    propertyIndex = 2;
+                    Assert.AreEqual("ColumnString", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnString", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnString", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].NewValue);
+                }
+            }
+
+            // UnitTest - Audit (Database)
+            {
+                using (var ctx = new TestContext())
+                {
+                    // ENSURE order
+                    var entries = ctx.AuditEntries.OrderBy(x => x.AuditEntryID).Include(x => x.Properties).ToList();
+                    entries.ForEach(x => x.Properties = x.Properties.OrderBy(y => y.AuditEntryPropertyID).ToList());
+
+                    // Entries
+                    {
+                        // Entries Count
+                        Assert.AreEqual(3, entries.Count);
+
+                        // Entries State
+                        Assert.AreEqual(AuditEntryState.EntityAdded, entries[0].State);
+                        Assert.AreEqual(AuditEntryState.EntityAdded, entries[1].State);
+                        Assert.AreEqual(AuditEntryState.EntityAdded, entries[2].State);
+
+                        // Entries EntitySetName
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[0].EntitySetName);
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[1].EntitySetName);
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[2].EntitySetName);
+
+                        // Entries TypeName
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[0].EntityTypeName);
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[1].EntityTypeName);
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[2].EntityTypeName);
+                    }
+
+                    // Properties
+                    {
+                        var propertyIndex = -1;
+
+                        // Properties Count
+                        Assert.AreEqual(3, entries[0].Properties.Count);
+                        Assert.AreEqual(3, entries[1].Properties.Count);
+                        Assert.AreEqual(3, entries[2].Properties.Count);
+
+                        // ID
+                        propertyIndex = 0;
+                        Assert.AreEqual("ID", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ID", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ID", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual((identitySeed + 1).ToString(), entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual((identitySeed + 2).ToString(), entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual((identitySeed + 3).ToString(), entries[2].Properties[propertyIndex].NewValue);
+
+                        // ColumnInt
+                        propertyIndex = 1;
+                        Assert.AreEqual("ColumnInt", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnInt", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnInt", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual("0", entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual("1", entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual("2", entries[2].Properties[propertyIndex].NewValue);
+
+                        // ColumnString
+                        propertyIndex = 2;
+                        Assert.AreEqual("ColumnString", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnString", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnString", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].NewValue);
+                    }
+                }
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityModified_IsFalse.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityModified_IsFalse.cs
new file mode 100644
index 00000000..1853e3bd
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityModified_IsFalse.cs
@@ -0,0 +1,198 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+#if EF5 || EF6
+using System.Data.Entity;
+
+#elif EFCORE
+using Microsoft.Data.Entity;
+
+#endif
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class Audit_Configuration_UseNullForDBNullValue
+    {
+        [TestMethod]
+        public void EntityModified_IsFalse()
+        {
+            var identitySeed = TestContext.GetIdentitySeed(x => x.Entity_Basic_WithStrings);
+
+            TestContext.DeleteAll(x => x.AuditEntryProperties);
+            TestContext.DeleteAll(x => x.AuditEntries);
+            TestContext.DeleteAll(x => x.Entity_Basic_WithStrings);
+
+            TestContext.Insert(x => x.Entity_Basic_WithStrings, 3);
+
+            var audit = AuditHelper.AutoSaveAudit();
+            audit.Configuration.IgnorePropertyUnchanged = false;
+            audit.Configuration.UseNullForDBNullValue = false;
+
+            using (var ctx = new TestContext())
+            {
+                ctx.Entity_Basic_WithStrings.ToList().ForEach(x => x.ColumnInt++);
+
+                ctx.SaveChanges(audit);
+            }
+
+            // UnitTest - Audit
+            {
+                var entries = audit.Entries;
+
+                // Entries
+                {
+                    // Entries Count
+                    Assert.AreEqual(3, entries.Count);
+
+                    // Entries State
+                    Assert.AreEqual(AuditEntryState.EntityModified, entries[0].State);
+                    Assert.AreEqual(AuditEntryState.EntityModified, entries[1].State);
+                    Assert.AreEqual(AuditEntryState.EntityModified, entries[2].State);
+
+                    // Entries EntitySetName
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[0].EntitySetName);
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[1].EntitySetName);
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[2].EntitySetName);
+
+                    // Entries TypeName
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[0].EntityTypeName);
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[1].EntityTypeName);
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[2].EntityTypeName);
+                }
+
+                // Properties
+                {
+                    var propertyIndex = -1;
+
+                    // Properties Count
+                    Assert.AreEqual(3, entries[0].Properties.Count);
+                    Assert.AreEqual(3, entries[1].Properties.Count);
+                    Assert.AreEqual(3, entries[2].Properties.Count);
+
+                    // ID
+                    propertyIndex = 0;
+                    Assert.AreEqual("ID", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ID", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ID", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(identitySeed + 1, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(identitySeed + 2, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(identitySeed + 3, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(identitySeed + 1, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(identitySeed + 2, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(identitySeed + 3, entries[2].Properties[propertyIndex].NewValue);
+
+                    propertyIndex = 1;
+                    Assert.AreEqual("ColumnInt", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnInt", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnInt", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(0, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(1, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(2, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(1, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(2, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(3, entries[2].Properties[propertyIndex].NewValue);
+
+                    // ColumnString
+                    propertyIndex = 2;
+                    Assert.AreEqual("ColumnString", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnString", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnString", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(DBNull.Value, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(DBNull.Value, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(DBNull.Value, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(DBNull.Value, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(DBNull.Value, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(DBNull.Value, entries[2].Properties[propertyIndex].NewValue);
+                }
+            }
+
+            // UnitTest - Audit (Database)
+            {
+                using (var ctx = new TestContext())
+                {
+                    // ENSURE order
+                    var entries = ctx.AuditEntries.OrderBy(x => x.AuditEntryID).Include(x => x.Properties).ToList();
+                    entries.ForEach(x => x.Properties = x.Properties.OrderBy(y => y.AuditEntryPropertyID).ToList());
+
+                    // Entries
+                    {
+                        // Entries Count
+                        Assert.AreEqual(3, entries.Count);
+
+                        // Entries State
+                        Assert.AreEqual(AuditEntryState.EntityModified, entries[0].State);
+                        Assert.AreEqual(AuditEntryState.EntityModified, entries[1].State);
+                        Assert.AreEqual(AuditEntryState.EntityModified, entries[2].State);
+
+                        // Entries EntitySetName
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[0].EntitySetName);
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[1].EntitySetName);
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[2].EntitySetName);
+
+                        // Entries TypeName
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[0].EntityTypeName);
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[1].EntityTypeName);
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[2].EntityTypeName);
+                    }
+
+                    // Properties
+                    {
+                        var propertyIndex = -1;
+
+                        // Properties Count
+                        Assert.AreEqual(3, entries[0].Properties.Count);
+                        Assert.AreEqual(3, entries[1].Properties.Count);
+                        Assert.AreEqual(3, entries[2].Properties.Count);
+
+                        // ID
+                        propertyIndex = 0;
+                        Assert.AreEqual("ID", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ID", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ID", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual((identitySeed + 1).ToString(), entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual((identitySeed + 2).ToString(), entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual((identitySeed + 3).ToString(), entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual((identitySeed + 1).ToString(), entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual((identitySeed + 2).ToString(), entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual((identitySeed + 3).ToString(), entries[2].Properties[propertyIndex].NewValue);
+
+                        // ColumnInt
+                        propertyIndex = 1;
+                        Assert.AreEqual("ColumnInt", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnInt", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnInt", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("0", entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual("1", entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual("2", entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual("1", entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual("2", entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual("3", entries[2].Properties[propertyIndex].NewValue);
+
+                        // ColumnString
+                        propertyIndex = 2;
+                        Assert.AreEqual("ColumnString", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnString", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnString", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].NewValue);
+                    }
+                }
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityModified_IsTrue.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityModified_IsTrue.cs
new file mode 100644
index 00000000..fd0b63f9
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/Audit/Configuration_UseNullForDBNullValue/EntityModified_IsTrue.cs
@@ -0,0 +1,196 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+#if EF5 || EF6
+using System.Data.Entity;
+
+#elif EFCORE
+using Microsoft.Data.Entity;
+
+#endif
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class Audit_Configuration_UseNullForDBNullValue
+    {
+        [TestMethod]
+        public void EntityModified_IsTrue()
+        {
+            var identitySeed = TestContext.GetIdentitySeed(x => x.Entity_Basic_WithStrings);
+
+            TestContext.DeleteAll(x => x.AuditEntryProperties);
+            TestContext.DeleteAll(x => x.AuditEntries);
+            TestContext.DeleteAll(x => x.Entity_Basic_WithStrings);
+
+            TestContext.Insert(x => x.Entity_Basic_WithStrings, 3);
+
+            var audit = AuditHelper.AutoSaveAudit();
+            audit.Configuration.IgnorePropertyUnchanged = false;
+
+            using (var ctx = new TestContext())
+            {
+                ctx.Entity_Basic_WithStrings.ToList().ForEach(x => x.ColumnInt++);
+
+                ctx.SaveChanges(audit);
+            }
+
+            // UnitTest - Audit
+            {
+                var entries = audit.Entries;
+
+                // Entries
+                {
+                    // Entries Count
+                    Assert.AreEqual(3, entries.Count);
+
+                    // Entries State
+                    Assert.AreEqual(AuditEntryState.EntityModified, entries[0].State);
+                    Assert.AreEqual(AuditEntryState.EntityModified, entries[1].State);
+                    Assert.AreEqual(AuditEntryState.EntityModified, entries[2].State);
+
+                    // Entries EntitySetName
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[0].EntitySetName);
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[1].EntitySetName);
+                    Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[2].EntitySetName);
+
+                    // Entries TypeName
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[0].EntityTypeName);
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[1].EntityTypeName);
+                    Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[2].EntityTypeName);
+                }
+
+                // Properties
+                {
+                    var propertyIndex = -1;
+
+                    // Properties Count
+                    Assert.AreEqual(3, entries[0].Properties.Count);
+                    Assert.AreEqual(3, entries[1].Properties.Count);
+                    Assert.AreEqual(3, entries[2].Properties.Count);
+
+                    // ID
+                    propertyIndex = 0;
+                    Assert.AreEqual("ID", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ID", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ID", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(identitySeed + 1, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(identitySeed + 2, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(identitySeed + 3, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(identitySeed + 1, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(identitySeed + 2, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(identitySeed + 3, entries[2].Properties[propertyIndex].NewValue);
+
+                    propertyIndex = 1;
+                    Assert.AreEqual("ColumnInt", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnInt", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnInt", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(0, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(1, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(2, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(1, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(2, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(3, entries[2].Properties[propertyIndex].NewValue);
+
+                    // ColumnString
+                    propertyIndex = 2;
+                    Assert.AreEqual("ColumnString", entries[0].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnString", entries[1].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual("ColumnString", entries[2].Properties[propertyIndex].PropertyName);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                    Assert.AreEqual(null, entries[0].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(null, entries[1].Properties[propertyIndex].NewValue);
+                    Assert.AreEqual(null, entries[2].Properties[propertyIndex].NewValue);
+                }
+            }
+
+            // UnitTest - Audit (Database)
+            {
+                using (var ctx = new TestContext())
+                {
+                    // ENSURE order
+                    var entries = ctx.AuditEntries.OrderBy(x => x.AuditEntryID).Include(x => x.Properties).ToList();
+                    entries.ForEach(x => x.Properties = x.Properties.OrderBy(y => y.AuditEntryPropertyID).ToList());
+
+                    // Entries
+                    {
+                        // Entries Count
+                        Assert.AreEqual(3, entries.Count);
+
+                        // Entries State
+                        Assert.AreEqual(AuditEntryState.EntityModified, entries[0].State);
+                        Assert.AreEqual(AuditEntryState.EntityModified, entries[1].State);
+                        Assert.AreEqual(AuditEntryState.EntityModified, entries[2].State);
+
+                        // Entries EntitySetName
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[0].EntitySetName);
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[1].EntitySetName);
+                        Assert.AreEqual(TestContext.TypeName(x => x.Entity_Basic_WithStrings), entries[2].EntitySetName);
+
+                        // Entries TypeName
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[0].EntityTypeName);
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[1].EntityTypeName);
+                        Assert.AreEqual(typeof (Entity_Basic_WithString).Name, entries[2].EntityTypeName);
+                    }
+
+                    // Properties
+                    {
+                        var propertyIndex = -1;
+
+                        // Properties Count
+                        Assert.AreEqual(3, entries[0].Properties.Count);
+                        Assert.AreEqual(3, entries[1].Properties.Count);
+                        Assert.AreEqual(3, entries[2].Properties.Count);
+
+                        // ID
+                        propertyIndex = 0;
+                        Assert.AreEqual("ID", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ID", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ID", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual((identitySeed + 1).ToString(), entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual((identitySeed + 2).ToString(), entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual((identitySeed + 3).ToString(), entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual((identitySeed + 1).ToString(), entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual((identitySeed + 2).ToString(), entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual((identitySeed + 3).ToString(), entries[2].Properties[propertyIndex].NewValue);
+
+                        // ColumnInt
+                        propertyIndex = 1;
+                        Assert.AreEqual("ColumnInt", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnInt", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnInt", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("0", entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual("1", entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual("2", entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual("1", entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual("2", entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual("3", entries[2].Properties[propertyIndex].NewValue);
+
+                        // ColumnString
+                        propertyIndex = 2;
+                        Assert.AreEqual("ColumnString", entries[0].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnString", entries[1].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual("ColumnString", entries[2].Properties[propertyIndex].PropertyName);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].OldValue);
+                        Assert.AreEqual(null, entries[0].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual(null, entries[1].Properties[propertyIndex].NewValue);
+                        Assert.AreEqual(null, entries[2].Properties[propertyIndex].NewValue);
+                    }
+                }
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/BatchDelete_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/BatchDelete_Inheritance.cs
new file mode 100644
index 00000000..d68ce8f1
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/BatchDelete_Inheritance.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class BatchDelete_Inheritance
+	{
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/Template.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/Template.cs
index 4412c07a..7af34492 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/Template.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/Template.cs
@@ -62,7 +62,7 @@ FROM [dbo].[Entity_Basic] AS [Extent1]
                     ) AS B ON A.[ID] = B.[ID]
 
 SELECT @@ROWCOUNT
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
 DELETE
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/WhileDelayTemplate.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/WhileDelayTemplate.cs
index d7adef26..55068d80 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/WhileDelayTemplate.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/WhileDelayTemplate.cs
@@ -96,7 +96,7 @@ FROM [dbo].[Entity_Basic] AS [Extent1]
     END
 
 SELECT  @totalRowAffected
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
 DECLARE @rowAffected INT
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/WhileTemplate.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/WhileTemplate.cs
index 4b643a72..bd847eb9 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/WhileTemplate.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Executing/WhileTemplate.cs
@@ -82,7 +82,7 @@ FROM [dbo].[Entity_Basic] AS [Extent1]
     END
 
 SELECT  @totalRowAffected
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
 DECLARE @rowAffected INT
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Inheritance/BatchDelete_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Inheritance/BatchDelete_Inheritance.cs
new file mode 100644
index 00000000..1066ff63
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Inheritance/BatchDelete_Inheritance.cs
@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public partial class BatchDelete_Inheritance
+	{
+		[TestMethod]
+		public void DeleteAllTPT()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//make sure our FK between Animals and Dogs supports cascade
+				tcContext.Database.ExecuteSqlCommand(@"
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs] DROP CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs]  WITH CHECK ADD  CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID] FOREIGN KEY([ID])
+					REFERENCES [dbo].[Inheritance_TPT_Animals] ([ID])
+					ON UPDATE CASCADE
+					ON DELETE CASCADE;
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs] CHECK CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats] DROP CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats]  WITH CHECK ADD  CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID] FOREIGN KEY([ID])
+					REFERENCES [dbo].[Inheritance_TPT_Animals] ([ID])
+					ON UPDATE CASCADE
+					ON DELETE CASCADE;
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats] CHECK CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID];
+				");
+
+				//clear all animals
+				tcContext.DeleteAll<Inheritance_TPT_Animal>();
+
+				//add 50 new dogs
+				tcContext.Insert<Inheritance_TPT_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPT_Cat>(25);
+
+				//add some diverity to our data
+				int intRowsAffected = tcContext
+					.Inheritance_TPT_Cats
+					.Take(10)
+					.Update(i => new Inheritance_TPT_Cat()
+					{
+						ColumnCat = 888,
+						ColumnInt = 2
+					});
+
+				//we should have 20 affected rows
+				Assert.AreEqual(20, intRowsAffected);
+
+				//add some diverity to our data
+				intRowsAffected = tcContext
+					.Inheritance_TPT_Dogs
+					.Take(10)
+					.Update(i => new Inheritance_TPT_Dog()
+					{
+						ColumnDog = 999,
+						ColumnInt = 1
+					});
+
+				//we should have 20 affected rows
+				Assert.AreEqual(20, intRowsAffected);
+
+				//delete our dogs
+				intRowsAffected = tcContext.Inheritance_TPT_Dogs.Where(i => i.ColumnDog == 999).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 40 dogs remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPT_Dogs.Count(i => i.ColumnDog == 999));
+				Assert.AreEqual(40, tcContext.Inheritance_TPT_Dogs.Count());
+
+				//delete our cats
+				intRowsAffected = tcContext.Inheritance_TPT_Cats.Where(i => i.ColumnCat == 888).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 15 cats remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPT_Cats.Count(i => i.ColumnCat == 888));
+				Assert.AreEqual(15, tcContext.Inheritance_TPT_Cats.Count());
+
+				//we should have 55 animals in total
+				Assert.AreEqual(55, tcContext.Inheritance_TPT_Animals.Count());
+
+				//undo our change
+				tcContext.Database.ExecuteSqlCommand(@"
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs] DROP CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs]  WITH CHECK ADD  CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID] FOREIGN KEY([ID])
+					REFERENCES [dbo].[Inheritance_TPT_Animals] ([ID]);
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs] CHECK CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats] DROP CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats]  WITH CHECK ADD  CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID] FOREIGN KEY([ID])
+					REFERENCES [dbo].[Inheritance_TPT_Animals] ([ID]);
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats] CHECK CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID];
+				");
+			}
+		}
+
+		[TestMethod]
+		public void DeleteAllTPH()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//clear all animals
+				tcContext.DeleteAll<Inheritance_TPH_Animal>();
+
+				//add 50 new dogs
+				tcContext.Insert<Inheritance_TPH_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPH_Cat>(25);
+
+				//add some diverity to our data
+				int intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Cat>()
+					.Take(10)
+					.Update(i => new Inheritance_TPH_Cat()
+					{
+						ColumnCat = 888,
+						ColumnInt = 2
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//add some diverity to our data
+				intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Dog>()
+					.Take(10)
+					.Update(i => new Inheritance_TPH_Dog()
+					{
+						ColumnDog = 999,
+						ColumnInt = 1
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//delete our dogs
+				intRowsAffected = tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Where(i => i.ColumnDog == 999).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 40 dogs remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count(i => i.ColumnDog == 999));
+				Assert.AreEqual(40, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count());
+
+				//delete our cats
+				intRowsAffected = tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Where(i => i.ColumnCat == 888).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 15 cats remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count(i => i.ColumnCat == 888));
+				Assert.AreEqual(15, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count());
+
+				//we should have 55 animals in total
+				Assert.AreEqual(55, tcContext.Inheritance_TPH_Animals.Count());
+			}
+		}
+
+		[TestMethod]
+		public void DeleteAllTPC()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//clear all animals
+				tcContext.DeleteAll<Inheritance_TPC_Cat>();
+				tcContext.DeleteAll<Inheritance_TPC_Dog>();
+
+				//add 50 new dogs
+				tcContext.Insert<Inheritance_TPC_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPC_Cat>(25);
+
+				//add some diverity to our data
+				int intRowsAffected = tcContext
+					.Inheritance_TPC_Cats
+					.Take(10)
+					.Update(i => new Inheritance_TPC_Cat()
+					{
+						ColumnCat = 888,
+						ColumnInt = 2
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//add some diverity to our data
+				intRowsAffected = tcContext
+					.Inheritance_TPC_Dogs
+					.Take(10)
+					.Update(i => new Inheritance_TPC_Dog()
+					{
+						ColumnDog = 999,
+						ColumnInt = 1
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//delete our dogs
+				intRowsAffected = tcContext.Inheritance_TPC_Dogs.Where(i => i.ColumnDog == 999).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 40 dogs remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPC_Dogs.Count(i => i.ColumnDog == 999));
+				Assert.AreEqual(40, tcContext.Inheritance_TPC_Dogs.Count());
+
+				//delete our cats
+				intRowsAffected = tcContext.Inheritance_TPC_Cats.Where(i => i.ColumnCat == 888).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 15 cats remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPC_Cats.Count(i => i.ColumnCat == 888));
+				Assert.AreEqual(15, tcContext.Inheritance_TPC_Cats.Count());
+			}
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Visitor/Skip.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Visitor/Skip.cs
index aa5e9dc5..e3619947 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Visitor/Skip.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Visitor/Skip.cs
@@ -27,7 +27,7 @@ public void Skip()
                 Assert.AreEqual(1225, ctx.Entity_Basics.Sum(x => x.ColumnInt));
 
                 // ACTION
-                var rowsAffected = ctx.Entity_Basics.Where(x => x.ColumnInt > 10 && x.ColumnInt <= 40).OrderBy(x => x.ID).Skip(20).Delete(delete => delete.Executing = command => sql = command.CommandText);
+                var rowsAffected = ctx.Entity_Basics.Where(x => x.ColumnInt > 10 && x.ColumnInt <= 40).OrderBy(x => x.ColumnInt).Skip(20).Delete(delete => delete.Executing = command => sql = command.CommandText);
 
                 // AFTER
                 Assert.AreEqual(870, ctx.Entity_Basics.Sum(x => x.ColumnInt));
@@ -51,7 +51,7 @@ ORDER BY [Filter1].[ID] ASC
 SELECT @@ROWCOUNT
 ", sql);
 #elif EF6
-                  Assert.AreEqual(@"
+                Assert.AreEqual(@"
 DELETE
 FROM    A
 FROM    [dbo].[Entity_Basic] AS A
@@ -59,35 +59,28 @@ INNER JOIN ( SELECT
     [Extent1].[ID] AS [ID]
     FROM [dbo].[Entity_Basic] AS [Extent1]
     WHERE ([Extent1].[ColumnInt] > 10) AND ([Extent1].[ColumnInt] <= 40)
-    ORDER BY [Extent1].[ID] ASC
+    ORDER BY [Extent1].[ColumnInt] ASC
     OFFSET 20 ROWS FETCH NEXT 2147483647 ROWS ONLY 
                     ) AS B ON A.[ID] = B.[ID]
 
 SELECT @@ROWCOUNT
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
-DECLARE @rowAffected INT
-DECLARE @totalRowAffected INT
-
-SET @totalRowAffected = 0
-
-WHILE @rowAffected IS NULL
-    OR @rowAffected > 0
-    BEGIN
-        DELETE TOP (4000)
-        FROM    A
-        FROM    [Entity_Basic] AS A
-                INNER JOIN ( SELECT [x].[ID]
-FROM [Entity_Basic] AS [x]
-WHERE ([x].[ColumnInt] > 10) AND ([x].[ColumnInt] <= 40)
-                           ) AS B ON A.[ID] = B.[ID]
-
-        SET @rowAffected = @@ROWCOUNT
-        SET @totalRowAffected = @totalRowAffected + @rowAffected
-    END
+DELETE
+FROM    A
+FROM    [Entity_Basic] AS A
+        INNER JOIN ( SELECT [t].[ID]
+FROM (
+    SELECT [x0].*
+    FROM [Entity_Basic] AS [x0]
+    WHERE ([x0].[ColumnInt] > 10) AND ([x0].[ColumnInt] <= 40)
+    ORDER BY [x0].[ColumnInt]
+    OFFSET @__p_0 ROWS FETCH NEXT @__p_1 ROWS ONLY
+) AS [t]
+                    ) AS B ON A.[ID] = B.[ID]
 
-SELECT  @totalRowAffected
+SELECT @@ROWCOUNT
 ", sql);
 #endif
             }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Visitor/Take.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Visitor/Take.cs
index bdeeaf52..673d505a 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Visitor/Take.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchDelete/Visitor/Take.cs
@@ -27,7 +27,7 @@ public void Take()
                 Assert.AreEqual(1225, ctx.Entity_Basics.Sum(x => x.ColumnInt));
 
                 // ACTION
-                var rowsAffected = ctx.Entity_Basics.Where(x => x.ColumnInt > 10 && x.ColumnInt <= 40).OrderBy(x => x.ID).Take(20).Delete(delete => delete.Executing = command => sql = command.CommandText);
+                var rowsAffected = ctx.Entity_Basics.Where(x => x.ColumnInt > 10 && x.ColumnInt <= 40).OrderBy(x => x.ColumnInt).Take(20).Delete(delete => delete.Executing = command => sql = command.CommandText);
 
                 // AFTER
                 Assert.AreEqual(815, ctx.Entity_Basics.Sum(x => x.ColumnInt));
@@ -48,7 +48,7 @@ ORDER BY [Extent1].[ID] ASC
 SELECT @@ROWCOUNT
 ", sql);
 #elif EF6
-                  Assert.AreEqual(@"
+                Assert.AreEqual(@"
 DELETE
 FROM    A
 FROM    [dbo].[Entity_Basic] AS A
@@ -56,34 +56,29 @@ INNER JOIN ( SELECT TOP (20)
     [Extent1].[ID] AS [ID]
     FROM [dbo].[Entity_Basic] AS [Extent1]
     WHERE ([Extent1].[ColumnInt] > 10) AND ([Extent1].[ColumnInt] <= 40)
-    ORDER BY [Extent1].[ID] ASC
+    ORDER BY [Extent1].[ColumnInt] ASC
                     ) AS B ON A.[ID] = B.[ID]
 
 SELECT @@ROWCOUNT
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
-DECLARE @rowAffected INT
-DECLARE @totalRowAffected INT
-
-SET @totalRowAffected = 0
-
-WHILE @rowAffected IS NULL
-    OR @rowAffected > 0
-    BEGIN
-        DELETE TOP (4000)
-        FROM    A
-        FROM    [Entity_Basic] AS A
-                INNER JOIN ( SELECT [x].[ID]
-FROM [Entity_Basic] AS [x]
-WHERE ([x].[ColumnInt] > 10) AND ([x].[ColumnInt] <= 40)
-                           ) AS B ON A.[ID] = B.[ID]
-
-        SET @rowAffected = @@ROWCOUNT
-        SET @totalRowAffected = @totalRowAffected + @rowAffected
-    END
+DELETE
+FROM    A
+FROM    [Entity_Basic] AS A
+        INNER JOIN ( SELECT [t1].[ID]
+FROM (
+    SELECT TOP(@__p_1) [t0].*
+    FROM (
+        SELECT TOP(@__p_0) [x0].*
+        FROM [Entity_Basic] AS [x0]
+        WHERE ([x0].[ColumnInt] > 10) AND ([x0].[ColumnInt] <= 40)
+        ORDER BY [x0].[ColumnInt]
+    ) AS [t0]
+) AS [t1]
+                    ) AS B ON A.[ID] = B.[ID]
 
-SELECT  @totalRowAffected
+SELECT @@ROWCOUNT
 ", sql);
 #endif
             }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchUpdate/BatchUpdate_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchUpdate/BatchUpdate_Inheritance.cs
new file mode 100644
index 00000000..d4924ca1
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchUpdate/BatchUpdate_Inheritance.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class BatchUpdate_Inheritance
+	{
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs
new file mode 100644
index 00000000..efbcfc10
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public partial class BatchUpdate_Inheritance
+	{
+		[TestMethod]
+		public void UpdateAllTPT()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//delete all the animals
+				tcContext.DeleteAll<Inheritance_TPT_Animal>();
+
+				//add 50 dogs
+				tcContext.Insert<Inheritance_TPT_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPT_Cat>(25);
+
+				//update our dogs and the base animals
+				int intRowsAffected = tcContext
+					.Inheritance_TPT_Dogs
+					.Update(i => new Inheritance_TPT_Dog()
+					{
+						ColumnDog = 2,
+						ColumnInt = 1
+					});
+
+				//we should have 100 affected rows. 50 Inheritance_TPT_Cat rows and 50 Inheritance_TPT_Animal rows
+				Assert.AreEqual(100, intRowsAffected);
+
+				//update our cats and the base animals
+				intRowsAffected = tcContext
+					.Inheritance_TPT_Cats
+					.Update(i => new Inheritance_TPT_Cat()
+					{
+						ColumnCat = 3,
+						ColumnInt = 2
+					});
+
+				//we should have 50 affected rows. 25 Inheritance_TPT_Cat rows and 25 Inheritance_TPT_Animal rows
+				Assert.AreEqual(50, intRowsAffected);
+
+				//verify that the dogs were updated properly
+				Assert.AreEqual(100, tcContext.Inheritance_TPT_Dogs.Sum(i => i.ColumnDog));
+				Assert.AreEqual(50, tcContext.Inheritance_TPT_Dogs.Sum(i => i.ColumnInt));
+
+				//verify that the cats were updated properly
+				Assert.AreEqual(75, tcContext.Inheritance_TPT_Cats.Sum(i => i.ColumnCat));
+				Assert.AreEqual(50, tcContext.Inheritance_TPT_Cats.Sum(i => i.ColumnInt));
+
+				//there should be 75 animals
+				Assert.AreEqual(75, tcContext.Inheritance_TPT_Animals.Count());
+			}
+		}
+
+		[TestMethod]
+		public void UpdateAllTPH()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//delete all the animals
+				tcContext.DeleteAll<Inheritance_TPH_Animal>();
+
+				//add 50 dogs
+				tcContext.Insert<Inheritance_TPH_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPH_Cat>(25);
+
+				//update our dogs and the base animals
+				int intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Dog>()
+					.Update(i => new Inheritance_TPH_Dog()
+					{
+						ColumnDog = 2,
+						ColumnInt = 1
+					});
+
+				//we should have 50 affected rows.
+				Assert.AreEqual(50, intRowsAffected);
+
+				//update our dogs and the base animals
+				intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Cat>()
+					.Update(i => new Inheritance_TPH_Cat()
+					{
+						ColumnCat = 3,
+						ColumnInt = 2
+					});
+
+				//we should have 25 affected rows.
+				Assert.AreEqual(25, intRowsAffected);
+
+				//verify that the dogs were updated properly
+				Assert.AreEqual(100, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Sum(i => i.ColumnDog));
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Sum(i => i.ColumnInt));
+
+				//verify that the cats were updated properly
+				Assert.AreEqual(75, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Sum(i => i.ColumnCat));
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Sum(i => i.ColumnInt));
+
+				//there should 25 cats
+				Assert.AreEqual(25, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count());
+
+				//there should be 50 dogs
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count());
+
+				//there should be 75 animals
+				Assert.AreEqual(75, tcContext.Inheritance_TPH_Animals.Count());
+			}
+		}
+
+		[TestMethod]
+		public void UpdateAllTPC()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//delete all the animals
+				tcContext.DeleteAll<Inheritance_TPC_Cat>();
+				tcContext.DeleteAll<Inheritance_TPC_Dog>();
+
+				//add 50 dogs
+				tcContext.Insert<Inheritance_TPC_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPC_Cat>(25);
+
+				//update our dogs and the base animals
+				int intRowsAffected = tcContext.Inheritance_TPC_Dogs.Update(i => new Inheritance_TPC_Dog()
+				{
+					ColumnDog = 2,
+					ColumnInt = 1
+				});
+
+				//we should have 50 affected rows as there's only one table and 50 dogs to update
+				Assert.AreEqual(50, intRowsAffected);
+
+				//verify that they were updated properly
+				Assert.AreEqual(100, tcContext.Inheritance_TPC_Dogs.Sum(i => i.ColumnDog));
+				Assert.AreEqual(50, tcContext.Inheritance_TPC_Dogs.Sum(i => i.ColumnInt));
+
+				//update our dogs and the base animals
+				intRowsAffected = tcContext.Inheritance_TPC_Cats.Update(i => new Inheritance_TPC_Cat()
+				{
+					ColumnCat = 3,
+					ColumnInt = 2
+				});
+
+				//we should have 25 affected rows as there's only one table and 25 cats to update
+				Assert.AreEqual(25, intRowsAffected);
+
+				//verify that they were updated properly
+				Assert.AreEqual(75, tcContext.Inheritance_TPC_Cats.Sum(i => i.ColumnCat));
+				Assert.AreEqual(50, tcContext.Inheritance_TPC_Cats.Sum(i => i.ColumnInt));
+			}
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/None.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/None.cs
deleted file mode 100644
index 251994ae..00000000
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/None.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
-// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
-// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
-// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
-// More projects: http://www.zzzprojects.com/
-// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
-
-using System;
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Z.EntityFramework.Plus;
-
-namespace Z.Test.EntityFramework.Plus
-{
-    public partial class QueryCache_ForceFirstTagAsCacheKey
-    {
-        [TestMethod]
-        public void None()
-        {
-            TestContext.DeleteAll(x => x.Entity_Basics);
-            TestContext.Insert(x => x.Entity_Basics, 3);
-
-            using (var ctx = new TestContext())
-            {
-                var firstTag = "zzzprojects";
-
-                var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
-
-                var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
-                QueryCacheManager.ForceFirstTagAsCacheKey = true;
-
-                try
-                {
-                    var cacheKey2 = QueryCacheManager.GetCacheKey(query, new string[0]);
-                }
-                catch (Exception ex)
-                {
-                    Assert.AreEqual(ExceptionMessage.QueryCache_FirstTagNullOrEmpty, ex.Message);
-                }
-                finally
-                {
-                    QueryCacheManager.ForceFirstTagAsCacheKey = false;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/Single.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/Single.cs
deleted file mode 100644
index dee69cd7..00000000
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/Single.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
-// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
-// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
-// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
-// More projects: http://www.zzzprojects.com/
-// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
-
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Z.EntityFramework.Plus;
-
-namespace Z.Test.EntityFramework.Plus
-{
-    public partial class QueryCache_ForceFirstTagAsCacheKey
-    {
-        [TestMethod]
-        public void Single()
-        {
-            TestContext.DeleteAll(x => x.Entity_Basics);
-            TestContext.Insert(x => x.Entity_Basics, 3);
-
-            using (var ctx = new TestContext())
-            {
-                var firstTag = "zzzprojects";
-
-                var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
-
-                var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
-                QueryCacheManager.ForceFirstTagAsCacheKey = true;
-                var cacheKey2 = QueryCacheManager.GetCacheKey(query, new[] {firstTag});
-                QueryCacheManager.ForceFirstTagAsCacheKey = false;
-
-                // Cache key are different
-                Assert.AreNotEqual(cacheKey1, cacheKey2);
-
-                // Cache key2 is equal to hardcoded cacheKey
-                Assert.AreEqual(firstTag, cacheKey2);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/UseFirstTagAsCacheKey/None.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/UseFirstTagAsCacheKey/None.cs
index a889aa89..1d1faf4f 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/UseFirstTagAsCacheKey/None.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/UseFirstTagAsCacheKey/None.cs
@@ -22,8 +22,6 @@ public void None()
 
             using (var ctx = new TestContext())
             {
-                var firstTag = "zzzprojects";
-
                 var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
 
                 var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/UseTagsAsCacheKey/None.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/UseTagsAsCacheKey/None.cs
index 2beaa2a6..c0766c67 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/UseTagsAsCacheKey/None.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/UseTagsAsCacheKey/None.cs
@@ -22,8 +22,6 @@ public void None()
 
             using (var ctx = new TestContext())
             {
-                var firstTag = "zzzprojects";
-
                 var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
 
                 var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_ManyParameter.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_ManyParameter.cs
new file mode 100644
index 00000000..841ae43d
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_ManyParameter.cs
@@ -0,0 +1,36 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryFilter_DbContext_Filter
+    {
+        [TestMethod]
+        public void ManyFilter_ManyParameter()
+        {
+            TestContext.DeleteAll(x => x.Inheritance_Interface_Entities);
+            TestContext.Insert(x => x.Inheritance_Interface_Entities, 10);
+
+            using (var ctx = new TestContext())
+            {
+                int columnInt1 = 1;
+                int columnInt2 = 2;
+                int columnInt3 = 3;
+                int columnInt4 = 4;
+
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter1, entities => entities.Where(x => x.ColumnInt != columnInt1 && x.ColumnInt != columnInt2));
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter2, entities => entities.Where(x => x.ColumnInt != columnInt3 && x.ColumnInt != columnInt4));
+
+                Assert.AreEqual(35, ctx.Inheritance_Interface_Entities.Sum(x => x.ColumnInt));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_NoParameter.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_NoParameter.cs
new file mode 100644
index 00000000..f4c15496
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_NoParameter.cs
@@ -0,0 +1,31 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryFilter_DbContext_Filter
+    {
+        [TestMethod]
+        public void ManyFilter_NoParameter()
+        {
+            TestContext.DeleteAll(x => x.Inheritance_Interface_Entities);
+            TestContext.Insert(x => x.Inheritance_Interface_Entities, 10);
+
+            using (var ctx = new TestContext())
+            {
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter1, entities => entities.Where(x => x.ColumnInt != 1));
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter2, entities => entities.Where(x => x.ColumnInt != 3));
+
+                Assert.AreEqual(41, ctx.Inheritance_Interface_Entities.Sum(x => x.ColumnInt));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_SingleParameter.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_SingleParameter.cs
new file mode 100644
index 00000000..fc6b7951
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/ManyFilter_SingleParameter.cs
@@ -0,0 +1,34 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryFilter_DbContext_Filter
+    {
+        [TestMethod]
+        public void ManyFilter_SingleParameter()
+        {
+            TestContext.DeleteAll(x => x.Inheritance_Interface_Entities);
+            TestContext.Insert(x => x.Inheritance_Interface_Entities, 10);
+
+            using (var ctx = new TestContext())
+            {
+                int columnInt1 = 1;
+                int columnInt3 = 3;
+
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter1, entities => entities.Where(x => x.ColumnInt != columnInt1));
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter2, entities => entities.Where(x => x.ColumnInt != columnInt3));
+
+                Assert.AreEqual(41, ctx.Inheritance_Interface_Entities.Sum(x => x.ColumnInt));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_ManyParameter.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_ManyParameter.cs
new file mode 100644
index 00000000..51b1d7fb
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_ManyParameter.cs
@@ -0,0 +1,32 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryFilter_DbContext_Filter
+    {
+        [TestMethod]
+        public void SingleFilter_ManyParameter()
+        {
+            TestContext.DeleteAll(x => x.Inheritance_Interface_Entities);
+            TestContext.Insert(x => x.Inheritance_Interface_Entities, 10);
+
+            using (var ctx = new TestContext())
+            {
+                int columnInt1 = 1;
+                int columnInt2 = 2;
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter1, entities => entities.Where(x => x.ColumnInt != columnInt1 && x.ColumnInt != columnInt2));
+
+                Assert.AreEqual(42, ctx.Inheritance_Interface_Entities.Sum(x => x.ColumnInt));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_NoParameter.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_NoParameter.cs
new file mode 100644
index 00000000..299d76d2
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_NoParameter.cs
@@ -0,0 +1,30 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryFilter_DbContext_Filter
+    {
+        [TestMethod]
+        public void SingleFilter_NoParameter()
+        {
+            TestContext.DeleteAll(x => x.Inheritance_Interface_Entities);
+            TestContext.Insert(x => x.Inheritance_Interface_Entities, 10);
+
+            using (var ctx = new TestContext())
+            {
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter1, entities => entities.Where(x => x.ColumnInt != 1));
+
+                Assert.AreEqual(44, ctx.Inheritance_Interface_Entities.Sum(x => x.ColumnInt));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_SingleParameter.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_SingleParameter.cs
new file mode 100644
index 00000000..9dcb7f7c
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryFilter/DbContext_Filter/WithParameter/SingleFilter_SingleParameter.cs
@@ -0,0 +1,31 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryFilter_DbContext_Filter
+    {
+        [TestMethod]
+        public void SingleFilter_SingleParameter()
+        {
+            TestContext.DeleteAll(x => x.Inheritance_Interface_Entities);
+            TestContext.Insert(x => x.Inheritance_Interface_Entities, 10);
+
+            using (var ctx = new TestContext())
+            {
+                int columnInt1 = 1;
+                ctx.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter1, entities => entities.Where(x => x.ColumnInt != columnInt1));
+
+                Assert.AreEqual(44, ctx.Inheritance_Interface_Entities.Sum(x => x.ColumnInt));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Many_Enumerator.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Many_Enumerator.cs
new file mode 100644
index 00000000..867eb09b
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Many_Enumerator.cs
@@ -0,0 +1,47 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Empty
+    {
+        [TestMethod]
+        public void LeftEmpty_Many_Enumerator()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_Multi_OneToMany_Lefts
+                    .Where(x => x.ColumnInt == -99)
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 2))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 2))
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(0, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(0, list.Count());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Many_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Many_Executor.cs
new file mode 100644
index 00000000..63f99d70
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Many_Executor.cs
@@ -0,0 +1,47 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Empty
+    {
+        [TestMethod]
+        public void LeftEmpty_Many_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_Multi_OneToMany_Lefts
+                     .Where(x => x.ColumnInt == -99)
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 2))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 2))
+                    .FirstOrDefault();
+
+                // TEST: context
+                Assert.AreEqual(0, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(null, item);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Single_Enumerator.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Single_Enumerator.cs
new file mode 100644
index 00000000..efef1603
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Single_Enumerator.cs
@@ -0,0 +1,44 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Empty
+    {
+        [TestMethod]
+        public void LeftEmpty_Single_Enumerator()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_OneToMany_Lefts
+                    .Where(x => x.ColumnInt == -99)
+                    .IncludeFilter(left => left.Rights.Where(y => y.ColumnInt > 2))
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(0, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(0, list.Count);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Single_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Single_Executor.cs
new file mode 100644
index 00000000..118a609a
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/LeftEmpty_Single_Executor.cs
@@ -0,0 +1,44 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Empty
+    {
+        [TestMethod]
+        public void LeftEmpty_Single_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_OneToMany_Lefts
+                    .Where(x => x.ColumnInt == -99)
+                    .IncludeFilter(left => left.Rights.Where(x => x.ColumnInt > 2))
+                    .FirstOrDefault();
+
+                // TEST: context
+                Assert.AreEqual(0, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(null, item);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Many_Enumerator.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Many_Enumerator.cs
new file mode 100644
index 00000000..075b2c23
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Many_Enumerator.cs
@@ -0,0 +1,51 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Empty
+    {
+        [TestMethod]
+        public void RightEmpty_Many_Enumerator()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_Multi_OneToMany_Lefts
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 99))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 99))
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(1, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(1, list.Count);
+                var item = list[0];
+
+                // TEST: Right
+                Assert.AreEqual(null, item.Right1s);
+                Assert.AreEqual(null, item.Right2s);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Many_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Many_Executor.cs
new file mode 100644
index 00000000..bd4d54c7
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Many_Executor.cs
@@ -0,0 +1,47 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Empty
+    {
+        [TestMethod]
+        public void RightEmpty_Many_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                //left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                //left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_Multi_OneToMany_Lefts
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 99))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 99))
+                    .First();
+
+                // TEST: context
+                Assert.AreEqual(1, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: Right
+                Assert.AreEqual(null, item.Right1s);
+                Assert.AreEqual(null, item.Right2s);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Single_Enumerator.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Single_Enumerator.cs
new file mode 100644
index 00000000..b2735915
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Single_Enumerator.cs
@@ -0,0 +1,47 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Empty
+    {
+        [TestMethod]
+        public void RightEmpty_Single_Enumerator()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_OneToMany_Lefts
+                    .IncludeFilter(left => left.Rights.Where(y => y.ColumnInt > 99))
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(1, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(1, list.Count);
+                var item = list[0];
+
+                // TEST: Right
+                Assert.AreEqual(null, item.Rights);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Single_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Single_Executor.cs
new file mode 100644
index 00000000..7601d1f2
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Empty/RightEmpty_Single_Executor.cs
@@ -0,0 +1,43 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Empty
+    {
+        [TestMethod]
+        public void RightEmpty_Single_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_OneToMany_Lefts
+                    .IncludeFilter(left => left.Rights.Where(x => x.ColumnInt > 99))
+                    .First();
+
+                // TEST: context
+                Assert.AreEqual(1, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: Right
+                Assert.AreEqual(null, item.Rights);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Many_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Many_Executor.cs
new file mode 100644
index 00000000..9ef537a9
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Many_Executor.cs
@@ -0,0 +1,71 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_FirstWithPredicate
+    {
+        [TestMethod]
+        public void Many_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_Multi_OneToMany_Lefts
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 2))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 2))
+                    .First(x => x.ColumnInt < 10);
+
+                // TEST: context
+                Assert.AreEqual(5, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: right1
+                Assert.AreEqual(2, item.Right1s.Count);
+
+                if (item.Right1s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right1s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right1s[1].ColumnInt);
+                }
+
+                // TEST: right2
+                Assert.AreEqual(2, item.Right2s.Count);
+
+                if (item.Right2s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right2s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right2s[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Many_ThenQuery_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Many_ThenQuery_Executor.cs
new file mode 100644
index 00000000..917a71ef
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Many_ThenQuery_Executor.cs
@@ -0,0 +1,82 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_FirstWithPredicate
+    {
+        [TestMethod]
+        public void Many_ThenQuery_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                    left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                    left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                }
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                    left.ColumnInt = 5;
+                    left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                    left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                }
+
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_Multi_OneToMany_Lefts
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 2))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 2))
+                    .Where(x => x.ColumnInt < 5)
+                    .OrderBy(x => x.ID)
+                    .First(x => x.ColumnInt < 10);
+
+                // TEST: context
+                Assert.AreEqual(5, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: right1
+                Assert.AreEqual(2, item.Right1s.Count);
+
+                if (item.Right1s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right1s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right1s[1].ColumnInt);
+                }
+
+                // TEST: right2
+                Assert.AreEqual(2, item.Right2s.Count);
+
+                if (item.Right2s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right2s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right2s[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Single_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Single_Executor.cs
new file mode 100644
index 00000000..8acc00ab
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Single_Executor.cs
@@ -0,0 +1,54 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_FirstWithPredicate
+    {
+        [TestMethod]
+        public void Single_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_OneToMany_Lefts
+                    .IncludeFilter(left => left.Rights.Where(x => x.ColumnInt > 2))
+                    .First(x => x.ColumnInt < 10);
+
+                // TEST: context
+                Assert.AreEqual(3, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: right
+                Assert.AreEqual(2, item.Rights.Count);
+
+                if (item.Rights[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(4, item.Rights[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(3, item.Rights[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Single_ThenQuery_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Single_ThenQuery_Executor.cs
new file mode 100644
index 00000000..397a01ad
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/FirstWithPredicate/Single_ThenQuery_Executor.cs
@@ -0,0 +1,66 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_FirstWithPredicate
+    {
+        [TestMethod]
+        public void Single_ThenQuery_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                    left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                }
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                    left.ColumnInt = 5;
+                    left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                }
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_OneToMany_Lefts
+                    .IncludeFilter(left => left.Rights.Where(y => y.ColumnInt > 2))
+                    .Where(x => x.ColumnInt < 5)
+                    .OrderBy(x => x.ID)
+                    .First(x => x.ColumnInt < 10);
+
+                // TEST: context
+                Assert.AreEqual(3, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: context
+                Assert.AreEqual(3, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: right
+                Assert.AreEqual(2, item.Rights.Count);
+
+                if (item.Rights[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(4, item.Rights[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(3, item.Rights[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Empty.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Empty.cs
new file mode 100644
index 00000000..78941d48
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Empty.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class QueryIncludeFilter_Empty
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_FirstWithPredicate.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_FirstWithPredicate.cs
new file mode 100644
index 00000000..0a807c17
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_FirstWithPredicate.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class QueryIncludeFilter_FirstWithPredicate
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_FirstWithPredicate_Async.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_FirstWithPredicate_Async.cs
new file mode 100644
index 00000000..3977703c
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_FirstWithPredicate_Async.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class QueryIncludeFilter_FirstWithPredicate_Async
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_IncludeEF.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_IncludeEF.cs
new file mode 100644
index 00000000..919866b9
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_IncludeEF.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public class QueryIncludeFilter_IncludeEF
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Where.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Where.cs
new file mode 100644
index 00000000..bcf31b51
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Where.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class QueryIncludeFilter_Where
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Where_Async.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Where_Async.cs
new file mode 100644
index 00000000..5a7ee687
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/QueryIncludeFilter_Where_Async.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class QueryIncludeFilter_Where_Async
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Enumerator.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Enumerator.cs
new file mode 100644
index 00000000..87519f19
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Enumerator.cs
@@ -0,0 +1,57 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Many_Enumerator()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_Multi_OneToMany_Lefts
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 2))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 2))
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(5, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(1, list.Count);
+                var item = list[0];
+
+                // TEST: right1
+                Assert.AreEqual(2, item.Right1s.Count);
+                Assert.AreEqual(3, item.Right1s[0].ColumnInt);
+                Assert.AreEqual(4, item.Right1s[1].ColumnInt);
+
+                // TEST: right2
+                Assert.AreEqual(2, item.Right2s.Count);
+                Assert.AreEqual(3, item.Right2s[0].ColumnInt);
+                Assert.AreEqual(4, item.Right2s[1].ColumnInt);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Executor.cs
new file mode 100644
index 00000000..bd51618d
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Executor.cs
@@ -0,0 +1,71 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Many_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_Multi_OneToMany_Lefts
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 2))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 2))
+                    .First();
+
+                // TEST: context
+                Assert.AreEqual(5, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: right1
+                Assert.AreEqual(2, item.Right1s.Count);
+
+                if (item.Right1s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right1s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right1s[1].ColumnInt);
+                }
+
+                // TEST: right2
+                Assert.AreEqual(2, item.Right2s.Count);
+
+                if (item.Right2s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right2s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right2s[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Property.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Property.cs
new file mode 100644
index 00000000..04feb324
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_Property.cs
@@ -0,0 +1,61 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Many_Property()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_Multi_OneToMany_Right1s
+                    .Where(x => x.ColumnInt > 2)
+                    .IncludeFilter(right => right.Left)
+                    .IncludeFilter(right => right.Left.Right2s.Where(y => y.ColumnInt > 2))
+                    .ToList()
+                    .Select(x => x.Left)
+                    .Distinct()
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(5, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(1, list.Count);
+                var item = list[0];
+
+                // TEST: right1
+                Assert.AreEqual(2, item.Right1s.Count);
+                Assert.AreEqual(3, item.Right1s[0].ColumnInt);
+                Assert.AreEqual(4, item.Right1s[1].ColumnInt);
+
+                // TEST: right2
+                Assert.AreEqual(2, item.Right2s.Count);
+                Assert.AreEqual(3, item.Right2s[0].ColumnInt);
+                Assert.AreEqual(4, item.Right2s[1].ColumnInt);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_ThenQuery_Enumerator.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_ThenQuery_Enumerator.cs
new file mode 100644
index 00000000..0455be0c
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_ThenQuery_Enumerator.cs
@@ -0,0 +1,86 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Many_ThenQuery_Enumerator()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                    left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                    left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                }
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                    left.ColumnInt = 5;
+                    left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                    left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                }
+
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_Multi_OneToMany_Lefts
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 2))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 2))
+                    .Where(x => x.ColumnInt < 5)
+                    .OrderBy(x => x.ID)
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(5, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(1, list.Count);
+                var item = list[0];
+
+                // TEST: right1
+                Assert.AreEqual(2, item.Right1s.Count);
+
+                if (item.Right1s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right1s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right1s[1].ColumnInt);
+                }
+
+                // TEST: right2
+                Assert.AreEqual(2, item.Right2s.Count);
+
+                if (item.Right2s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right2s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right2s[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_ThenQuery_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_ThenQuery_Executor.cs
new file mode 100644
index 00000000..09c9426a
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Many_ThenQuery_Executor.cs
@@ -0,0 +1,82 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Many_ThenQuery_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right1s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Right2s);
+            TestContext.DeleteAll(x => x.Association_Multi_OneToMany_Lefts);
+
+            using (var ctx = new TestContext())
+            {
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                    left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                    left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                }
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Lefts, 1).First();
+                    left.ColumnInt = 5;
+                    left.Right1s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right1s, 5);
+                    left.Right2s = TestContext.Insert(ctx, x => x.Association_Multi_OneToMany_Right2s, 5);
+                }
+
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_Multi_OneToMany_Lefts
+                    .IncludeFilter(left => left.Right1s.Where(y => y.ColumnInt > 2))
+                    .IncludeFilter(left => left.Right2s.Where(y => y.ColumnInt > 2))
+                    .Where(x => x.ColumnInt < 5)
+                    .OrderBy(x => x.ID)
+                    .First();
+
+                // TEST: context
+                Assert.AreEqual(5, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: right1
+                Assert.AreEqual(2, item.Right1s.Count);
+
+                if (item.Right1s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right1s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right1s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right1s[1].ColumnInt);
+                }
+
+                // TEST: right2
+                Assert.AreEqual(2, item.Right2s.Count);
+
+                if (item.Right2s[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(4, item.Right2s[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Right2s[0].ColumnInt);
+                    Assert.AreEqual(3, item.Right2s[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Enumerator.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Enumerator.cs
new file mode 100644
index 00000000..44d2cea9
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Enumerator.cs
@@ -0,0 +1,49 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Single_Enumerator()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_OneToMany_Lefts
+                    .IncludeFilter(left => left.Rights.Where(y => y.ColumnInt > 2))
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(3, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(1, list.Count);
+
+                // TEST: right
+                var item = list[0];
+                Assert.AreEqual(2, item.Rights.Count);
+                Assert.AreEqual(3, item.Rights[0].ColumnInt);
+                Assert.AreEqual(4, item.Rights[1].ColumnInt);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Executor.cs
new file mode 100644
index 00000000..5236f4e1
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Executor.cs
@@ -0,0 +1,54 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Single_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_OneToMany_Lefts
+                    .IncludeFilter(left => left.Rights.Where(x => x.ColumnInt > 2))
+                    .First();
+
+                // TEST: context
+                Assert.AreEqual(3, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: right
+                Assert.AreEqual(2, item.Rights.Count);
+
+                if (item.Rights[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(4, item.Rights[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(3, item.Rights[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Property.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Property.cs
new file mode 100644
index 00000000..8de786a4
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_Property.cs
@@ -0,0 +1,53 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Single_Property()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_OneToMany_Rights
+                    .Where(x => x.ColumnInt > 2)
+                    .IncludeFilter(right => right.Left)
+                    .ToList()
+                    .Select(x => x.Left)
+                    .Distinct()
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(3, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(1, list.Count);
+
+                // TEST: right
+                var item = list[0];
+                Assert.AreEqual(2, item.Rights.Count);
+                Assert.AreEqual(3, item.Rights[0].ColumnInt);
+                Assert.AreEqual(4, item.Rights[1].ColumnInt);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_ThenQuery_Enumerator.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_ThenQuery_Enumerator.cs
new file mode 100644
index 00000000..5194ce57
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_ThenQuery_Enumerator.cs
@@ -0,0 +1,66 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Single_ThenQuery_Enumerator()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                    left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                }
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                    left.ColumnInt = 5;
+                    left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                }
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var list = ctx.Association_OneToMany_Lefts
+                    .IncludeFilter(left => left.Rights.Where(y => y.ColumnInt > 2))
+                    .Where(x => x.ColumnInt < 5).OrderBy(x => x.ID)
+                    .ToList();
+
+                // TEST: context
+                Assert.AreEqual(3, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: left
+                Assert.AreEqual(1, list.Count);
+
+                // TEST: right
+                var item = list[0];
+                Assert.AreEqual(2, item.Rights.Count);
+
+                if (item.Rights[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(4, item.Rights[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(3, item.Rights[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_ThenQuery_Executor.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_ThenQuery_Executor.cs
new file mode 100644
index 00000000..167d2861
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryIncludeFilter/Where/Single_ThenQuery_Executor.cs
@@ -0,0 +1,63 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryIncludeFilter_Where
+    {
+        [TestMethod]
+        public void Single_ThenQuery_Executor()
+        {
+            TestContext.DeleteAll(x => x.Association_OneToMany_Lefts);
+            TestContext.DeleteAll(x => x.Association_OneToMany_Rights);
+
+            using (var ctx = new TestContext())
+            {
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                    left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                }
+                {
+                    var left = TestContext.Insert(ctx, x => x.Association_OneToMany_Lefts, 1).First();
+                    left.ColumnInt = 5;
+                    left.Rights = TestContext.Insert(ctx, x => x.Association_OneToMany_Rights, 5);
+                }
+                ctx.SaveChanges();
+            }
+
+            using (var ctx = new TestContext())
+            {
+                var item = ctx.Association_OneToMany_Lefts
+                    .IncludeFilter(left => left.Rights.Where(y => y.ColumnInt > 2))
+                    .Where(x => x.ColumnInt < 5)
+                    .OrderBy(x => x.ID)
+                    .First();
+
+                // TEST: context
+                Assert.AreEqual(3, ctx.ChangeTracker.Entries().Count());
+
+                // TEST: right
+                Assert.AreEqual(2, item.Rights.Count);
+
+                if (item.Rights[0].ColumnInt == 3)
+                {
+                    Assert.AreEqual(3, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(4, item.Rights[1].ColumnInt);
+                }
+                else
+                {
+                    Assert.AreEqual(4, item.Rights[0].ColumnInt);
+                    Assert.AreEqual(3, item.Rights[1].ColumnInt);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/Z.Test.EntityFramework.Plus.EF5.csproj b/src/test/Z.Test.EntityFramework.Plus.EF5/Z.Test.EntityFramework.Plus.EF5.csproj
index 959aacd0..a46c6ef9 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/Z.Test.EntityFramework.Plus.EF5.csproj
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/Z.Test.EntityFramework.Plus.EF5.csproj
@@ -43,7 +43,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -78,6 +78,7 @@
     <Compile Include="Audit\Audit_Configuration_Ignore.cs" />
     <Compile Include="Audit\Audit_Configuration_Include.cs" />
     <Compile Include="Audit\Audit_Configuration_IncludeProperty.cs" />
+    <Compile Include="Audit\Audit_Configuration_UseNullForDBNullValue.cs" />
     <Compile Include="Audit\Audit_CreatedBy.cs" />
     <Compile Include="Audit\Audit_EntityAdded.cs" />
     <Compile Include="Audit\Audit_EntityDeleted.cs" />
@@ -136,6 +137,10 @@
     <Compile Include="Audit\Configuration_IncludeProperty\Type.cs" />
     <Compile Include="Audit\Configuration_Include\All.cs" />
     <Compile Include="Audit\Configuration_Include\Type.cs" />
+    <Compile Include="Audit\Configuration_UseNullForDBNullValue\EntityAdded_IsFalse.cs" />
+    <Compile Include="Audit\Configuration_UseNullForDBNullValue\EntityAdded_IsTrue.cs" />
+    <Compile Include="Audit\Configuration_UseNullForDBNullValue\EntityModified_IsFalse.cs" />
+    <Compile Include="Audit\Configuration_UseNullForDBNullValue\EntityModified_IsTrue.cs" />
     <Compile Include="Audit\CreatedBy\CurrentPrincipal.cs" />
     <Compile Include="Audit\EntityAdded\Entity_Basic.cs" />
     <Compile Include="Audit\EntityAdded\Entity_Complex.cs" />
@@ -208,6 +213,7 @@
     <Compile Include="BatchDelete\BatchDelete_BatchDelayInterval.cs" />
     <Compile Include="BatchDelete\BatchDelete_BatchSize.cs" />
     <Compile Include="BatchDelete\BatchDelete_Executing.cs" />
+    <Compile Include="BatchDelete\BatchDelete_Inheritance.cs" />
     <Compile Include="BatchDelete\BatchDelete_InMemory.cs" />
     <Compile Include="BatchDelete\BatchDelete_PrimaryKey.cs" />
     <Compile Include="BatchDelete\BatchDelete_SqlSchema.cs" />
@@ -221,6 +227,7 @@
     <Compile Include="BatchDelete\Executing\Template.cs" />
     <Compile Include="BatchDelete\Executing\WhileDelayTemplate.cs" />
     <Compile Include="BatchDelete\Executing\WhileTemplate.cs" />
+    <Compile Include="BatchDelete\Inheritance\BatchDelete_Inheritance.cs" />
     <Compile Include="BatchDelete\InMemory\Ten.cs" />
     <Compile Include="BatchDelete\InMemory\Thirty.cs" />
     <Compile Include="BatchDelete\InMemory\Twenty.cs" />
@@ -255,6 +262,7 @@
     <Compile Include="BatchUpdate\BatchUpdate_BatchDelayInterval.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_BatchSize.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_Executing.cs" />
+    <Compile Include="BatchUpdate\BatchUpdate_Inheritance.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_Keyword.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_PrimaryKey.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_SqlSchema.cs" />
@@ -265,6 +273,7 @@
     <Compile Include="BatchUpdate\Executing\Template.cs" />
     <Compile Include="BatchUpdate\Executing\WhileDelayTemplate.cs" />
     <Compile Include="BatchUpdate\Executing\WhileTemplate.cs" />
+    <Compile Include="BatchUpdate\Inheritance\BatchUpdate_Inheritance.cs" />
     <Compile Include="BatchUpdate\Keyword\From.cs" />
     <Compile Include="BatchUpdate\PrimaryKey\Many.cs" />
     <Compile Include="BatchUpdate\PrimaryKey\Single.cs" />
@@ -322,6 +331,7 @@
     <Compile Include="QueryCache\QueryCache_CacheKey.cs" />
     <Compile Include="QueryCache\QueryCache_CacheKeyFactory.cs" />
     <Compile Include="QueryCache\QueryCache_ExpireAll.cs" />
+    <Compile Include="QueryCache\QueryCache_ForceFirstTagAsCacheKey.cs" />
     <Compile Include="QueryCache\QueryCache_FromCache.cs" />
     <Compile Include="QueryCache\QueryCache_FromCacheAsync.cs" />
     <Compile Include="QueryCache\QueryCache_Tag.cs" />
@@ -399,6 +409,12 @@
     <Compile Include="QueryFilter\DbContext_Filter\WithLazyLoading\SingleFilter_Enable.cs" />
     <Compile Include="QueryFilter\DbContext_Filter\WithLazyLoading\SingleFilter_Exclude.cs" />
     <Compile Include="QueryFilter\DbContext_Filter\WithLazyLoading\SingleFilter_Include.cs" />
+    <Compile Include="QueryFilter\DbContext_Filter\WithParameter\ManyFilter_ManyParameter.cs" />
+    <Compile Include="QueryFilter\DbContext_Filter\WithParameter\ManyFilter_NoParameter.cs" />
+    <Compile Include="QueryFilter\DbContext_Filter\WithParameter\ManyFilter_SingleParameter.cs" />
+    <Compile Include="QueryFilter\DbContext_Filter\WithParameter\SingleFilter_ManyParameter.cs" />
+    <Compile Include="QueryFilter\DbContext_Filter\WithParameter\SingleFilter_NoParameter.cs" />
+    <Compile Include="QueryFilter\DbContext_Filter\WithParameter\SingleFilter_SingleParameter.cs" />
     <Compile Include="QueryFilter\DbSet_AsNoFilter\WithGlobalFilter\ManyFilter_Disabled.cs" />
     <Compile Include="QueryFilter\DbSet_AsNoFilter\WithGlobalFilter\ManyFilter_Enabled.cs" />
     <Compile Include="QueryFilter\DbSet_AsNoFilter\WithGlobalFilter\SingleFilter_Disabled.cs" />
@@ -468,6 +484,34 @@
     <Compile Include="QueryFuture\Future\Queryable_AsTracking.cs" />
     <Compile Include="QueryFuture\QueryFuture_Future.cs" />
     <Compile Include="QueryFuture\QueryFuture_FutureValue.cs" />
+    <Compile Include="QueryIncludeFilter\Empty\LeftEmpty_Many_Enumerator.cs" />
+    <Compile Include="QueryIncludeFilter\Empty\LeftEmpty_Many_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\Empty\LeftEmpty_Single_Enumerator.cs" />
+    <Compile Include="QueryIncludeFilter\Empty\LeftEmpty_Single_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\Empty\RightEmpty_Many_Enumerator.cs" />
+    <Compile Include="QueryIncludeFilter\Empty\RightEmpty_Many_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\Empty\RightEmpty_Single_Enumerator.cs" />
+    <Compile Include="QueryIncludeFilter\Empty\RightEmpty_Single_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\FirstWithPredicate\Many_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\FirstWithPredicate\Many_ThenQuery_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\FirstWithPredicate\Single_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\FirstWithPredicate\Single_ThenQuery_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\QueryIncludeFilter_Empty.cs" />
+    <Compile Include="QueryIncludeFilter\QueryIncludeFilter_FirstWithPredicate.cs" />
+    <Compile Include="QueryIncludeFilter\QueryIncludeFilter_FirstWithPredicate_Async.cs" />
+    <Compile Include="QueryIncludeFilter\QueryIncludeFilter_IncludeEF.cs" />
+    <Compile Include="QueryIncludeFilter\QueryIncludeFilter_Where.cs" />
+    <Compile Include="QueryIncludeFilter\QueryIncludeFilter_Where_Async.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Many_Enumerator.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Many_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Many_Property.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Many_ThenQuery_Enumerator.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Many_ThenQuery_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Single_Enumerator.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Single_Executor.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Single_Property.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Single_ThenQuery_Enumerator.cs" />
+    <Compile Include="QueryIncludeFilter\Where\Single_ThenQuery_Executor.cs" />
     <Compile Include="QueryIncludeOptimized\AllowQueryBatch\Many_Enumerator.cs" />
     <Compile Include="QueryIncludeOptimized\AllowQueryBatch\Many_Executor.cs" />
     <Compile Include="QueryIncludeOptimized\AllowQueryBatch\Many_Property.cs" />
@@ -619,6 +663,8 @@
     <Compile Include="QueryIncludeOptimized\Where_Async\Single_ThenQuery_EnumeratorAsync.cs" />
     <Compile Include="_Helper\AuditHelper.cs" />
     <Compile Include="_Helper\Extensions\QueryCacheHelper.cs" />
+    <Compile Include="_Helper\Extensions\StringExtensions.cs" />
+    <Compile Include="_Helper\Extensions\TestContextExtensions.cs" />
     <Compile Include="_Helper\QueryCacheHelper.cs" />
     <Compile Include="_Helper\QueryFilterHelper.cs" />
     <Compile Include="_Helper\QueryIncludeOptimizedHelper.cs" />
@@ -641,6 +687,7 @@
     <Compile Include="_Model\AuditEntry_Extended.cs" />
     <Compile Include="_Model\Entity_Basic.cs" />
     <Compile Include="_Model\Entity_Basic_Many.cs" />
+    <Compile Include="_Model\Entity_Basic_WithString.cs" />
     <Compile Include="_Model\Entity_Complex.cs" />
     <Compile Include="_Model\Entity_Complex_Info.cs" />
     <Compile Include="_Model\Entity_Complex_Info_Info.cs" />
@@ -686,7 +733,6 @@
       <Name>Z.EntityFramework.Plus.EF5</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/_Helper/Extensions/StringExtensions.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/_Helper/Extensions/StringExtensions.cs
new file mode 100644
index 00000000..a92151ae
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/_Helper/Extensions/StringExtensions.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public static class StringExtensions
+	{
+		private static Regex _rNormalize = new Regex(@"\s+");
+
+		public static string CollapseWhiteSpace(this string strSource)
+		{
+			return string.IsNullOrEmpty(strSource) ? strSource : _rNormalize.Replace(strSource, " ").Trim();
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/_Helper/Extensions/TestContextExtensions.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/_Helper/Extensions/TestContextExtensions.cs
new file mode 100644
index 00000000..f7c954c7
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/_Helper/Extensions/TestContextExtensions.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public static class TestContextExtensions
+	{
+		public static List<T> Insert<T>(this TestContext dcContext, int intCount) where T: class, new()
+		{
+			DbSet<T> dbSet = dcContext.Set<T>();
+
+			if (dbSet == null)
+			{
+				return null;
+			}
+
+			int countBefore = dbSet.Count();
+
+			List<T> list = new List<T>();
+			for (int i = 0; i < intCount; i++)
+			{
+				T item = new T();
+				TestContext.InsertFactory(item, i);
+				list.Add(item);
+			}
+
+			dbSet.AddRange(list);
+			dcContext.SaveChanges();
+
+			Assert.AreEqual(intCount + countBefore, dbSet.Count());
+
+			return list;
+		}
+
+		public static void DeleteAll<T>(this TestContext dcContext) where T : class
+		{
+			DbSet<T> dbSet = dcContext.Set<T>();
+
+			dbSet.RemoveRange(dbSet);
+			dcContext.SaveChanges();
+
+			Assert.AreEqual(0, dbSet.Count());
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Entity_Basic_WithString.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Entity_Basic_WithString.cs
new file mode 100644
index 00000000..9f3df6a5
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Entity_Basic_WithString.cs
@@ -0,0 +1,18 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public class Entity_Basic_WithString
+    {
+        public int ID { get; set; }
+
+        public int ColumnInt { get; set; }
+
+        public string ColumnString { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Animal.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Animal.cs
index 2c186ede..136f1fd0 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Animal.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Animal.cs
@@ -9,7 +9,8 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    public abstract class Inheritance_TPT_Animal
+	[Table("Inheritance_TPT_Animals")]
+    public class Inheritance_TPT_Animal
     {
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int ID { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Cat.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Cat.cs
index c0cee74c..63e84393 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Cat.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Cat.cs
@@ -9,7 +9,7 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    [Table("Inheritance_TPT_Cat")]
+    [Table("Inheritance_TPT_Cats")]
     public class Inheritance_TPT_Cat : Inheritance_TPT_Animal
     {
         public int ColumnCat { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Dog.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Dog.cs
index 7d127558..42fb5bbb 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Dog.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/Inheritance_TPT_Dog.cs
@@ -9,7 +9,7 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    [Table("Inheritance_TPT_Dog")]
+    [Table("Inheritance_TPT_Dogs")]
     public class Inheritance_TPT_Dog : Inheritance_TPT_Animal
     {
         public int ColumnDog { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/_TestContext.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/_TestContext.cs
index a93893b7..8779218b 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/_TestContext.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/_Model/_TestContext.cs
@@ -9,36 +9,21 @@
 using System.Data.SqlClient;
 using System.Linq;
 using Z.EntityFramework.Plus;
-#if EF5 
 using System.Data.Entity;
 
-#elif EF6
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure.Interception;
-
-#elif EFCORE
-using System.Configuration;
-using System.Data.SqlClient;
-using Microsoft.Data.Entity;
-
-#endif
-
 namespace Z.Test.EntityFramework.Plus
 {
-   
-
-#if EF5 || EF6
     public class TestContextInitializer : CreateDatabaseIfNotExists<TestContext>
     {
         protected override void Seed(TestContext context)
         {
             var sql = @"
-TRUNCATE TABLE Inheritance_TPC_Cat
-IF IDENT_CURRENT( 'Inheritance_TPC_Cat' ) < 1000000
-BEGIN
-	DBCC CHECKIDENT('Inheritance_TPC_Cat', RESEED, 1000000)
-END
-";
+				TRUNCATE TABLE Inheritance_TPC_Cat
+				IF IDENT_CURRENT( 'Inheritance_TPC_Cat' ) < 1000000
+				BEGIN
+					DBCC CHECKIDENT('Inheritance_TPC_Cat', RESEED, 1000000)
+				END
+			";
             using (var connection = new SqlConnection(My.Config.ConnectionStrings.TestDatabase))
             using (var command = new SqlCommand(sql, connection))
             {
@@ -48,52 +33,17 @@ DBCC CHECKIDENT('Inheritance_TPC_Cat', RESEED, 1000000)
             base.Seed(context);
         }
     }
-#endif
 
     public partial class TestContext : DbContext
     {
-#if EF5 || EF6
         public TestContext() : base(My.Config.ConnectionStrings.TestDatabase)
-#elif EFCORE
-        public TestContext()
-#endif
         {
-#if EF5 || EF6
             Database.SetInitializer(new CreateDatabaseIfNotExists<TestContext>());
-#elif EFCORE
-            Database.EnsureCreated();
-#endif
-
-#if EF6
-            // BE careful, this one also need to clear filter!
-            QueryFilterManager.ClearQueryCache(this);
-#endif
-
         }
 
-
-#if EF5 || EF6
         public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilter1 = null, bool? enableFilter2 = null, bool? enableFilter3 = null, bool? enableFilter4 = null, bool? excludeClass = null, bool? excludeInterface = null, bool? excludeBaseClass = null, bool? excludeBaseInterface = null, bool? includeClass = null, bool? includeInterface = null, bool? includeBaseClass = null, bool? includeBaseInterface = null) : base(My.Config.ConnectionStrings.TestDatabase)
-#elif EFCORE
-        public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilter1 = null, bool? enableFilter2 = null, bool? enableFilter3 = null, bool? enableFilter4 = null, bool? excludeClass = null, bool? excludeInterface = null, bool? excludeBaseClass = null, bool? excludeBaseInterface = null, bool? includeClass = null, bool? includeInterface = null, bool? includeBaseClass = null, bool? includeBaseInterface = null)
-#endif
         {
-#if EF5 || EF6
             Database.SetInitializer(new CreateDatabaseIfNotExists<TestContext>());
-#elif EFCORE
-            Database.EnsureCreated();
-#endif
-#if EFCORE
-    // TODO: Remove this when cast issue will be fixed
-            QueryFilterManager.GlobalFilters.Clear();
-            QueryFilterManager.GlobalInitializeFilterActions.Clear();
-#endif
-
-#if EF6
-            // Clear query cache
-            QueryFilterManager.ClearQueryCache(this);
-#endif
-
 
             if (enableFilter1 != null)
             {
@@ -185,7 +135,6 @@ public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilte
             }
         }
 
-#if EF5 || EF6
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
             // Association
@@ -262,42 +211,13 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             modelBuilder.Configurations.Add(new Internal_Entity_Basic.EntityPropertyVisibilityConfiguration());
             modelBuilder.Configurations.Add(new Internal_Entity_Basic_Many.EntityPropertyVisibilityConfiguration());
         }
-#elif EFCORE
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            optionsBuilder.UseSqlServer(new SqlConnection(My.Config.ConnectionStrings.TestDatabase));
-        }
-
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<Entity_ManyGuid>().HasKey(guid => new {guid.ID1, guid.ID2, guid.ID3});
-
-            // Association
-            {
-            }
-
-            // Audit
-            {
-                //modelBuilder.Entity<AuditEntry>().HasKey(x => x.AuditEntryID);
-                //modelBuilder.Entity<AuditEntryProperty>().Ignore(x => x.NewValue);
-                //modelBuilder.Entity<AuditEntryProperty>().Ignore(x => x.OldValue);
-                //modelBuilder.Entity<AuditEntry>().HasMany(x => x.Properties).WithOne(x => x.AuditEntry);
-                //modelBuilder.Entity<AuditEntryProperty>().HasKey(x => x.AuditEntryPropertyID);
-
-            }
-        }
-
-#endif
 
         #region Association
 
-#if EF5 || EF6
         public DbSet<Association_ManyToMany_Left> Association_ManyToMany_Lefts { get; set; }
 
         public DbSet<Association_ManyToMany_Right> Association_ManyToMany_Rights { get; set; }
 
-#endif
         public DbSet<Association_OneToMany_Left> Association_OneToMany_Lefts { get; set; }
 
         public DbSet<Association_OneToMany_Right> Association_OneToMany_Rights { get; set; }
@@ -344,7 +264,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<AuditEntryProperty> AuditEntryProperties { get; set; }
 
-
         public DbSet<AuditEntry_Extended> AuditEntry_Extendeds { get; set; }
 
         public DbSet<AuditEntryProperty_Extended> AuditEntryProperty_Extendeds { get; set; }
@@ -355,16 +274,15 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Entity_Basic> Entity_Basics { get; set; }
 
+        public DbSet<Entity_Basic_WithString> Entity_Basic_WithStrings { get; set; }
+
         public DbSet<ZZZ_Entity_Basic> ZZZ_Entity_Basics { get; set; }
 
         public DbSet<Entity_Basic_Many> Entity_Basic_Manies { get; set; }
 
-#if EF5 || EF6
         public DbSet<Internal_Entity_Basic> Internal_Entity_Basics { get; set; }
 
         public DbSet<Internal_Entity_Basic_Many> Internal_Entity_Basic_Manies { get; set; }
-#endif
-
 
         public DbSet<Entity_Guid> Entity_Guids { get; set; }
 
@@ -374,11 +292,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Entity_Proxy_Right> Entity_Proxy_Rights { get; set; }
 
-#if EF5 || EF6
         public DbSet<Entity_Complex> Entity_Complexes { get; set; }
 
         public DbSet<Entity_Enum> Entity_Enums { get; set; }
-#endif
 
         #endregion
 
@@ -388,18 +304,22 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Inheritance_Interface_Entity_LazyLoading> Inheritance_Interface_Entities_LazyLoading { get; set; }
 
-#if EF5 || EF6
-        public DbSet<Inheritance_TPC_Animal> Inheritance_TPC_Animals { get; set; }
+	    public DbSet<Inheritance_TPC_Animal> Inheritance_TPC_Animals { get; set; }
+
+		public DbSet<Inheritance_TPC_Cat> Inheritance_TPC_Cats { get; set; }
 
-        public DbSet<Inheritance_TPH_Animal> Inheritance_TPH_Animals { get; set; }
+	    public DbSet<Inheritance_TPC_Dog> Inheritance_TPC_Dogs { get; set; }
+
+		public DbSet<Inheritance_TPH_Animal> Inheritance_TPH_Animals { get; set; }
 
         public DbSet<Inheritance_TPT_Animal> Inheritance_TPT_Animals { get; set; }
 
-#endif
         public DbSet<Inheritance_TPT_Cat> Inheritance_TPT_Cats { get; set; }
 
-        public DbSet<Property_AllType> Property_AllTypes { get; set; }
+	    public DbSet<Inheritance_TPT_Dog> Inheritance_TPT_Dogs { get; set; }
+
+		public DbSet<Property_AllType> Property_AllTypes { get; set; }
 
-#endregion
+		#endregion
     }
 }
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/packages.config b/src/test/Z.Test.EntityFramework.Plus.EF5/packages.config
index 332e8233..2767ebb8 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/packages.config
+++ b/src/test/Z.Test.EntityFramework.Plus.EF5/packages.config
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="EntityFramework" version="5.0.0" targetFramework="net46" />
-  <package id="EntityFramework.Plus.EF5" version="1.0.0-alpha1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/App.config b/src/test/Z.Test.EntityFramework.Plus.EF6/App.config
index 112e9ecc..9801c4ad 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/App.config
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/App.config
@@ -6,7 +6,7 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <connectionStrings>
-    <add name="TestDatabase" connectionString="Server=XPS8700;Initial Catalog=Z.Test.EntityFramework.Plus.EF6;Integrated Security=True;" providerName="System.Data.SqlClient" />
+    <add name="TestDatabase" connectionString="Server=(local);Initial Catalog=Z.Test.EntityFramework.Plus.EF6;Integrated Security=True;" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/Audit/Configuration_IncludeProperty/Single.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/Audit/Configuration_IncludeProperty/Single.cs
index 2ee1172f..c4a185ab 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/Audit/Configuration_IncludeProperty/Single.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/Audit/Configuration_IncludeProperty/Single.cs
@@ -145,7 +145,6 @@ public void Single()
                         Assert.AreEqual(1, entries[0].Properties.Count);
                         Assert.AreEqual(3, entries[1].Properties.Count);
                         Assert.AreEqual(3, entries[2].Properties.Count);
-                        var s = (char) 13;
 
                         // ID
                         propertyIndex = 0;
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/BatchDelete_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/BatchDelete_Inheritance.cs
new file mode 100644
index 00000000..d68ce8f1
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/BatchDelete_Inheritance.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class BatchDelete_Inheritance
+	{
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/Template.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/Template.cs
index 4412c07a..7af34492 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/Template.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/Template.cs
@@ -62,7 +62,7 @@ FROM [dbo].[Entity_Basic] AS [Extent1]
                     ) AS B ON A.[ID] = B.[ID]
 
 SELECT @@ROWCOUNT
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
 DELETE
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/WhileDelayTemplate.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/WhileDelayTemplate.cs
index d7adef26..55068d80 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/WhileDelayTemplate.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/WhileDelayTemplate.cs
@@ -96,7 +96,7 @@ FROM [dbo].[Entity_Basic] AS [Extent1]
     END
 
 SELECT  @totalRowAffected
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
 DECLARE @rowAffected INT
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/WhileTemplate.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/WhileTemplate.cs
index 4b643a72..bd847eb9 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/WhileTemplate.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Executing/WhileTemplate.cs
@@ -82,7 +82,7 @@ FROM [dbo].[Entity_Basic] AS [Extent1]
     END
 
 SELECT  @totalRowAffected
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
 DECLARE @rowAffected INT
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Inheritance/BatchDelete_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Inheritance/BatchDelete_Inheritance.cs
new file mode 100644
index 00000000..1066ff63
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Inheritance/BatchDelete_Inheritance.cs
@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public partial class BatchDelete_Inheritance
+	{
+		[TestMethod]
+		public void DeleteAllTPT()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//make sure our FK between Animals and Dogs supports cascade
+				tcContext.Database.ExecuteSqlCommand(@"
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs] DROP CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs]  WITH CHECK ADD  CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID] FOREIGN KEY([ID])
+					REFERENCES [dbo].[Inheritance_TPT_Animals] ([ID])
+					ON UPDATE CASCADE
+					ON DELETE CASCADE;
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs] CHECK CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats] DROP CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats]  WITH CHECK ADD  CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID] FOREIGN KEY([ID])
+					REFERENCES [dbo].[Inheritance_TPT_Animals] ([ID])
+					ON UPDATE CASCADE
+					ON DELETE CASCADE;
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats] CHECK CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID];
+				");
+
+				//clear all animals
+				tcContext.DeleteAll<Inheritance_TPT_Animal>();
+
+				//add 50 new dogs
+				tcContext.Insert<Inheritance_TPT_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPT_Cat>(25);
+
+				//add some diverity to our data
+				int intRowsAffected = tcContext
+					.Inheritance_TPT_Cats
+					.Take(10)
+					.Update(i => new Inheritance_TPT_Cat()
+					{
+						ColumnCat = 888,
+						ColumnInt = 2
+					});
+
+				//we should have 20 affected rows
+				Assert.AreEqual(20, intRowsAffected);
+
+				//add some diverity to our data
+				intRowsAffected = tcContext
+					.Inheritance_TPT_Dogs
+					.Take(10)
+					.Update(i => new Inheritance_TPT_Dog()
+					{
+						ColumnDog = 999,
+						ColumnInt = 1
+					});
+
+				//we should have 20 affected rows
+				Assert.AreEqual(20, intRowsAffected);
+
+				//delete our dogs
+				intRowsAffected = tcContext.Inheritance_TPT_Dogs.Where(i => i.ColumnDog == 999).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 40 dogs remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPT_Dogs.Count(i => i.ColumnDog == 999));
+				Assert.AreEqual(40, tcContext.Inheritance_TPT_Dogs.Count());
+
+				//delete our cats
+				intRowsAffected = tcContext.Inheritance_TPT_Cats.Where(i => i.ColumnCat == 888).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 15 cats remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPT_Cats.Count(i => i.ColumnCat == 888));
+				Assert.AreEqual(15, tcContext.Inheritance_TPT_Cats.Count());
+
+				//we should have 55 animals in total
+				Assert.AreEqual(55, tcContext.Inheritance_TPT_Animals.Count());
+
+				//undo our change
+				tcContext.Database.ExecuteSqlCommand(@"
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs] DROP CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs]  WITH CHECK ADD  CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID] FOREIGN KEY([ID])
+					REFERENCES [dbo].[Inheritance_TPT_Animals] ([ID]);
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Dogs] CHECK CONSTRAINT [FK_dbo.Inheritance_TPT_Dogs_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats] DROP CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID];
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats]  WITH CHECK ADD  CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID] FOREIGN KEY([ID])
+					REFERENCES [dbo].[Inheritance_TPT_Animals] ([ID]);
+
+					ALTER TABLE [dbo].[Inheritance_TPT_Cats] CHECK CONSTRAINT [FK_dbo.Inheritance_TPT_Cats_dbo.Inheritance_TPT_Animals_ID];
+				");
+			}
+		}
+
+		[TestMethod]
+		public void DeleteAllTPH()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//clear all animals
+				tcContext.DeleteAll<Inheritance_TPH_Animal>();
+
+				//add 50 new dogs
+				tcContext.Insert<Inheritance_TPH_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPH_Cat>(25);
+
+				//add some diverity to our data
+				int intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Cat>()
+					.Take(10)
+					.Update(i => new Inheritance_TPH_Cat()
+					{
+						ColumnCat = 888,
+						ColumnInt = 2
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//add some diverity to our data
+				intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Dog>()
+					.Take(10)
+					.Update(i => new Inheritance_TPH_Dog()
+					{
+						ColumnDog = 999,
+						ColumnInt = 1
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//delete our dogs
+				intRowsAffected = tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Where(i => i.ColumnDog == 999).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 40 dogs remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count(i => i.ColumnDog == 999));
+				Assert.AreEqual(40, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count());
+
+				//delete our cats
+				intRowsAffected = tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Where(i => i.ColumnCat == 888).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 15 cats remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count(i => i.ColumnCat == 888));
+				Assert.AreEqual(15, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count());
+
+				//we should have 55 animals in total
+				Assert.AreEqual(55, tcContext.Inheritance_TPH_Animals.Count());
+			}
+		}
+
+		[TestMethod]
+		public void DeleteAllTPC()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//clear all animals
+				tcContext.DeleteAll<Inheritance_TPC_Cat>();
+				tcContext.DeleteAll<Inheritance_TPC_Dog>();
+
+				//add 50 new dogs
+				tcContext.Insert<Inheritance_TPC_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPC_Cat>(25);
+
+				//add some diverity to our data
+				int intRowsAffected = tcContext
+					.Inheritance_TPC_Cats
+					.Take(10)
+					.Update(i => new Inheritance_TPC_Cat()
+					{
+						ColumnCat = 888,
+						ColumnInt = 2
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//add some diverity to our data
+				intRowsAffected = tcContext
+					.Inheritance_TPC_Dogs
+					.Take(10)
+					.Update(i => new Inheritance_TPC_Dog()
+					{
+						ColumnDog = 999,
+						ColumnInt = 1
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//delete our dogs
+				intRowsAffected = tcContext.Inheritance_TPC_Dogs.Where(i => i.ColumnDog == 999).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 40 dogs remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPC_Dogs.Count(i => i.ColumnDog == 999));
+				Assert.AreEqual(40, tcContext.Inheritance_TPC_Dogs.Count());
+
+				//delete our cats
+				intRowsAffected = tcContext.Inheritance_TPC_Cats.Where(i => i.ColumnCat == 888).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 15 cats remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPC_Cats.Count(i => i.ColumnCat == 888));
+				Assert.AreEqual(15, tcContext.Inheritance_TPC_Cats.Count());
+			}
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Visitor/Skip.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Visitor/Skip.cs
index a8d78bec..e3619947 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Visitor/Skip.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Visitor/Skip.cs
@@ -64,7 +64,7 @@ OFFSET 20 ROWS FETCH NEXT 2147483647 ROWS ONLY
                     ) AS B ON A.[ID] = B.[ID]
 
 SELECT @@ROWCOUNT
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
 DELETE
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Visitor/Take.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Visitor/Take.cs
index 817dcfc3..673d505a 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Visitor/Take.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchDelete/Visitor/Take.cs
@@ -60,7 +60,7 @@ ORDER BY [Extent1].[ColumnInt] ASC
                     ) AS B ON A.[ID] = B.[ID]
 
 SELECT @@ROWCOUNT
-", sql);
+".CollapseWhiteSpace(), sql.CollapseWhiteSpace());
 #elif EFCORE
                 Assert.AreEqual(@"
 DELETE
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchUpdate/BatchUpdate_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchUpdate/BatchUpdate_Inheritance.cs
new file mode 100644
index 00000000..d4924ca1
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchUpdate/BatchUpdate_Inheritance.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class BatchUpdate_Inheritance
+	{
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs
new file mode 100644
index 00000000..efbcfc10
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public partial class BatchUpdate_Inheritance
+	{
+		[TestMethod]
+		public void UpdateAllTPT()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//delete all the animals
+				tcContext.DeleteAll<Inheritance_TPT_Animal>();
+
+				//add 50 dogs
+				tcContext.Insert<Inheritance_TPT_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPT_Cat>(25);
+
+				//update our dogs and the base animals
+				int intRowsAffected = tcContext
+					.Inheritance_TPT_Dogs
+					.Update(i => new Inheritance_TPT_Dog()
+					{
+						ColumnDog = 2,
+						ColumnInt = 1
+					});
+
+				//we should have 100 affected rows. 50 Inheritance_TPT_Cat rows and 50 Inheritance_TPT_Animal rows
+				Assert.AreEqual(100, intRowsAffected);
+
+				//update our cats and the base animals
+				intRowsAffected = tcContext
+					.Inheritance_TPT_Cats
+					.Update(i => new Inheritance_TPT_Cat()
+					{
+						ColumnCat = 3,
+						ColumnInt = 2
+					});
+
+				//we should have 50 affected rows. 25 Inheritance_TPT_Cat rows and 25 Inheritance_TPT_Animal rows
+				Assert.AreEqual(50, intRowsAffected);
+
+				//verify that the dogs were updated properly
+				Assert.AreEqual(100, tcContext.Inheritance_TPT_Dogs.Sum(i => i.ColumnDog));
+				Assert.AreEqual(50, tcContext.Inheritance_TPT_Dogs.Sum(i => i.ColumnInt));
+
+				//verify that the cats were updated properly
+				Assert.AreEqual(75, tcContext.Inheritance_TPT_Cats.Sum(i => i.ColumnCat));
+				Assert.AreEqual(50, tcContext.Inheritance_TPT_Cats.Sum(i => i.ColumnInt));
+
+				//there should be 75 animals
+				Assert.AreEqual(75, tcContext.Inheritance_TPT_Animals.Count());
+			}
+		}
+
+		[TestMethod]
+		public void UpdateAllTPH()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//delete all the animals
+				tcContext.DeleteAll<Inheritance_TPH_Animal>();
+
+				//add 50 dogs
+				tcContext.Insert<Inheritance_TPH_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPH_Cat>(25);
+
+				//update our dogs and the base animals
+				int intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Dog>()
+					.Update(i => new Inheritance_TPH_Dog()
+					{
+						ColumnDog = 2,
+						ColumnInt = 1
+					});
+
+				//we should have 50 affected rows.
+				Assert.AreEqual(50, intRowsAffected);
+
+				//update our dogs and the base animals
+				intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Cat>()
+					.Update(i => new Inheritance_TPH_Cat()
+					{
+						ColumnCat = 3,
+						ColumnInt = 2
+					});
+
+				//we should have 25 affected rows.
+				Assert.AreEqual(25, intRowsAffected);
+
+				//verify that the dogs were updated properly
+				Assert.AreEqual(100, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Sum(i => i.ColumnDog));
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Sum(i => i.ColumnInt));
+
+				//verify that the cats were updated properly
+				Assert.AreEqual(75, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Sum(i => i.ColumnCat));
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Sum(i => i.ColumnInt));
+
+				//there should 25 cats
+				Assert.AreEqual(25, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count());
+
+				//there should be 50 dogs
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count());
+
+				//there should be 75 animals
+				Assert.AreEqual(75, tcContext.Inheritance_TPH_Animals.Count());
+			}
+		}
+
+		[TestMethod]
+		public void UpdateAllTPC()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//delete all the animals
+				tcContext.DeleteAll<Inheritance_TPC_Cat>();
+				tcContext.DeleteAll<Inheritance_TPC_Dog>();
+
+				//add 50 dogs
+				tcContext.Insert<Inheritance_TPC_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPC_Cat>(25);
+
+				//update our dogs and the base animals
+				int intRowsAffected = tcContext.Inheritance_TPC_Dogs.Update(i => new Inheritance_TPC_Dog()
+				{
+					ColumnDog = 2,
+					ColumnInt = 1
+				});
+
+				//we should have 50 affected rows as there's only one table and 50 dogs to update
+				Assert.AreEqual(50, intRowsAffected);
+
+				//verify that they were updated properly
+				Assert.AreEqual(100, tcContext.Inheritance_TPC_Dogs.Sum(i => i.ColumnDog));
+				Assert.AreEqual(50, tcContext.Inheritance_TPC_Dogs.Sum(i => i.ColumnInt));
+
+				//update our dogs and the base animals
+				intRowsAffected = tcContext.Inheritance_TPC_Cats.Update(i => new Inheritance_TPC_Cat()
+				{
+					ColumnCat = 3,
+					ColumnInt = 2
+				});
+
+				//we should have 25 affected rows as there's only one table and 25 cats to update
+				Assert.AreEqual(25, intRowsAffected);
+
+				//verify that they were updated properly
+				Assert.AreEqual(75, tcContext.Inheritance_TPC_Cats.Sum(i => i.ColumnCat));
+				Assert.AreEqual(50, tcContext.Inheritance_TPC_Cats.Sum(i => i.ColumnInt));
+			}
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/Many.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/Many.cs
deleted file mode 100644
index 806bd021..00000000
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/Many.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
-// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
-// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
-// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
-// More projects: http://www.zzzprojects.com/
-// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
-
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Z.EntityFramework.Plus;
-
-namespace Z.Test.EntityFramework.Plus
-{
-    public partial class QueryCache_ForceFirstTagAsCacheKey
-    {
-        [TestMethod]
-        public void Many()
-        {
-            TestContext.DeleteAll(x => x.Entity_Basics);
-            TestContext.Insert(x => x.Entity_Basics, 3);
-
-            using (var ctx = new TestContext())
-            {
-                var firstTag = "zzzprojects";
-
-                var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
-
-                var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
-                QueryCacheManager.ForceFirstTagAsCacheKey = true;
-                var cacheKey2 = QueryCacheManager.GetCacheKey(query, new[] {firstTag, "tag2", "tag3"});
-                QueryCacheManager.ForceFirstTagAsCacheKey = false;
-
-                // Cache key are different
-                Assert.AreNotEqual(cacheKey1, cacheKey2);
-
-                // Cache key2 is equal to hardcoded cacheKey
-                Assert.AreEqual(firstTag, cacheKey2);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/None.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/None.cs
deleted file mode 100644
index 251994ae..00000000
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/None.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
-// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
-// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
-// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
-// More projects: http://www.zzzprojects.com/
-// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
-
-using System;
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Z.EntityFramework.Plus;
-
-namespace Z.Test.EntityFramework.Plus
-{
-    public partial class QueryCache_ForceFirstTagAsCacheKey
-    {
-        [TestMethod]
-        public void None()
-        {
-            TestContext.DeleteAll(x => x.Entity_Basics);
-            TestContext.Insert(x => x.Entity_Basics, 3);
-
-            using (var ctx = new TestContext())
-            {
-                var firstTag = "zzzprojects";
-
-                var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
-
-                var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
-                QueryCacheManager.ForceFirstTagAsCacheKey = true;
-
-                try
-                {
-                    var cacheKey2 = QueryCacheManager.GetCacheKey(query, new string[0]);
-                }
-                catch (Exception ex)
-                {
-                    Assert.AreEqual(ExceptionMessage.QueryCache_FirstTagNullOrEmpty, ex.Message);
-                }
-                finally
-                {
-                    QueryCacheManager.ForceFirstTagAsCacheKey = false;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/Single.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCache/QueryDelayed_WithDefault.cs
similarity index 51%
rename from src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/Single.cs
rename to src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCache/QueryDelayed_WithDefault.cs
index dee69cd7..07b1e075 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/ForceFirstTagAsCacheKey/Single.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCache/QueryDelayed_WithDefault.cs
@@ -5,36 +5,36 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Z.EntityFramework.Plus;
 
 namespace Z.Test.EntityFramework.Plus
 {
-    public partial class QueryCache_ForceFirstTagAsCacheKey
+    public partial class QueryCache_FromCache
     {
         [TestMethod]
-        public void Single()
+        public void FromCache_QueryDelayed_WithDefault()
         {
             TestContext.DeleteAll(x => x.Entity_Basics);
-            TestContext.Insert(x => x.Entity_Basics, 3);
+            TestContext.Insert(x => x.Entity_Basics, 1);
 
             using (var ctx = new TestContext())
             {
-                var firstTag = "zzzprojects";
+                // BEFORE
+                var itemCountBefore = ctx.Entity_Basics.DeferredCount().FromCache();
+                var cacheCountBefore = QueryCacheHelper.GetCacheCount();
 
-                var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
+                TestContext.DeleteAll(x => x.Entity_Basics);
 
-                var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
-                QueryCacheManager.ForceFirstTagAsCacheKey = true;
-                var cacheKey2 = QueryCacheManager.GetCacheKey(query, new[] {firstTag});
-                QueryCacheManager.ForceFirstTagAsCacheKey = false;
+                // AFTER
+                var itemCountAfter = ctx.Entity_Basics.DeferredCount().FromCache();
+                var cacheCountAfter = QueryCacheHelper.GetCacheCount();
 
-                // Cache key are different
-                Assert.AreNotEqual(cacheKey1, cacheKey2);
+                // TEST: The item count are equal
+                Assert.AreEqual(itemCountBefore, itemCountAfter);
 
-                // Cache key2 is equal to hardcoded cacheKey
-                Assert.AreEqual(firstTag, cacheKey2);
+                // TEST: The cache count are equal
+                Assert.AreEqual(cacheCountBefore, cacheCountAfter);
             }
         }
     }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCache/QueryDelayed_WithExpiration.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCache/QueryDelayed_WithExpiration.cs
new file mode 100644
index 00000000..d966f619
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCache/QueryDelayed_WithExpiration.cs
@@ -0,0 +1,45 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryCache_FromCache
+    {
+        [TestMethod]
+        public void FromCache_QueryDelayed_WithExpirations()
+        {
+            TestContext.DeleteAll(x => x.Entity_Basics);
+            TestContext.Insert(x => x.Entity_Basics, 1);
+
+            using (var ctx = new TestContext())
+            {
+                // BEFORE
+                var itemCountBefore = ctx.Entity_Basics.DeferredCount().FromCache(DateTime.Now.AddMinutes(2));
+                var cacheCountBefore = QueryCacheHelper.GetCacheCount();
+
+                TestContext.DeleteAll(x => x.Entity_Basics);
+
+                // AFTER
+                var itemCountAfter = ctx.Entity_Basics.DeferredCount().FromCache(DateTime.Now.AddMinutes(2));
+                var cacheCountAfter = QueryCacheHelper.GetCacheCount();
+
+                // TEST: The item count are equal
+                Assert.AreEqual(itemCountBefore, itemCountAfter);
+
+                // TEST: The cache count are equal
+                Assert.AreEqual(cacheCountBefore, cacheCountAfter);
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/Many.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCacheAsync/QueryDelayed_WithDefault.cs
similarity index 50%
rename from src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/Many.cs
rename to src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCacheAsync/QueryDelayed_WithDefault.cs
index 806bd021..97c1eba0 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/ForceFirstTagAsCacheKey/Many.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCacheAsync/QueryDelayed_WithDefault.cs
@@ -5,36 +5,36 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Z.EntityFramework.Plus;
 
 namespace Z.Test.EntityFramework.Plus
 {
-    public partial class QueryCache_ForceFirstTagAsCacheKey
+    public partial class QueryCache_FromCacheAsync
     {
         [TestMethod]
-        public void Many()
+        public void FromCacheAsync_QueryDelayed_WithDefault()
         {
             TestContext.DeleteAll(x => x.Entity_Basics);
-            TestContext.Insert(x => x.Entity_Basics, 3);
+            TestContext.Insert(x => x.Entity_Basics, 1);
 
             using (var ctx = new TestContext())
             {
-                var firstTag = "zzzprojects";
+                // BEFORE
+                var itemCountBefore = ctx.Entity_Basics.DeferredCount().FromCacheAsync().Result;
+                var cacheCountBefore = QueryCacheHelper.GetCacheCount();
 
-                var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
+                TestContext.DeleteAll(x => x.Entity_Basics);
 
-                var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
-                QueryCacheManager.ForceFirstTagAsCacheKey = true;
-                var cacheKey2 = QueryCacheManager.GetCacheKey(query, new[] {firstTag, "tag2", "tag3"});
-                QueryCacheManager.ForceFirstTagAsCacheKey = false;
+                // AFTER
+                var itemCountAfter = ctx.Entity_Basics.DeferredCount().FromCacheAsync().Result;
+                var cacheCountAfter = QueryCacheHelper.GetCacheCount();
 
-                // Cache key are different
-                Assert.AreNotEqual(cacheKey1, cacheKey2);
+                // TEST: The item count are equal
+                Assert.AreEqual(itemCountBefore, itemCountAfter);
 
-                // Cache key2 is equal to hardcoded cacheKey
-                Assert.AreEqual(firstTag, cacheKey2);
+                // TEST: The cache count are equal
+                Assert.AreEqual(cacheCountBefore, cacheCountAfter);
             }
         }
     }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCacheAsync/QueryDelayed_WithExpiration.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCacheAsync/QueryDelayed_WithExpiration.cs
new file mode 100644
index 00000000..5f27716d
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/FromCacheAsync/QueryDelayed_WithExpiration.cs
@@ -0,0 +1,45 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    public partial class QueryCache_FromCacheAsync
+    {
+        [TestMethod]
+        public void FromCacheAsync_QueryDelayed_WithExpirations()
+        {
+            TestContext.DeleteAll(x => x.Entity_Basics);
+            TestContext.Insert(x => x.Entity_Basics, 1);
+
+            using (var ctx = new TestContext())
+            {
+                // BEFORE
+                var itemCountBefore = ctx.Entity_Basics.DeferredCount().FromCacheAsync(DateTime.Now.AddMinutes(2)).Result;
+                var cacheCountBefore = QueryCacheHelper.GetCacheCount();
+
+                TestContext.DeleteAll(x => x.Entity_Basics);
+
+                // AFTER
+                var itemCountAfter = ctx.Entity_Basics.DeferredCount().FromCacheAsync(DateTime.Now.AddMinutes(2)).Result;
+                var cacheCountAfter = QueryCacheHelper.GetCacheCount();
+
+                // TEST: The item count are equal
+                Assert.AreEqual(itemCountBefore, itemCountAfter);
+
+                // TEST: The cache count are equal
+                Assert.AreEqual(cacheCountBefore, cacheCountAfter);
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/UseFirstTagAsCacheKey/None.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/UseFirstTagAsCacheKey/None.cs
index a889aa89..1d1faf4f 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/UseFirstTagAsCacheKey/None.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/UseFirstTagAsCacheKey/None.cs
@@ -22,8 +22,6 @@ public void None()
 
             using (var ctx = new TestContext())
             {
-                var firstTag = "zzzprojects";
-
                 var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
 
                 var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/UseTagsAsCacheKey/None.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/UseTagsAsCacheKey/None.cs
index 2beaa2a6..c0766c67 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/UseTagsAsCacheKey/None.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/QueryCache/UseTagsAsCacheKey/None.cs
@@ -22,8 +22,6 @@ public void None()
 
             using (var ctx = new TestContext())
             {
-                var firstTag = "zzzprojects";
-
                 var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
 
                 var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/Z.Test.EntityFramework.Plus.EF6.csproj b/src/test/Z.Test.EntityFramework.Plus.EF6/Z.Test.EntityFramework.Plus.EF6.csproj
index 9d281138..79f5fef4 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/Z.Test.EntityFramework.Plus.EF6.csproj
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/Z.Test.EntityFramework.Plus.EF6.csproj
@@ -44,11 +44,11 @@
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -207,6 +207,8 @@
     <Compile Include="BatchDelete\BatchDelete_InMemory.cs" />
     <Compile Include="BatchDelete\BatchDelete_PrimaryKey.cs" />
     <Compile Include="BatchDelete\BatchDelete_WhereValue.cs" />
+    <Compile Include="BatchDelete\BatchDelete_Inheritance.cs" />
+    <Compile Include="BatchDelete\Inheritance\BatchDelete_Inheritance.cs" />
     <Compile Include="BatchDelete\InMemory\Ten.cs" />
     <Compile Include="BatchDelete\InMemory\Thirty.cs" />
     <Compile Include="BatchDelete\InMemory\Twenty.cs" />
@@ -237,6 +239,7 @@
     <Compile Include="BatchUpdate\BatchUpdate_BatchSize.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_Executing.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_SqlSchema.cs" />
+    <Compile Include="BatchUpdate\BatchUpdate_Inheritance.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_WhereValue.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_Value.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_Transaction.cs" />
@@ -247,6 +250,7 @@
     <Compile Include="BatchUpdate\Executing\Template.cs" />
     <Compile Include="BatchUpdate\Executing\WhileDelayTemplate.cs" />
     <Compile Include="BatchUpdate\Executing\WhileTemplate.cs" />
+    <Compile Include="BatchUpdate\Inheritance\BatchUpdate_Inheritance.cs" />
     <Compile Include="BatchUpdate\Keyword\From.cs" />
     <Compile Include="BatchUpdate\PrimaryKey\Many.cs" />
     <Compile Include="BatchUpdate\PrimaryKey\Single.cs" />
@@ -306,6 +310,11 @@
     <Compile Include="QueryCache\ExpireAll\Queryable_WithTag.cs" />
     <Compile Include="QueryCache\ExpireAll\Queryable_WithDefault.cs" />
     <Compile Include="QueryCache\ExpireAll\Queryable_WithExpiration.cs" />
+    <Compile Include="QueryCache\FromCacheAsync\QueryDelayed_WithDefault.cs" />
+    <Compile Include="QueryCache\FromCacheAsync\QueryDelayed_WithExpiration.cs" />
+    <Compile Include="QueryCache\FromCache\QueryDelayed_WithDefault.cs" />
+    <Compile Include="QueryCache\FromCache\QueryDelayed_WithExpiration.cs" />
+    <Compile Include="QueryCache\QueryCache_ForceFirstTagAsCacheKey.cs" />
     <Compile Include="QueryCache\UseTagsAsCacheKey\Many.cs" />
     <Compile Include="QueryCache\UseTagsAsCacheKey\None.cs" />
     <Compile Include="QueryCache\UseTagsAsCacheKey\Single.cs" />
@@ -434,6 +443,8 @@
     <Compile Include="QueryIncludeOptimized\QueryIncludeOptimized_ByPath.cs" />
     <Compile Include="QueryIncludeOptimized\QueryIncludeOptimized_Null_Executor.cs" />
     <Compile Include="QueryIncludeOptimized\QueryIncludeOptimized_Null_Enumerator.cs" />
+    <Compile Include="_Helper\Extensions\StringExtensions.cs" />
+    <Compile Include="_Helper\Extensions\TestContextExtensions.cs" />
     <Compile Include="_Helper\QueryIncludeOptimizedHelper.cs" />
     <Compile Include="_Model\Association_OneToSingleAndMany_RightRight.cs" />
     <Compile Include="_Model\Association_OneToSingleAndMany_RightRightRight.cs" />
@@ -729,7 +740,6 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\..\Z.EntityFramework.Plus.EF6\Z.EntityFramework.Plus.EF6.csproj">
       <Project>{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}</Project>
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/_Helper/Extensions/StringExtensions.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/_Helper/Extensions/StringExtensions.cs
new file mode 100644
index 00000000..a92151ae
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/_Helper/Extensions/StringExtensions.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public static class StringExtensions
+	{
+		private static Regex _rNormalize = new Regex(@"\s+");
+
+		public static string CollapseWhiteSpace(this string strSource)
+		{
+			return string.IsNullOrEmpty(strSource) ? strSource : _rNormalize.Replace(strSource, " ").Trim();
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/_Helper/Extensions/TestContextExtensions.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/_Helper/Extensions/TestContextExtensions.cs
new file mode 100644
index 00000000..f58056a9
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/_Helper/Extensions/TestContextExtensions.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public static class TestContextExtensions
+	{
+		public static List<T> Insert<T>(this TestContext dcContext, int intCount) where T: class, new()
+		{
+			DbSet<T> dbSet = dcContext.Set<T>();
+
+			if (dbSet == null)
+			{
+				return null;
+			}
+
+			int countBefore = dbSet.Count();
+
+			List<T> list = new List<T>();
+			for (int i = 0; i < intCount; i++)
+			{
+				T item = new T();
+				TestContext.InsertFactory(item, i);
+				list.Add(item);
+			}
+
+			dbSet.AddRange(list);
+			dcContext.SaveChanges();
+
+			Assert.AreEqual(intCount + countBefore, dbSet.Count());
+
+			return list;
+		}
+
+		public static void DeleteAll<T>(this TestContext dcContext) where T : class
+		{
+			DbSet<T> dbSet = dcContext.Set<T>();
+
+			dbSet.RemoveRange(dbSet);
+			dcContext.SaveChanges();
+
+			Assert.AreEqual(0, dbSet.Count());
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Animal.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Animal.cs
index 2c186ede..136f1fd0 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Animal.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Animal.cs
@@ -9,7 +9,8 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    public abstract class Inheritance_TPT_Animal
+	[Table("Inheritance_TPT_Animals")]
+    public class Inheritance_TPT_Animal
     {
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int ID { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Cat.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Cat.cs
index c0cee74c..63e84393 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Cat.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Cat.cs
@@ -9,7 +9,7 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    [Table("Inheritance_TPT_Cat")]
+    [Table("Inheritance_TPT_Cats")]
     public class Inheritance_TPT_Cat : Inheritance_TPT_Animal
     {
         public int ColumnCat { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Dog.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Dog.cs
index 7d127558..42fb5bbb 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Dog.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/Inheritance_TPT_Dog.cs
@@ -9,7 +9,7 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    [Table("Inheritance_TPT_Dog")]
+    [Table("Inheritance_TPT_Dogs")]
     public class Inheritance_TPT_Dog : Inheritance_TPT_Animal
     {
         public int ColumnDog { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/_TestContext.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/_TestContext.cs
index e835650e..5cc00d69 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/_TestContext.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/_Model/_TestContext.cs
@@ -9,36 +9,22 @@
 using System.Data.SqlClient;
 using System.Linq;
 using Z.EntityFramework.Plus;
-#if EF5 
-using System.Data.Entity;
-
-#elif EF6
 using System.Data.Entity;
 using System.Data.Entity.Infrastructure.Interception;
 
-#elif EFCORE
-using System.Configuration;
-using System.Data.SqlClient;
-using Microsoft.Data.Entity;
-
-#endif
-
 namespace Z.Test.EntityFramework.Plus
 {
-   
-
-#if EF5 || EF6
     public class TestContextInitializer : CreateDatabaseIfNotExists<TestContext>
     {
         protected override void Seed(TestContext context)
         {
             var sql = @"
-TRUNCATE TABLE Inheritance_TPC_Cat
-IF IDENT_CURRENT( 'Inheritance_TPC_Cat' ) < 1000000
-BEGIN
-	DBCC CHECKIDENT('Inheritance_TPC_Cat', RESEED, 1000000)
-END
-";
+				TRUNCATE TABLE Inheritance_TPC_Cat
+				IF IDENT_CURRENT( 'Inheritance_TPC_Cat' ) < 1000000
+				BEGIN
+					DBCC CHECKIDENT('Inheritance_TPC_Cat', RESEED, 1000000)
+				END
+			";
             using (var connection = new SqlConnection(My.Config.ConnectionStrings.TestDatabase))
             using (var command = new SqlCommand(sql, connection))
             {
@@ -48,52 +34,23 @@ DBCC CHECKIDENT('Inheritance_TPC_Cat', RESEED, 1000000)
             base.Seed(context);
         }
     }
-#endif
 
     public partial class TestContext : DbContext
     {
-#if EF5 || EF6
         public TestContext() : base(My.Config.ConnectionStrings.TestDatabase)
-#elif EFCORE
-        public TestContext()
-#endif
         {
-#if EF5 || EF6
             Database.SetInitializer(new CreateDatabaseIfNotExists<TestContext>());
-#elif EFCORE
-            Database.EnsureCreated();
-#endif
 
-#if EF6
             // BE careful, this one also need to clear filter!
             QueryFilterManager.ClearQueryCache(this);
-#endif
-
         }
 
-
-#if EF5 || EF6
         public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilter1 = null, bool? enableFilter2 = null, bool? enableFilter3 = null, bool? enableFilter4 = null, bool? excludeClass = null, bool? excludeInterface = null, bool? excludeBaseClass = null, bool? excludeBaseInterface = null, bool? includeClass = null, bool? includeInterface = null, bool? includeBaseClass = null, bool? includeBaseInterface = null) : base(My.Config.ConnectionStrings.TestDatabase)
-#elif EFCORE
-        public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilter1 = null, bool? enableFilter2 = null, bool? enableFilter3 = null, bool? enableFilter4 = null, bool? excludeClass = null, bool? excludeInterface = null, bool? excludeBaseClass = null, bool? excludeBaseInterface = null, bool? includeClass = null, bool? includeInterface = null, bool? includeBaseClass = null, bool? includeBaseInterface = null)
-#endif
         {
-#if EF5 || EF6
             Database.SetInitializer(new CreateDatabaseIfNotExists<TestContext>());
-#elif EFCORE
-            Database.EnsureCreated();
-#endif
-#if EFCORE
-    // TODO: Remove this when cast issue will be fixed
-            QueryFilterManager.GlobalFilters.Clear();
-            QueryFilterManager.GlobalInitializeFilterActions.Clear();
-#endif
-
-#if EF6
+
             // Clear query cache
             QueryFilterManager.ClearQueryCache(this);
-#endif
-
 
             if (enableFilter1 != null)
             {
@@ -185,7 +142,6 @@ public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilte
             }
         }
 
-#if EF5 || EF6
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
             // Association
@@ -262,42 +218,13 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             modelBuilder.Configurations.Add(new Internal_Entity_Basic.EntityPropertyVisibilityConfiguration());
             modelBuilder.Configurations.Add(new Internal_Entity_Basic_Many.EntityPropertyVisibilityConfiguration());
         }
-#elif EFCORE
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            optionsBuilder.UseSqlServer(new SqlConnection(My.Config.ConnectionStrings.TestDatabase));
-        }
-
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<Entity_ManyGuid>().HasKey(guid => new {guid.ID1, guid.ID2, guid.ID3});
-
-            // Association
-            {
-            }
-
-            // Audit
-            {
-                //modelBuilder.Entity<AuditEntry>().HasKey(x => x.AuditEntryID);
-                //modelBuilder.Entity<AuditEntryProperty>().Ignore(x => x.NewValue);
-                //modelBuilder.Entity<AuditEntryProperty>().Ignore(x => x.OldValue);
-                //modelBuilder.Entity<AuditEntry>().HasMany(x => x.Properties).WithOne(x => x.AuditEntry);
-                //modelBuilder.Entity<AuditEntryProperty>().HasKey(x => x.AuditEntryPropertyID);
-
-            }
-        }
-
-#endif
 
         #region Association
 
-#if EF5 || EF6
         public DbSet<Association_ManyToMany_Left> Association_ManyToMany_Lefts { get; set; }
 
         public DbSet<Association_ManyToMany_Right> Association_ManyToMany_Rights { get; set; }
 
-#endif
         public DbSet<Association_OneToMany_Left> Association_OneToMany_Lefts { get; set; }
 
         public DbSet<Association_OneToMany_Right> Association_OneToMany_Rights { get; set; }
@@ -344,7 +271,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<AuditEntryProperty> AuditEntryProperties { get; set; }
 
-
         public DbSet<AuditEntry_Extended> AuditEntry_Extendeds { get; set; }
 
         public DbSet<AuditEntryProperty_Extended> AuditEntryProperty_Extendeds { get; set; }
@@ -361,12 +287,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Entity_Basic_Many> Entity_Basic_Manies { get; set; }
 
-#if EF5 || EF6
         public DbSet<Internal_Entity_Basic> Internal_Entity_Basics { get; set; }
 
         public DbSet<Internal_Entity_Basic_Many> Internal_Entity_Basic_Manies { get; set; }
-#endif
-
 
         public DbSet<Entity_Guid> Entity_Guids { get; set; }
 
@@ -376,11 +299,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Entity_Proxy_Right> Entity_Proxy_Rights { get; set; }
 
-#if EF5 || EF6
         public DbSet<Entity_Complex> Entity_Complexes { get; set; }
 
         public DbSet<Entity_Enum> Entity_Enums { get; set; }
-#endif
 
         #endregion
 
@@ -390,18 +311,22 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Inheritance_Interface_Entity_LazyLoading> Inheritance_Interface_Entities_LazyLoading { get; set; }
 
-#if EF5 || EF6
-        public DbSet<Inheritance_TPC_Animal> Inheritance_TPC_Animals { get; set; }
+	    public DbSet<Inheritance_TPC_Animal> Inheritance_TPC_Animals { get; set; }
 
-        public DbSet<Inheritance_TPH_Animal> Inheritance_TPH_Animals { get; set; }
+		public DbSet<Inheritance_TPC_Cat> Inheritance_TPC_Cats { get; set; }
+
+	    public DbSet<Inheritance_TPC_Dog> Inheritance_TPC_Dogs { get; set; }
+
+		public DbSet<Inheritance_TPH_Animal> Inheritance_TPH_Animals { get; set; }
 
         public DbSet<Inheritance_TPT_Animal> Inheritance_TPT_Animals { get; set; }
 
-#endif
         public DbSet<Inheritance_TPT_Cat> Inheritance_TPT_Cats { get; set; }
 
-        public DbSet<Property_AllType> Property_AllTypes { get; set; }
+	    public DbSet<Inheritance_TPT_Dog> Inheritance_TPT_Dogs { get; set; }
+
+		public DbSet<Property_AllType> Property_AllTypes { get; set; }
 
-#endregion
+		#endregion
     }
 }
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/packages.config b/src/test/Z.Test.EntityFramework.Plus.EF6/packages.config
index 64e42325..ca189c12 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EF6/packages.config
+++ b/src/test/Z.Test.EntityFramework.Plus.EF6/packages.config
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net4" requireReinstallation="true" />
-  <package id="EntityFramework.Plus.EF6" version="1.0.0-alpha1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/App.config b/src/test/Z.Test.EntityFramework.Plus.EFCore/App.config
index 3b40a05d..6497cdf0 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/App.config
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/App.config
@@ -5,7 +5,7 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <connectionStrings>
-    <add name="TestDatabase" connectionString="Server=XPS8700;Initial Catalog=Z.Test.EntityFramework.Plus.EFCore;Integrated Security=True;" providerName="System.Data.SqlClient" />
+    <add name="TestDatabase" connectionString="Server=(local);Initial Catalog=Z.Test.EntityFramework.Plus.EFCore.NETStandard;Integrated Security=True;" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
@@ -14,7 +14,7 @@
       </parameters>
     </defaultConnectionFactory>
   </entityFramework>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" /></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -23,7 +23,59 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.EntityFrameworkCore" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.0.1.0" newVersion="1.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.3.0" newVersion="1.1.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.EntityFrameworkCore.Relational" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.3.0" newVersion="1.1.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchDelete/BatchDelete_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchDelete/BatchDelete_Inheritance.cs
new file mode 100644
index 00000000..d68ce8f1
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchDelete/BatchDelete_Inheritance.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class BatchDelete_Inheritance
+	{
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchDelete/Inheritance/BatchDelete_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchDelete/Inheritance/BatchDelete_Inheritance.cs
new file mode 100644
index 00000000..cd17ecbd
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchDelete/Inheritance/BatchDelete_Inheritance.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+using Z.Test.EntityFramework.Plus.EFCore._Helper.Extensions;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public partial class BatchDelete_Inheritance
+	{
+		[TestMethod]
+		public void DeleteAllTPT()
+		{
+			//TPT is not supported in EFCore
+		}
+
+		[TestMethod]
+		public void DeleteAllTPH()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//clear all animals
+				tcContext.DeleteAll<Inheritance_TPH_Animal>();
+
+				//add 50 new dogs
+				tcContext.Insert<Inheritance_TPH_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPH_Cat>(25);
+
+				//add some diverity to our data
+				int intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Cat>()
+					.Take(10)
+					.Update(i => new Inheritance_TPH_Cat()
+					{
+						ColumnCat = 888,
+						ColumnInt = 2
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//add some diverity to our data
+				intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Dog>()
+					.Take(10)
+					.Update(i => new Inheritance_TPH_Dog()
+					{
+						ColumnDog = 999,
+						ColumnInt = 1
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//delete our dogs
+				intRowsAffected = tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Where(i => i.ColumnDog == 999).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 40 dogs remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count(i => i.ColumnDog == 999));
+				Assert.AreEqual(40, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count());
+
+				//delete our cats
+				intRowsAffected = tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Where(i => i.ColumnCat == 888).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 15 cats remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count(i => i.ColumnCat == 888));
+				Assert.AreEqual(15, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count());
+
+				//we should have 55 animals in total
+				Assert.AreEqual(55, tcContext.Inheritance_TPH_Animals.Count());
+			}
+		}
+
+		[TestMethod]
+		public void DeleteAllTPC()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//clear all animals
+				tcContext.DeleteAll<Inheritance_TPC_Cat>();
+				tcContext.DeleteAll<Inheritance_TPC_Dog>();
+
+				//add 50 new dogs
+				tcContext.Insert<Inheritance_TPC_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPC_Cat>(25);
+
+				//add some diverity to our data
+				int intRowsAffected = tcContext
+					.Inheritance_TPC_Cats
+					.Take(10)
+					.Update(i => new Inheritance_TPC_Cat()
+					{
+						ColumnCat = 888,
+						ColumnInt = 2
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//add some diverity to our data
+				intRowsAffected = tcContext
+					.Inheritance_TPC_Dogs
+					.Take(10)
+					.Update(i => new Inheritance_TPC_Dog()
+					{
+						ColumnDog = 999,
+						ColumnInt = 1
+					});
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//delete our dogs
+				intRowsAffected = tcContext.Inheritance_TPC_Dogs.Where(i => i.ColumnDog == 999).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 40 dogs remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPC_Dogs.Count(i => i.ColumnDog == 999));
+				Assert.AreEqual(40, tcContext.Inheritance_TPC_Dogs.Count());
+
+				//delete our cats
+				intRowsAffected = tcContext.Inheritance_TPC_Cats.Where(i => i.ColumnCat == 888).Delete();
+
+				//we should have 10 affected rows
+				Assert.AreEqual(10, intRowsAffected);
+
+				//verify that they were deleted properly, we should have 15 cats remaining
+				Assert.AreEqual(0, tcContext.Inheritance_TPC_Cats.Count(i => i.ColumnCat == 888));
+				Assert.AreEqual(15, tcContext.Inheritance_TPC_Cats.Count());
+			}
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchUpdate/BatchUpdate_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchUpdate/BatchUpdate_Inheritance.cs
new file mode 100644
index 00000000..d4924ca1
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchUpdate/BatchUpdate_Inheritance.cs
@@ -0,0 +1,16 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus
+{
+    [TestClass]
+    public partial class BatchUpdate_Inheritance
+	{
+    }
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs
new file mode 100644
index 00000000..3ade701c
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/BatchUpdate/Inheritance/BatchUpdate_Inheritance.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Z.EntityFramework.Plus;
+using Z.Test.EntityFramework.Plus.EFCore._Helper.Extensions;
+
+namespace Z.Test.EntityFramework.Plus
+{
+	public partial class BatchUpdate_Inheritance
+	{
+		[TestMethod]
+		public void UpdateAllTPT()
+		{
+			//TPT is not supported in EFCore
+		}
+
+		[TestMethod]
+		public void UpdateAllTPH()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//delete all the animals
+				tcContext.DeleteAll<Inheritance_TPH_Animal>();
+
+				//add 50 dogs
+				tcContext.Insert<Inheritance_TPH_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPH_Cat>(25);
+
+				//update our dogs and the base animals
+				int intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Dog>()
+					.Update(i => new Inheritance_TPH_Dog()
+					{
+						ColumnDog = 2,
+						ColumnInt = 1
+					});
+
+				//we should have 50 affected rows.
+				Assert.AreEqual(50, intRowsAffected);
+
+				//update our dogs and the base animals
+				intRowsAffected = tcContext
+					.Inheritance_TPH_Animals
+					.OfType<Inheritance_TPH_Cat>()
+					.Update(i => new Inheritance_TPH_Cat()
+					{
+						ColumnCat = 3,
+						ColumnInt = 2
+					});
+
+				//we should have 25 affected rows.
+				Assert.AreEqual(25, intRowsAffected);
+
+				//verify that the dogs were updated properly
+				Assert.AreEqual(100, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Sum(i => i.ColumnDog));
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Sum(i => i.ColumnInt));
+
+				//verify that the cats were updated properly
+				Assert.AreEqual(75, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Sum(i => i.ColumnCat));
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Sum(i => i.ColumnInt));
+
+				//there should 25 cats
+				Assert.AreEqual(25, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Cat>().Count());
+
+				//there should be 50 dogs
+				Assert.AreEqual(50, tcContext.Inheritance_TPH_Animals.OfType<Inheritance_TPH_Dog>().Count());
+
+				//there should be 75 animals
+				Assert.AreEqual(75, tcContext.Inheritance_TPH_Animals.Count());
+			}
+		}
+
+		[TestMethod]
+		public void UpdateAllTPC()
+		{
+			using (TestContext tcContext = new TestContext())
+			{
+				//delete all the animals
+				tcContext.DeleteAll<Inheritance_TPC_Cat>();
+				tcContext.DeleteAll<Inheritance_TPC_Dog>();
+
+				//add 50 dogs
+				tcContext.Insert<Inheritance_TPC_Dog>(50);
+
+				//add 25 cats
+				tcContext.Insert<Inheritance_TPC_Cat>(25);
+
+				//update our dogs and the base animals
+				int intRowsAffected = tcContext.Inheritance_TPC_Dogs.Update(i => new Inheritance_TPC_Dog()
+				{
+					ColumnDog = 2,
+					ColumnInt = 1
+				});
+
+				//we should have 50 affected rows as there's only one table and 50 dogs to update
+				Assert.AreEqual(50, intRowsAffected);
+
+				//verify that they were updated properly
+				Assert.AreEqual(100, tcContext.Inheritance_TPC_Dogs.Sum(i => i.ColumnDog));
+				Assert.AreEqual(50, tcContext.Inheritance_TPC_Dogs.Sum(i => i.ColumnInt));
+
+				//update our dogs and the base animals
+				intRowsAffected = tcContext.Inheritance_TPC_Cats.Update(i => new Inheritance_TPC_Cat()
+				{
+					ColumnCat = 3,
+					ColumnInt = 2
+				});
+
+				//we should have 25 affected rows as there's only one table and 25 cats to update
+				Assert.AreEqual(25, intRowsAffected);
+
+				//verify that they were updated properly
+				Assert.AreEqual(75, tcContext.Inheritance_TPC_Cats.Sum(i => i.ColumnCat));
+				Assert.AreEqual(50, tcContext.Inheritance_TPC_Cats.Sum(i => i.ColumnInt));
+			}
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryCache/UseFirstTagAsCacheKey/None.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryCache/UseFirstTagAsCacheKey/None.cs
index a889aa89..1d1faf4f 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryCache/UseFirstTagAsCacheKey/None.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryCache/UseFirstTagAsCacheKey/None.cs
@@ -22,8 +22,6 @@ public void None()
 
             using (var ctx = new TestContext())
             {
-                var firstTag = "zzzprojects";
-
                 var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
 
                 var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryCache/UseTagsAsCacheKey/None.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryCache/UseTagsAsCacheKey/None.cs
index 2beaa2a6..c0766c67 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryCache/UseTagsAsCacheKey/None.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryCache/UseTagsAsCacheKey/None.cs
@@ -22,8 +22,6 @@ public void None()
 
             using (var ctx = new TestContext())
             {
-                var firstTag = "zzzprojects";
-
                 var query = ctx.Entity_Basics.Where(x => x.ColumnInt > 0);
 
                 var cacheKey1 = QueryCacheManager.GetCacheKey(query, new string[0]);
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/Future/Queryable_AsNoTracking.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/Future/Queryable_AsNoTracking.cs
index 72419260..3f543d98 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/Future/Queryable_AsNoTracking.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/Future/Queryable_AsNoTracking.cs
@@ -9,12 +9,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Z.EntityFramework.Plus;
-#if EF5 || EF6
-using System.Data.Entity;
-
-#elif EFCORE
-
-#endif
 
 namespace Z.Test.EntityFramework.Plus
 {
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/FutureValue/DelayedQuery_AsNoTracking.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/FutureValue/DelayedQuery_AsNoTracking.cs
index 83b63ff7..03598973 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/FutureValue/DelayedQuery_AsNoTracking.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/FutureValue/DelayedQuery_AsNoTracking.cs
@@ -9,12 +9,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Z.EntityFramework.Plus;
-#if EF5 || EF6
-using System.Data.Entity;
-
-#elif EFCORE
-
-#endif
 
 namespace Z.Test.EntityFramework.Plus
 {
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/FutureValue/Queryable_AsNoTracking.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/FutureValue/Queryable_AsNoTracking.cs
index ca0a9ece..023dc4b2 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/FutureValue/Queryable_AsNoTracking.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/QueryFuture/FutureValue/Queryable_AsNoTracking.cs
@@ -9,13 +9,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Z.EntityFramework.Plus;
-#if EF5 || EF6
-using System.Data.Entity;
-
-#elif EFCORE
-
-
-#endif
 
 namespace Z.Test.EntityFramework.Plus
 {
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/Z.Test.EntityFramework.Plus.EFCore.NETStandard.csproj b/src/test/Z.Test.EntityFramework.Plus.EFCore/Z.Test.EntityFramework.Plus.EFCore.NETStandard.csproj
new file mode 100644
index 00000000..3bc2d5ff
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/Z.Test.EntityFramework.Plus.EFCore.NETStandard.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Z.EntityFramework.Plus.EFCore.NETStandard\Z.EntityFramework.Plus.EFCore.NETStandard.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/Z.Test.EntityFramework.Plus.EFCore.csproj b/src/test/Z.Test.EntityFramework.Plus.EFCore/Z.Test.EntityFramework.Plus.EFCore.csproj
index 675b8a80..be6a50da 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/Z.Test.EntityFramework.Plus.EFCore.csproj
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/Z.Test.EntityFramework.Plus.EFCore.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Z.Test.EntityFramework.Plus.EFCore</RootNamespace>
     <AssemblyName>Z.Test.EntityFramework.Plus.EFCore</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -27,7 +27,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;EFCORE FULL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;EFCORE FULL NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -41,104 +41,137 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.EntityFrameworkCore, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.1.0.1\lib\net451\Microsoft.EntityFrameworkCore.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.EntityFrameworkCore, Version=1.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.1.1.3\lib\net451\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.InMemory.1.0.1\lib\net451\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=1.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.InMemory.1.1.3\lib\net451\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.Relational.1.0.1\lib\net451\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=1.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.Relational.1.1.3\lib\net451\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.SqlServer.1.0.1\lib\net451\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=1.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.SqlServer.1.1.3\lib\net451\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Abstractions.1.1.2\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Memory.1.0.0\lib\net451\Microsoft.Extensions.Caching.Memory.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Memory.1.1.2\lib\net451\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Configuration, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.1.1.2\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.1.2\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.1.1.2\lib\netstandard1.1\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Logging, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.1.1.2\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.1.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Options.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Options.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Options, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Options.1.1.2\lib\netstandard1.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.ComponentModel.Primitives, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ComponentModel.Primitives.4.1.0\lib\net45\System.ComponentModel.Primitives.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.ComponentModel.Primitives, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\net45\System.ComponentModel.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.TypeConverter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ComponentModel.TypeConverter.4.1.0\lib\net45\System.ComponentModel.TypeConverter.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\net45\System.ComponentModel.TypeConverter.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.Common, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Data.Common.4.1.0\lib\net451\System.Data.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Interactive.Async, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="System.Interactive.Async, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Net.Http, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.1\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -283,6 +316,7 @@
     <Compile Include="BatchDelete\Action\Twenty.cs" />
     <Compile Include="BatchDelete\BatchDelayInterval\Default.cs" />
     <Compile Include="BatchDelete\BatchDelayInterval\FiftyMilliseconds.cs" />
+    <Compile Include="BatchDelete\BatchDelete_Inheritance.cs" />
     <Compile Include="BatchDelete\BatchDelete_InMemory.cs" />
     <Compile Include="BatchDelete\BatchDelete_Action.cs" />
     <Compile Include="BatchDelete\BatchDelete_ActionAsync.cs" />
@@ -301,6 +335,7 @@
     <Compile Include="BatchDelete\Executing\Template.cs" />
     <Compile Include="BatchDelete\Executing\WhileDelayTemplate.cs" />
     <Compile Include="BatchDelete\Executing\WhileTemplate.cs" />
+    <Compile Include="BatchDelete\Inheritance\BatchDelete_Inheritance.cs" />
     <Compile Include="BatchDelete\InMemory\Ten.cs" />
     <Compile Include="BatchDelete\InMemory\Thirty.cs" />
     <Compile Include="BatchDelete\InMemory\Twenty.cs" />
@@ -335,6 +370,7 @@
     <Compile Include="BatchUpdate\BatchUpdate_BatchDelayInterval.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_BatchSize.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_Executing.cs" />
+    <Compile Include="BatchUpdate\BatchUpdate_Inheritance.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_Keyword.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_PrimaryKey.cs" />
     <Compile Include="BatchUpdate\BatchUpdate_SqlSchema.cs" />
@@ -345,6 +381,7 @@
     <Compile Include="BatchUpdate\Executing\Template.cs" />
     <Compile Include="BatchUpdate\Executing\WhileDelayTemplate.cs" />
     <Compile Include="BatchUpdate\Executing\WhileTemplate.cs" />
+    <Compile Include="BatchUpdate\Inheritance\BatchUpdate_Inheritance.cs" />
     <Compile Include="BatchUpdate\Keyword\From.cs" />
     <Compile Include="BatchUpdate\PrimaryKey\Many.cs" />
     <Compile Include="BatchUpdate\PrimaryKey\Single.cs" />
@@ -545,6 +582,7 @@
     <Compile Include="QueryFuture\QueryFuture_FutureValue.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="_Helper\AuditHelper.cs" />
+    <Compile Include="_Helper\Extensions\TestContextExtensions.cs" />
     <Compile Include="_Helper\Extensions\QueryCacheHelper.cs" />
     <Compile Include="_Helper\QueryCacheHelper.cs" />
     <Compile Include="_Helper\QueryFilterHelper.cs" />
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Helper/Extensions/TestContextExtensions.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Helper/Extensions/TestContextExtensions.cs
new file mode 100644
index 00000000..34758aa3
--- /dev/null
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Helper/Extensions/TestContextExtensions.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Z.Test.EntityFramework.Plus.EFCore._Helper.Extensions
+{
+	public static class TestContextExtensions
+	{
+		public static List<T> Insert<T>(this TestContext dcContext, int intCount) where T: class, new()
+		{
+			DbSet<T> dbSet = dcContext.Set<T>();
+
+			if (dbSet == null)
+			{
+				return null;
+			}
+
+			int countBefore = dbSet.Count();
+
+			List<T> list = new List<T>();
+			for (int i = 0; i < intCount; i++)
+			{
+				T item = new T();
+				TestContext.InsertFactory(item, i);
+				list.Add(item);
+			}
+
+			dbSet.AddRange(list);
+			dcContext.SaveChanges();
+
+			Assert.AreEqual(intCount + countBefore, dbSet.Count());
+
+			return list;
+		}
+
+		public static void DeleteAll<T>(this TestContext dcContext) where T : class
+		{
+			DbSet<T> dbSet = dcContext.Set<T>();
+
+			dbSet.RemoveRange(dbSet);
+			dcContext.SaveChanges();
+
+			Assert.AreEqual(0, dbSet.Count());
+		}
+	}
+}
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Animal.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Animal.cs
index 2c186ede..136f1fd0 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Animal.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Animal.cs
@@ -9,7 +9,8 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    public abstract class Inheritance_TPT_Animal
+	[Table("Inheritance_TPT_Animals")]
+    public class Inheritance_TPT_Animal
     {
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int ID { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Cat.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Cat.cs
index c0cee74c..63e84393 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Cat.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Cat.cs
@@ -9,7 +9,7 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    [Table("Inheritance_TPT_Cat")]
+    [Table("Inheritance_TPT_Cats")]
     public class Inheritance_TPT_Cat : Inheritance_TPT_Animal
     {
         public int ColumnCat { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Dog.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Dog.cs
index 7d127558..42fb5bbb 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Dog.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Inheritance_TPT_Dog.cs
@@ -9,7 +9,7 @@
 
 namespace Z.Test.EntityFramework.Plus
 {
-    [Table("Inheritance_TPT_Dog")]
+    [Table("Inheritance_TPT_Dogs")]
     public class Inheritance_TPT_Dog : Inheritance_TPT_Animal
     {
         public int ColumnDog { get; set; }
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Methods/DeleteAll.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Methods/DeleteAll.cs
index dd7d4053..d01dad96 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Methods/DeleteAll.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/Methods/DeleteAll.cs
@@ -41,12 +41,14 @@ public static void DeleteAll<T>(TestContext ctx, Func<TestContext, DbSet<T>> fun
 
         public static void DeleteAll<T>(Func<TestContext, DbSet<T>> func) where T : class
         {
-            var ctx = new TestContext();
-            var sets = func(ctx);
-            sets.RemoveRange(sets);
-            ctx.SaveChanges();
-
-            Assert.AreEqual(0, sets.Count());
+	        using (var ctx = new TestContext())
+	        {
+		        var sets = func(ctx);
+		        sets.RemoveRange(sets);
+		        ctx.SaveChanges();
+
+		        Assert.AreEqual(0, sets.Count());
+			}
         }
     }
 }
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/_TestContext.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/_TestContext.cs
index 37773ee6..b04596db 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/_TestContext.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/_TestContext.cs
@@ -5,297 +5,154 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
+using System.Configuration;
 using System.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Z.EntityFramework.Plus;
-#if EF5 || EF6
-using System.Data.Entity;
-
-#elif EFCORE
-using System.Configuration;
-using System.Data.SqlClient;
-using Microsoft.EntityFrameworkCore;
-
-#endif
 
 namespace Z.Test.EntityFramework.Plus
 {
-#if EF5 || EF6
-    public class TestContextInitializer : CreateDatabaseIfNotExists<TestContext>
-    {
-        protected override void Seed(TestContext context)
-        {
-            var sql = @"
-TRUNCATE TABLE Inheritance_TPC_Cat
-IF IDENT_CURRENT( 'Inheritance_TPC_Cat' ) < 1000000
-BEGIN
-	DBCC CHECKIDENT('Inheritance_TPC_Cat', RESEED, 1000000)
-END
-";
-            using (var connection = new SqlConnection(My.Config.ConnectionStrings.TestDatabase))
-            using (var command = new SqlCommand(sql, connection))
-            {
-                connection.Open();
-                command.ExecuteNonQuery();
-            }
-            base.Seed(context);
-        }
-    }
-#endif
-
     public partial class TestContext : DbContext
     {
-#if EF5 || EF6
-        public TestContext() : base(My.Config.ConnectionStrings.TestDatabase)
-#elif EFCORE
-        public TestContext()
-#endif
+        public TestContext() : base()
         {
-#if EF5 || EF6
-            Database.SetInitializer(new TestContextInitializer());
-#elif EFCORE
             Database.EnsureCreated();
-#endif
         }
 
-#if EFCORE
         public TestContext(DbContextOptions options) : base(options)
         {
-            
-        }
-#endif
-
+			Database.EnsureCreated();
+		}
 
-#if EF5 || EF6
-        public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilter1 = null, bool? enableFilter2 = null, bool? enableFilter3 = null, bool? enableFilter4 = null, bool? excludeClass = null, bool? excludeInterface = null, bool? excludeBaseClass = null, bool? excludeBaseInterface = null, bool? includeClass = null, bool? includeInterface = null, bool? includeBaseClass = null, bool? includeBaseInterface = null) : base(My.Config.ConnectionStrings.TestDatabase)
-#elif EFCORE
         public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilter1 = null, bool? enableFilter2 = null, bool? enableFilter3 = null, bool? enableFilter4 = null, bool? excludeClass = null, bool? excludeInterface = null, bool? excludeBaseClass = null, bool? excludeBaseInterface = null, bool? includeClass = null, bool? includeInterface = null, bool? includeBaseClass = null, bool? includeBaseInterface = null)
-#endif
         {
-#if EF5 || EF6
-            Database.SetInitializer(new CreateDatabaseIfNotExists<TestContext>());
-#elif EFCORE
             Database.EnsureCreated();
-#endif
-#if EFCORE
-    // TODO: Remove this when cast issue will be fixed
-            QueryFilterManager.GlobalFilters.Clear();
-            QueryFilterManager.GlobalInitializeFilterActions.Clear();
-#endif
-
-            if (enableFilter1 != null)
-            {
-                this.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter1, entities => entities.Where(x => x.ColumnInt != 1), isEnabled);
-                if (!isEnabled && enableFilter1.Value)
-                {
-                    this.Filter(QueryFilterHelper.Filter.Filter1).Enable();
-                }
-                else if (isEnabled && !enableFilter1.Value)
-                {
-                    this.Filter(QueryFilterHelper.Filter.Filter1).Disable();
-                }
-            }
-            if (enableFilter2 != null)
-            {
-                this.Filter<Inheritance_Interface_IEntity>(QueryFilterHelper.Filter.Filter2, entities => entities.Where(x => x.ColumnInt != 2), isEnabled);
-                if (!isEnabled && enableFilter2.Value)
-                {
-                    this.Filter(QueryFilterHelper.Filter.Filter2).Enable();
-                }
-                else if (isEnabled && !enableFilter2.Value)
-                {
-                    this.Filter(QueryFilterHelper.Filter.Filter2).Disable();
-                }
-            }
-            if (enableFilter3 != null)
-            {
-                this.Filter<Inheritance_Interface_Base>(QueryFilterHelper.Filter.Filter3, entities => entities.Where(x => x.ColumnInt != 3), isEnabled);
-                if (!isEnabled && enableFilter3.Value)
-                {
-                    this.Filter(QueryFilterHelper.Filter.Filter3).Enable();
-                }
-                else if (isEnabled && !enableFilter3.Value)
-                {
-                    this.Filter(QueryFilterHelper.Filter.Filter3).Disable();
-                }
-            }
-            if (enableFilter4 != null)
-            {
-                this.Filter<Inheritance_Interface_IBase>(QueryFilterHelper.Filter.Filter4, entities => entities.Where(x => x.ColumnInt != 4), isEnabled);
-                if (!isEnabled && enableFilter4.Value)
-                {
-                    this.Filter(QueryFilterHelper.Filter.Filter4).Enable();
-                }
-                else if (isEnabled && !enableFilter4.Value)
-                {
-                    this.Filter(QueryFilterHelper.Filter.Filter4).Disable();
-                }
-            }
-
-            if (excludeClass != null && excludeClass.Value)
-            {
-                this.Filter(QueryFilterHelper.Filter.Filter1).Disable(typeof (Inheritance_Interface_Entity));
-            }
-
-            if (excludeInterface != null && excludeInterface.Value)
-            {
-                this.Filter(QueryFilterHelper.Filter.Filter2).Disable(typeof (Inheritance_Interface_IEntity));
-            }
-
-            if (excludeBaseClass != null && excludeBaseClass.Value)
-            {
-                this.Filter(QueryFilterHelper.Filter.Filter3).Disable(typeof (Inheritance_Interface_Base));
-            }
-
-            if (excludeBaseInterface != null && excludeBaseInterface.Value)
-            {
-                this.Filter(QueryFilterHelper.Filter.Filter4).Disable(typeof (Inheritance_Interface_IBase));
-            }
-
-            if (includeClass != null && includeClass.Value)
-            {
-                this.Filter(QueryFilterHelper.Filter.Filter1).Enable(typeof (Inheritance_Interface_IEntity));
-            }
-
-            if (includeInterface != null && includeInterface.Value)
-            {
-                this.Filter(QueryFilterHelper.Filter.Filter2).Enable(typeof (Inheritance_Interface_IEntity));
-            }
-
-            if (includeBaseClass != null && includeBaseClass.Value)
-            {
-                this.Filter(QueryFilterHelper.Filter.Filter3).Enable(typeof (Inheritance_Interface_Base));
-            }
-
-            if (includeBaseInterface != null && includeBaseInterface.Value)
-            {
-                this.Filter(QueryFilterHelper.Filter.Filter4).Enable(typeof (Inheritance_Interface_IBase));
-            }
-        }
 
-#if EF5 || EF6
-        protected override void OnModelCreating(DbModelBuilder modelBuilder)
-        {
-            // Association
-            {
-                // Many to Many
-                {
-                    modelBuilder.Entity<Association_ManyToMany_Left>()
-                        .HasMany(x => x.Rights)
-                        .WithMany(x => x.Lefts)
-                        .Map(c =>
-                        {
-                            c.MapLeftKey("ChildID");
-                            c.MapRightKey("ParentID");
-                            c.ToTable("Association_ManyToMany");
-                        });
-                }
-
-                // Many
-                {
-                    modelBuilder.Entity<Association_OneToMany_Left>()
-                        .HasMany(x => x.Rights)
-                        .WithRequired(x => x.Left);
-                }
-            }
-
-            // Association Multi
-            {
-                // Many
-                {
-                    modelBuilder.Entity<Association_Multi_OneToMany_Left>()
-                        .HasMany(x => x.Right1s)
-                        .WithRequired(x => x.Left);
-
-                    modelBuilder.Entity<Association_Multi_OneToMany_Left>()
-                        .HasMany(x => x.Right2s)
-                        .WithRequired(x => x.Left);
-
-                    modelBuilder.Entity<Association_OneToManyToMany_Left>()
-                        .HasMany(x => x.Rights)
-                        .WithRequired(x => x.Left);
-
-                    modelBuilder.Entity<Association_OneToManyToMany_Right>()
-                        .HasMany(x => x.Rights)
-                        .WithRequired(x => x.Left);
-                }
-            }
-
-            // Entity
-            {
-                modelBuilder.ComplexType<Entity_Complex_Info>();
-                modelBuilder.ComplexType<Entity_Complex_Info_Info>();
-            }
-
-            // Inheritance
-            {
-                modelBuilder.Entity<Inheritance_TPC_Cat>().Map(m =>
-                {
-                    m.MapInheritedProperties();
-                    m.ToTable("Inheritance_TPC_Cat");
-                });
-
-                modelBuilder.Entity<Inheritance_TPC_Dog>().Map(m =>
-                {
-                    m.MapInheritedProperties();
-                    m.ToTable("Inheritance_TPC_Dog");
-                });
-            }
-
-            // Many
-            {
-                modelBuilder.Entity<AuditEntry>().HasMany(x => x.Properties).WithRequired(x => x.Parent);
-            }
-
-            modelBuilder.Configurations.Add(new Internal_Entity_Basic.EntityPropertyVisibilityConfiguration());
-            modelBuilder.Configurations.Add(new Internal_Entity_Basic_Many.EntityPropertyVisibilityConfiguration());
+			//// TODO: Remove this when cast issue will be fixed
+			//QueryFilterManager.GlobalFilters.Clear();
+			//QueryFilterManager.GlobalInitializeFilterActions.Clear();
+
+			//if (enableFilter1 != null)
+   //         {
+   //             this.Filter<Inheritance_Interface_Entity>(QueryFilterHelper.Filter.Filter1, entities => entities.Where(x => x.ColumnInt != 1), isEnabled);
+   //             if (!isEnabled && enableFilter1.Value)
+   //             {
+   //                 this.Filter(QueryFilterHelper.Filter.Filter1).Enable();
+   //             }
+   //             else if (isEnabled && !enableFilter1.Value)
+   //             {
+   //                 this.Filter(QueryFilterHelper.Filter.Filter1).Disable();
+   //             }
+   //         }
+   //         if (enableFilter2 != null)
+   //         {
+   //             this.Filter<Inheritance_Interface_IEntity>(QueryFilterHelper.Filter.Filter2, entities => entities.Where(x => x.ColumnInt != 2), isEnabled);
+   //             if (!isEnabled && enableFilter2.Value)
+   //             {
+   //                 this.Filter(QueryFilterHelper.Filter.Filter2).Enable();
+   //             }
+   //             else if (isEnabled && !enableFilter2.Value)
+   //             {
+   //                 this.Filter(QueryFilterHelper.Filter.Filter2).Disable();
+   //             }
+   //         }
+   //         if (enableFilter3 != null)
+   //         {
+   //             this.Filter<Inheritance_Interface_Base>(QueryFilterHelper.Filter.Filter3, entities => entities.Where(x => x.ColumnInt != 3), isEnabled);
+   //             if (!isEnabled && enableFilter3.Value)
+   //             {
+   //                 this.Filter(QueryFilterHelper.Filter.Filter3).Enable();
+   //             }
+   //             else if (isEnabled && !enableFilter3.Value)
+   //             {
+   //                 this.Filter(QueryFilterHelper.Filter.Filter3).Disable();
+   //             }
+   //         }
+   //         if (enableFilter4 != null)
+   //         {
+   //             this.Filter<Inheritance_Interface_IBase>(QueryFilterHelper.Filter.Filter4, entities => entities.Where(x => x.ColumnInt != 4), isEnabled);
+   //             if (!isEnabled && enableFilter4.Value)
+   //             {
+   //                 this.Filter(QueryFilterHelper.Filter.Filter4).Enable();
+   //             }
+   //             else if (isEnabled && !enableFilter4.Value)
+   //             {
+   //                 this.Filter(QueryFilterHelper.Filter.Filter4).Disable();
+   //             }
+   //         }
+
+   //         if (excludeClass != null && excludeClass.Value)
+   //         {
+   //             this.Filter(QueryFilterHelper.Filter.Filter1).Disable(typeof (Inheritance_Interface_Entity));
+   //         }
+
+   //         if (excludeInterface != null && excludeInterface.Value)
+   //         {
+   //             this.Filter(QueryFilterHelper.Filter.Filter2).Disable(typeof (Inheritance_Interface_IEntity));
+   //         }
+
+   //         if (excludeBaseClass != null && excludeBaseClass.Value)
+   //         {
+   //             this.Filter(QueryFilterHelper.Filter.Filter3).Disable(typeof (Inheritance_Interface_Base));
+   //         }
+
+   //         if (excludeBaseInterface != null && excludeBaseInterface.Value)
+   //         {
+   //             this.Filter(QueryFilterHelper.Filter.Filter4).Disable(typeof (Inheritance_Interface_IBase));
+   //         }
+
+   //         if (includeClass != null && includeClass.Value)
+   //         {
+   //             this.Filter(QueryFilterHelper.Filter.Filter1).Enable(typeof (Inheritance_Interface_IEntity));
+   //         }
+
+   //         if (includeInterface != null && includeInterface.Value)
+   //         {
+   //             this.Filter(QueryFilterHelper.Filter.Filter2).Enable(typeof (Inheritance_Interface_IEntity));
+   //         }
+
+   //         if (includeBaseClass != null && includeBaseClass.Value)
+   //         {
+   //             this.Filter(QueryFilterHelper.Filter.Filter3).Enable(typeof (Inheritance_Interface_Base));
+   //         }
+
+   //         if (includeBaseInterface != null && includeBaseInterface.Value)
+   //         {
+   //             this.Filter(QueryFilterHelper.Filter.Filter4).Enable(typeof (Inheritance_Interface_IBase));
+   //         }
         }
-#elif EFCORE
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             optionsBuilder.UseSqlServer(new SqlConnection(My.Config.ConnectionStrings.TestDatabase));
-        }
-
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            foreach (var entity in modelBuilder.Model.GetEntityTypes())
-            {
-                entity.Relational().TableName = entity.DisplayName();
-            }
-
-            AuditManager.DefaultConfiguration.AutoSavePreAction = (ApplicationDbContext, audit) =>
-(ApplicationDbContext as TestContext).AuditEntries.AddRange(audit.Entries);
 
-            modelBuilder.Entity<Entity_ManyGuid>().HasKey(guid => new {guid.ID1, guid.ID2, guid.ID3});
+			base.OnConfiguring(optionsBuilder);
+        }
 
-            // Association
-            {
-            }
+		protected override void OnModelCreating(ModelBuilder modelBuilder)
+		{
+//			foreach (var entity in modelBuilder.Model.GetEntityTypes())
+//			{
+//				entity.Relational().TableName = entity.DisplayName();
+//			}
 
-            // Audit
-            {
-                //modelBuilder.Entity<AuditEntry>().HasKey(x => x.AuditEntryID);
-                //modelBuilder.Entity<AuditEntryProperty>().Ignore(x => x.NewValue);
-                //modelBuilder.Entity<AuditEntryProperty>().Ignore(x => x.OldValue);
-                //modelBuilder.Entity<AuditEntry>().HasMany(x => x.Properties).WithOne(x => x.AuditEntry);
-                //modelBuilder.Entity<AuditEntryProperty>().HasKey(x => x.AuditEntryPropertyID);
+//			AuditManager.DefaultConfiguration.AutoSavePreAction = (ApplicationDbContext, audit) =>
+//(ApplicationDbContext as TestContext).AuditEntries.AddRange(audit.Entries);
 
-            }
-        }
+			modelBuilder.Entity<Entity_ManyGuid>().HasKey(guid => new { guid.ID1, guid.ID2, guid.ID3 });
 
-#endif
+			//tell EF these are our derivative types for TPH
+			modelBuilder.Entity<Inheritance_TPH_Cat>();
+			modelBuilder.Entity<Inheritance_TPH_Dog>();
 
-        #region Association
+			base.OnModelCreating(modelBuilder);
+		}
 
-#if EF5 || EF6
-        public DbSet<Association_ManyToMany_Left> Association_ManyToMany_Lefts { get; set; }
+		#region Association
 
-        public DbSet<Association_ManyToMany_Right> Association_ManyToMany_Rights { get; set; }
-
-#endif
-        public DbSet<Association_OneToMany_Left> Association_OneToMany_Lefts { get; set; }
+		public DbSet<Association_OneToMany_Left> Association_OneToMany_Lefts { get; set; }
 
         public DbSet<Association_OneToMany_Right> Association_OneToMany_Rights { get; set; }
 
@@ -337,39 +194,30 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Entity_Basic_Many> Entity_Basic_Manies { get; set; }
 
-#if EF5 || EF6
-        public DbSet<Internal_Entity_Basic> Internal_Entity_Basics { get; set; }
-
-        public DbSet<Internal_Entity_Basic_Many> Internal_Entity_Basic_Manies { get; set; }
-#endif
-
-
         public DbSet<Entity_Guid> Entity_Guids { get; set; }
 
         public DbSet<Entity_ManyGuid> Entity_ManyGuids { get; set; }
 
-#if EF5 || EF6
-        public DbSet<Entity_Complex> Entity_Complexes { get; set; }
-#endif
+		#endregion
 
-#endregion
-
-#region Inheritance
+		#region Inheritance
 
         public DbSet<Inheritance_Interface_Entity> Inheritance_Interface_Entities { get; set; }
 
-#if EF5 || EF6
-        public DbSet<Inheritance_TPC_Animal> Inheritance_TPC_Animals { get; set; }
+	    public DbSet<Inheritance_TPC_Cat> Inheritance_TPC_Cats { get; set; }
+
+	    public DbSet<Inheritance_TPC_Dog> Inheritance_TPC_Dogs { get; set; }
 
-        public DbSet<Inheritance_TPH_Animal> Inheritance_TPH_Animals { get; set; }
+		public DbSet<Inheritance_TPH_Animal> Inheritance_TPH_Animals { get; set; }
 
         public DbSet<Inheritance_TPT_Animal> Inheritance_TPT_Animals { get; set; }
 
-#endif
-        public DbSet<Inheritance_TPT_Cat> Inheritance_TPT_Cats { get; set; }
+		public DbSet<Inheritance_TPT_Cat> Inheritance_TPT_Cats { get; set; }
+
+		public DbSet<Inheritance_TPT_Dog> Inheritance_TPT_Dogs { get; set; }
 
-        public DbSet<Property_AllType> Property_AllTypes { get; set; }
+		public DbSet<Property_AllType> Property_AllTypes { get; set; }
 
-#endregion
+		#endregion
     }
 }
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/_TestContextMemory.cs b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/_TestContextMemory.cs
index 63de54c6..952638b7 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/_TestContextMemory.cs
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/_Model/_TestContextMemory.cs
@@ -5,85 +5,34 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-#if EFCORE
+using System.Configuration;
 using System.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Z.EntityFramework.Plus;
-#if EF5 || EF6
-using System.Data.Entity;
-
-#elif EFCORE
-using System.Configuration;
-using System.Data.SqlClient;
-using Microsoft.EntityFrameworkCore;
-
-#endif
 
 namespace Z.Test.EntityFramework.Plus
 {
-#if EF5 || EF6
-    public class TestContextInitializer : CreateDatabaseIfNotExists<TestContext>
-    {
-        protected override void Seed(TestContext context)
-        {
-            var sql = @"
-TRUNCATE TABLE Inheritance_TPC_Cat
-IF IDENT_CURRENT( 'Inheritance_TPC_Cat' ) < 1000000
-BEGIN
-	DBCC CHECKIDENT('Inheritance_TPC_Cat', RESEED, 1000000)
-END
-";
-            using (var connection = new SqlConnection(My.Config.ConnectionStrings.TestDatabase))
-            using (var command = new SqlCommand(sql, connection))
-            {
-                connection.Open();
-                command.ExecuteNonQuery();
-            }
-            base.Seed(context);
-        }
-    }
-#endif
-
     public partial class TestContextMemory : DbContext
     {
-#if EF5 || EF6
-        public TestContext() : base(My.Config.ConnectionStrings.TestDatabase)
-#elif EFCORE
         public TestContextMemory()
-#endif
         {
-#if EF5 || EF6
-            Database.SetInitializer(new TestContextInitializer());
-#elif EFCORE
             Database.EnsureCreated();
-#endif
         }
 
-#if EFCORE
         public TestContextMemory(DbContextOptions options) : base(options)
         {
-            
-        }
-#endif
-
+			Database.EnsureCreated();
+		}
 
-#if EF5 || EF6
-        public TestContext(bool isEnabled, string fixResharper = null, bool? enableFilter1 = null, bool? enableFilter2 = null, bool? enableFilter3 = null, bool? enableFilter4 = null, bool? excludeClass = null, bool? excludeInterface = null, bool? excludeBaseClass = null, bool? excludeBaseInterface = null, bool? includeClass = null, bool? includeInterface = null, bool? includeBaseClass = null, bool? includeBaseInterface = null) : base(My.Config.ConnectionStrings.TestDatabase)
-#elif EFCORE
         public TestContextMemory(bool isEnabled, string fixResharper = null, bool? enableFilter1 = null, bool? enableFilter2 = null, bool? enableFilter3 = null, bool? enableFilter4 = null, bool? excludeClass = null, bool? excludeInterface = null, bool? excludeBaseClass = null, bool? excludeBaseInterface = null, bool? includeClass = null, bool? includeInterface = null, bool? includeBaseClass = null, bool? includeBaseInterface = null)
-#endif
         {
-#if EF5 || EF6
-            Database.SetInitializer(new CreateDatabaseIfNotExists<TestContext>());
-#elif EFCORE
             Database.EnsureCreated();
-#endif
-#if EFCORE
-    // TODO: Remove this when cast issue will be fixed
+
+			// TODO: Remove this when cast issue will be fixed
             QueryFilterManager.GlobalFilters.Clear();
             QueryFilterManager.GlobalInitializeFilterActions.Clear();
-#endif
 
             if (enableFilter1 != null)
             {
@@ -175,90 +124,11 @@ public TestContextMemory(bool isEnabled, string fixResharper = null, bool? enabl
             }
         }
 
-#if EF5 || EF6
-        protected override void OnModelCreating(DbModelBuilder modelBuilder)
-        {
-            // Association
-            {
-                // Many to Many
-                {
-                    modelBuilder.Entity<Association_ManyToMany_Left>()
-                        .HasMany(x => x.Rights)
-                        .WithMany(x => x.Lefts)
-                        .Map(c =>
-                        {
-                            c.MapLeftKey("ChildID");
-                            c.MapRightKey("ParentID");
-                            c.ToTable("Association_ManyToMany");
-                        });
-                }
-
-                // Many
-                {
-                    modelBuilder.Entity<Association_OneToMany_Left>()
-                        .HasMany(x => x.Rights)
-                        .WithRequired(x => x.Left);
-                }
-            }
-
-            // Association Multi
-            {
-                // Many
-                {
-                    modelBuilder.Entity<Association_Multi_OneToMany_Left>()
-                        .HasMany(x => x.Right1s)
-                        .WithRequired(x => x.Left);
-
-                    modelBuilder.Entity<Association_Multi_OneToMany_Left>()
-                        .HasMany(x => x.Right2s)
-                        .WithRequired(x => x.Left);
-
-                    modelBuilder.Entity<Association_OneToManyToMany_Left>()
-                        .HasMany(x => x.Rights)
-                        .WithRequired(x => x.Left);
-
-                    modelBuilder.Entity<Association_OneToManyToMany_Right>()
-                        .HasMany(x => x.Rights)
-                        .WithRequired(x => x.Left);
-                }
-            }
-
-            // Entity
-            {
-                modelBuilder.ComplexType<Entity_Complex_Info>();
-                modelBuilder.ComplexType<Entity_Complex_Info_Info>();
-            }
-
-            // Inheritance
-            {
-                modelBuilder.Entity<Inheritance_TPC_Cat>().Map(m =>
-                {
-                    m.MapInheritedProperties();
-                    m.ToTable("Inheritance_TPC_Cat");
-                });
-
-                modelBuilder.Entity<Inheritance_TPC_Dog>().Map(m =>
-                {
-                    m.MapInheritedProperties();
-                    m.ToTable("Inheritance_TPC_Dog");
-                });
-            }
-
-            // Many
-            {
-                modelBuilder.Entity<AuditEntry>().HasMany(x => x.Properties).WithRequired(x => x.Parent);
-            }
-
-            modelBuilder.Configurations.Add(new Internal_Entity_Basic.EntityPropertyVisibilityConfiguration());
-            modelBuilder.Configurations.Add(new Internal_Entity_Basic_Many.EntityPropertyVisibilityConfiguration());
-        }
-#elif EFCORE
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             // optionsBuilder.UseSqlServer(new SqlConnection(My.Config.ConnectionStrings.TestDatabase));
         }
 
-
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             foreach (var entity in modelBuilder.Model.GetEntityTypes())
@@ -267,7 +137,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             }
 
             AuditManager.DefaultConfiguration.AutoSavePreAction = (ApplicationDbContext, audit) =>
-(ApplicationDbContext as TestContext).AuditEntries.AddRange(audit.Entries);
+				(ApplicationDbContext as TestContext).AuditEntries.AddRange(audit.Entries);
 
             modelBuilder.Entity<Entity_ManyGuid>().HasKey(guid => new {guid.ID1, guid.ID2, guid.ID3});
 
@@ -286,16 +156,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             }
         }
 
-#endif
-
         #region Association
 
-#if EF5 || EF6
         public DbSet<Association_ManyToMany_Left> Association_ManyToMany_Lefts { get; set; }
 
         public DbSet<Association_ManyToMany_Right> Association_ManyToMany_Rights { get; set; }
 
-#endif
         public DbSet<Association_OneToMany_Left> Association_OneToMany_Lefts { get; set; }
 
         public DbSet<Association_OneToMany_Right> Association_OneToMany_Rights { get; set; }
@@ -338,40 +204,30 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Entity_Basic_Many> Entity_Basic_Manies { get; set; }
 
-#if EF5 || EF6
-        public DbSet<Internal_Entity_Basic> Internal_Entity_Basics { get; set; }
-
-        public DbSet<Internal_Entity_Basic_Many> Internal_Entity_Basic_Manies { get; set; }
-#endif
-
-
         public DbSet<Entity_Guid> Entity_Guids { get; set; }
 
         public DbSet<Entity_ManyGuid> Entity_ManyGuids { get; set; }
 
-#if EF5 || EF6
         public DbSet<Entity_Complex> Entity_Complexes { get; set; }
-#endif
 
-#endregion
+		#endregion
 
-#region Inheritance
+		#region Inheritance
 
         public DbSet<Inheritance_Interface_Entity> Inheritance_Interface_Entities { get; set; }
 
-#if EF5 || EF6
         public DbSet<Inheritance_TPC_Animal> Inheritance_TPC_Animals { get; set; }
 
         public DbSet<Inheritance_TPH_Animal> Inheritance_TPH_Animals { get; set; }
 
         public DbSet<Inheritance_TPT_Animal> Inheritance_TPT_Animals { get; set; }
 
-#endif
         public DbSet<Inheritance_TPT_Cat> Inheritance_TPT_Cats { get; set; }
 
-        public DbSet<Property_AllType> Property_AllTypes { get; set; }
+	    public DbSet<Inheritance_TPT_Dog> Inheritance_TPT_Dogs { get; set; }
+
+		public DbSet<Property_AllType> Property_AllTypes { get; set; }
 
-#endregion
+		#endregion
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/test/Z.Test.EntityFramework.Plus.EFCore/packages.config b/src/test/Z.Test.EntityFramework.Plus.EFCore/packages.config
index 09304553..f6a347df 100644
--- a/src/test/Z.Test.EntityFramework.Plus.EFCore/packages.config
+++ b/src/test/Z.Test.EntityFramework.Plus.EFCore/packages.config
@@ -1,49 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework.Core" version="7.0.0-rc1-final" targetFramework="net46" />
-  <package id="EntityFramework.MicrosoftSqlServer" version="7.0.0-rc1-final" targetFramework="net46" />
-  <package id="EntityFramework.Relational" version="7.0.0-rc1-final" targetFramework="net46" />
-  <package id="Ix-Async" version="1.2.5" targetFramework="net46" />
-  <package id="Microsoft.EntityFrameworkCore" version="1.0.1" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.InMemory" version="1.0.1" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Relational" version="1.0.1" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.SqlServer" version="1.0.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Binder" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.OptionsModel" version="1.0.0-rc1-final" targetFramework="net46" />
-  <package id="Microsoft.Extensions.Primitives" version="1.0.0" targetFramework="net461" />
-  <package id="Remotion.Linq" version="2.1.1" targetFramework="net461" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net461" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net461" />
-  <package id="System.ComponentModel" version="4.0.1" targetFramework="net461" />
-  <package id="System.ComponentModel.Primitives" version="4.1.0" targetFramework="net461" />
-  <package id="System.ComponentModel.TypeConverter" version="4.1.0" targetFramework="net461" />
-  <package id="System.Data.Common" version="4.1.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net461" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="net461" />
-  <package id="System.Interactive.Async" version="3.0.0" targetFramework="net461" />
-  <package id="System.IO" version="4.1.0" targetFramework="net461" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Linq.Queryable" version="4.0.1" targetFramework="net461" />
-  <package id="System.ObjectModel" version="4.0.12" targetFramework="net461" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net461" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net461" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net461" />
-  <package id="Z.EntityFramework.Plus.EFCore" version="1.3.0" targetFramework="net461" />
+  <package id="EntityFramework.Core" version="7.0.0-rc1-final" targetFramework="net451" />
+  <package id="EntityFramework.Relational" version="7.0.0-rc1-final" targetFramework="net451" />
+  <package id="Ix-Async" version="1.2.5" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore" version="1.1.3" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore.InMemory" version="1.1.3" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore.Relational" version="1.1.3" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore.SqlServer" version="1.1.3" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Configuration" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="1.1.1" targetFramework="net451" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.1" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Logging" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Options" version="1.1.2" targetFramework="net451" />
+  <package id="Microsoft.Extensions.OptionsModel" version="1.0.0-rc1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Primitives" version="1.1.1" targetFramework="net451" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net451" />
+  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net451" />
+  <package id="NETStandard.Library" version="1.6.1" targetFramework="net451" />
+  <package id="Remotion.Linq" version="2.1.2" targetFramework="net451" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net451" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net451" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net451" />
+  <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net451" />
+  <package id="System.ComponentModel" version="4.3.0" targetFramework="net451" />
+  <package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net451" />
+  <package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net451" />
+  <package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="net451" />
+  <package id="System.Console" version="4.3.0" targetFramework="net451" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net451" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net451" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net451" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net451" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net451" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net451" />
+  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net451" />
+  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net451" />
+  <package id="System.IO" version="4.3.0" targetFramework="net451" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net451" />
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net451" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net451" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net451" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net451" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net451" />
+  <package id="System.Net.Http" version="4.3.3" targetFramework="net451" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net451" />
+  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net451" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="net451" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net451" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net451" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net451" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net451" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net451" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net451" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net451" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net451" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.1" targetFramework="net451" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net451" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net451" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net451" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net451" />
+  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net451" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net451" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net451" />
 </packages>
\ No newline at end of file