diff --git a/.gitignore b/.gitignore
index 3c4efe2..d82dc7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,4 +258,5 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
\ No newline at end of file
+*.pyc
+.coverage
diff --git a/XrmEntitySerializer.9.Tests/XrmEntitySerializer.9.Tests.csproj b/XrmEntitySerializer.9.Tests/XrmEntitySerializer.9.Tests.csproj
index f20c4bc..5c350e3 100644
--- a/XrmEntitySerializer.9.Tests/XrmEntitySerializer.9.Tests.csproj
+++ b/XrmEntitySerializer.9.Tests/XrmEntitySerializer.9.Tests.csproj
@@ -39,6 +39,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="6.0.1" />
+    <PackageReference Include="OpenCover" Version="4.7.922" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/XrmEntitySerializer.Core.Tests/XrmEntitySerializer.Core.Tests.csproj b/XrmEntitySerializer.Core.Tests/XrmEntitySerializer.Core.Tests.csproj
index 5392931..faada6f 100644
--- a/XrmEntitySerializer.Core.Tests/XrmEntitySerializer.Core.Tests.csproj
+++ b/XrmEntitySerializer.Core.Tests/XrmEntitySerializer.Core.Tests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XrmEntitySerializer.Tests</RootNamespace>
     <AssemblyName>XrmEntitySerializer.Core.Tests</AssemblyName>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -41,15 +41,16 @@
     <DefineConstants>$(DefineConstants);NETCORE;</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Microsoft.PowerPlatform.Cds.Client">
-      <Version>[0.2.1-Alpha,1.0.0)</Version>
-    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="0.4.12" />
+    <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\XrmEntitySerializer.Core\XrmEntitySerializer.Core.csproj" />
diff --git a/XrmEntitySerializer.Core/XrmEntitySerializer.Core.csproj b/XrmEntitySerializer.Core/XrmEntitySerializer.Core.csproj
index 0ca5c4d..e665953 100644
--- a/XrmEntitySerializer.Core/XrmEntitySerializer.Core.csproj
+++ b/XrmEntitySerializer.Core/XrmEntitySerializer.Core.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>XrmEntitySerializer.Core</AssemblyName>
     <PackageId>XrmEntitySerializer.Core</PackageId>
     <PackageVersion>$(PackageVersion)-Alpha</PackageVersion>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -31,11 +31,26 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
+    <DefineConstants>$(DefineConstants);NETCORE;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);NETCORE;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0' ">
     <DefineConstants>$(DefineConstants);NETCORE;</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Microsoft.PowerPlatform.Cds.Client">
+      <Version>[0.2.1-Alpha,1.0.0)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="Microsoft.PowerPlatform.Cds.Client">
       <Version>[0.2.1-Alpha,1.0.0)</Version>
     </PackageReference>
@@ -43,5 +58,8 @@
   <ItemGroup>
     <None Include="../Logo_80x80.png" Pack="true" PackagePath="\" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="0.4.12" />
+  </ItemGroup>
   <Import Project="..\XrmEntitySerializer\XrmEntitySerializer.projitems" Label="Shared" />
 </Project>
\ No newline at end of file
diff --git a/coverage.bat b/coverage.bat
new file mode 100644
index 0000000..f0c9229
--- /dev/null
+++ b/coverage.bat
@@ -0,0 +1,38 @@
+@echo off
+
+if not exist ".coverage" mkdir .coverage
+
+for /F "tokens=*" %%G in ('nuget locals global-packages -List') do (
+	SET NuGets_2=%%G 
+	SET NuGets_1=%NuGets_2:~17%
+	SET NuGets=%NuGets_1:~0,-1%
+)
+
+
+SET OPEN_COVER=
+for /D %%D in ("%NuGets%opencover\*") do (
+    SET OPEN_COVER=%%~D\tools\OpenCover.Console.exe
+	ECHO %OPEN_COVER%
+)
+
+SET XUNIT_RUNNER=
+for /D %%D in ("%NuGets%xunit.runner.console\*") do (
+   SET XUNIT_RUNNER=%%~D\tools\net46\xunit.console.exe
+)
+
+IF "%OPEN_COVER%"=="" (
+	ECHO Could not find OpenCover. Make sure to restore NuGet packages 1>&2
+	EXIT 1
+)
+
+IF "%XUNIT_RUNNER%"=="" (
+	ECHO Could not find xunit.runner.console. Make sure to restore NuGet packages 1>&2
+	EXIT 1
+)
+
+"%OPEN_COVER%" -target:"%XUNIT_RUNNER%" -targetargs:"""XrmEntitySerializer.5.Tests\bin\Debug\net452\XrmEntitySerializer.5.Tests.dll"" -noshadow"  -output:".coverage\XrmEntitySerializer.5.net40.xml" -register:Path64 -filter:"+[XrmEntitySerializer.5]* -[XrmEntitySerializer.5.Tests]*"
+"%OPEN_COVER%" -target:"%XUNIT_RUNNER%" -targetargs:"""XrmEntitySerializer.6.Tests\bin\Debug\net452\XrmEntitySerializer.6.Tests.dll"" -noshadow"  -output:".coverage\XrmEntitySerializer.6.net40.xml" -register:Path64 -filter:"+[XrmEntitySerializer.6]* -[XrmEntitySerializer.6.Tests]*"
+"%OPEN_COVER%" -target:"%XUNIT_RUNNER%" -targetargs:"""XrmEntitySerializer.7.Tests\bin\Debug\net452\XrmEntitySerializer.7.Tests.dll"" -noshadow"  -output:".coverage\XrmEntitySerializer.7.net452.xml" -register:Path64 -filter:"+[XrmEntitySerializer.7]* -[XrmEntitySerializer.7.Tests]*"
+"%OPEN_COVER%" -target:"%XUNIT_RUNNER%" -targetargs:"""XrmEntitySerializer.8.Tests\bin\Debug\net452\XrmEntitySerializer.8.Tests.dll"" -noshadow"  -output:".coverage\XrmEntitySerializer.8.net452.xml" -register:Path64 -filter:"+[XrmEntitySerializer.8]* -[XrmEntitySerializer.8.Tests]*"
+"%OPEN_COVER%" -target:"%XUNIT_RUNNER%" -targetargs:"""XrmEntitySerializer.9.Tests\bin\Debug\net452\XrmEntitySerializer.9.Tests.dll"" -noshadow"  -output:".coverage\XrmEntitySerializer.9.net452.xml" -register:Path64 -filter:"+[XrmEntitySerializer.9]* -[XrmEntitySerializer.9.Tests]*"
+"%OPEN_COVER%" -target:"%XUNIT_RUNNER%" -targetargs:"""XrmEntitySerializer.9.Tests\bin\Debug\net462\XrmEntitySerializer.9.Tests.dll"" -noshadow"  -output:".coverage\XrmEntitySerializer.9.net462.xml" -register:Path64 -filter:"+[XrmEntitySerializer.9]* -[XrmEntitySerializer.9.Tests]*"