diff --git a/src/LinqToExcel.Tests/ExcelQueryFactoryTests.cs b/src/LinqToExcel.Tests/ExcelQueryFactoryTests.cs
index 42b28d5..6e01050 100644
--- a/src/LinqToExcel.Tests/ExcelQueryFactoryTests.cs
+++ b/src/LinqToExcel.Tests/ExcelQueryFactoryTests.cs
@@ -1,15 +1,15 @@
-using System.Linq;
-using NUnit.Framework;
-using System;
+using System;
 using System.IO;
-using System.Data;
+using System.Linq;
+using System.Transactions;
+
 using LinqToExcel.Domain;
+using LinqToExcel.Query;
+
+using NUnit.Framework;
 
 namespace LinqToExcel.Tests
 {
-    using LinqToExcel.Query;
-    using System.Transactions;
-
     [Author("Paul Yoder", "paulyoder@gmail.com")]
     [Category("Unit")]
     [TestFixture]
diff --git a/src/LinqToExcel.Tests/LinqToExcel.Tests.csproj b/src/LinqToExcel.Tests/LinqToExcel.Tests.csproj
index 750d82b..6fdd8ff 100644
--- a/src/LinqToExcel.Tests/LinqToExcel.Tests.csproj
+++ b/src/LinqToExcel.Tests/LinqToExcel.Tests.csproj
@@ -1,24 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net451;net46</TargetFrameworks>
-    <DebugType>Full</DebugType>
+	<TargetFrameworks>net451;net46;netstandard2.0;netcoreapp3.1</TargetFrameworks>
+    <DebugType>portable</DebugType>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit.Console" Version="3.9.0" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" />
+    <PackageReference Include="log4net" Version="2.0.11" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit.Console" Version="3.11.1" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
     <PackageReference Include="NUnit.Extension.VSProjectLoader" Version="3.8.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
-  <!-- Run tests for .Net 3.5 in x64 mode, by default -->
-  <PropertyGroup Condition="'$(TargetFramework)|$(Platform)' == 'net35|AnyCPU'">
-    <PlatformTarget>x64</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net46'">
+    <Reference Include="System.Transactions" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Data.OleDb" Version="4.7.1" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\LinqToExcel\LinqToExcel.csproj" />
@@ -52,7 +56,6 @@
     <None Include="ExcelFiles\EmptyRows.xls">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <Reference Include="System.Transactions" />
     <None Update="ExcelFiles\WorksheetNames.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/LinqToExcel.sln b/src/LinqToExcel.sln
index 650c894..6a7eb67 100644
--- a/src/LinqToExcel.sln
+++ b/src/LinqToExcel.sln
@@ -1,26 +1,36 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30523.141
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqToExcel", "LinqToExcel\LinqToExcel.csproj", "{08F80D96-5387-4406-B88B-DCC0CB661702}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqToExcel", "LinqToExcel\LinqToExcel.csproj", "{08F80D96-5387-4406-B88B-DCC0CB661702}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqToExcel.Tests", "LinqToExcel.Tests\LinqToExcel.Tests.csproj", "{195B956A-8029-44FD-9518-C04F5280611F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqToExcel.Tests", "LinqToExcel.Tests\LinqToExcel.Tests.csproj", "{195B956A-8029-44FD-9518-C04F5280611F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{08F80D96-5387-4406-B88B-DCC0CB661702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08F80D96-5387-4406-B88B-DCC0CB661702}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08F80D96-5387-4406-B88B-DCC0CB661702}.Debug|x86.ActiveCfg = Debug|x86
+		{08F80D96-5387-4406-B88B-DCC0CB661702}.Debug|x86.Build.0 = Debug|x86
 		{08F80D96-5387-4406-B88B-DCC0CB661702}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08F80D96-5387-4406-B88B-DCC0CB661702}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08F80D96-5387-4406-B88B-DCC0CB661702}.Release|x86.ActiveCfg = Release|x86
+		{08F80D96-5387-4406-B88B-DCC0CB661702}.Release|x86.Build.0 = Release|x86
 		{195B956A-8029-44FD-9518-C04F5280611F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{195B956A-8029-44FD-9518-C04F5280611F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{195B956A-8029-44FD-9518-C04F5280611F}.Debug|x86.ActiveCfg = Debug|x86
+		{195B956A-8029-44FD-9518-C04F5280611F}.Debug|x86.Build.0 = Debug|x86
 		{195B956A-8029-44FD-9518-C04F5280611F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{195B956A-8029-44FD-9518-C04F5280611F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{195B956A-8029-44FD-9518-C04F5280611F}.Release|x86.ActiveCfg = Release|x86
+		{195B956A-8029-44FD-9518-C04F5280611F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/LinqToExcel/LinqToExcel.csproj b/src/LinqToExcel/LinqToExcel.csproj
index 2fb9ebb..d0028a2 100644
--- a/src/LinqToExcel/LinqToExcel.csproj
+++ b/src/LinqToExcel/LinqToExcel.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net451;net46</TargetFrameworks>
-    <AssemblyVersion>2.0.0.2</AssemblyVersion>
+    <TargetFrameworks>net451;net46;netstandard2.0;netcoreapp3.1</TargetFrameworks>
+    <AssemblyVersion>2.0.0.4</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
-    <Version>2.0.0-PRERELEASE-2</Version>
+    <Version>2.0.0-PRERELEASE-4</Version>
     <Company>Yoder Web Solutions, LLC</Company>
     <Authors>Paul Yoder, Stephen Workman</Authors>
     <Description>Easily retrieve data from spreadsheets and csv files by using LINQ</Description>
-    <Copyright>Copyright © Paul Yoder 2019</Copyright>
+    <Copyright>Copyright © Paul Yoder 2020</Copyright>
     <PackageLicenseUrl>https://github.com/paulyoder/LinqToExcel/blob/master/License.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/paulyoder/LinqToExcel</PackageProjectUrl>
     <PackageTags>Linq Excel spreadsheet csv</PackageTags>
@@ -26,11 +26,16 @@
 
     <!-- Optional: Include the PDB in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Remotion.Linq" Version="2.2.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Data.OleDb" Version="4.7.1" />
   </ItemGroup>
 
   <ItemGroup>