diff --git a/Salar.Bois.LZ4/Salar.Bois.LZ4.csproj b/Salar.Bois.LZ4/Salar.Bois.LZ4.csproj
index 83e0162..0c33473 100644
--- a/Salar.Bois.LZ4/Salar.Bois.LZ4.csproj
+++ b/Salar.Bois.LZ4/Salar.Bois.LZ4.csproj
@@ -1,53 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net45;netstandard2.1</TargetFrameworks>
-	<AssemblyName>Salar.Bois.LZ4</AssemblyName>
-	<RootNamespace>Salar.Bois.LZ4</RootNamespace>
-	<Configurations>Debug;Release;Debug+AssemblyOut</Configurations>
-	<Version>3.1.0.0</Version>
-	<Authors>Salar Khalilzadeh</Authors>
-	<Company>Salar Khalilzadeh</Company>
-	<Product>Salar.Bois</Product>
-	<Description>Salar's Serializer for Binary Object Indexed Serialization, LZ4 wrapper</Description>
-	<Copyright>MPLv2 © Salar Khalilzadeh 2019</Copyright>
-	<PackageProjectUrl>https://github.com/salarcode/Bois</PackageProjectUrl>
-	<PackageLicenseUrl></PackageLicenseUrl>
-	<SignAssembly>true</SignAssembly>
-	<AssemblyOriginatorKeyFile>Salar.Bois.snk</AssemblyOriginatorKeyFile>
-	<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-	<PackageTags>Binary Serializer Serialization Serialize Compact BOIS JSON LZ4 Compressed</PackageTags>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp2.0|AnyCPU'">
-    <DocumentationFile>.\bin\Salar.Bois.LZ4.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
-    <DocumentationFile>.\bin\Salar.Bois.LZ4.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug+AssemblyOut|netcoreapp2.0|AnyCPU'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="K4os.Compression.LZ4" Version="1.1.11" />
-    <PackageReference Include="Salar.Bois" Version="3.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\LICENSE.md">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFrameworks>netcoreapp3.0;net45;net5.0;netstandard2.1</TargetFrameworks>
+		<AssemblyName>Salar.Bois.LZ4</AssemblyName>
+		<RootNamespace>Salar.Bois.LZ4</RootNamespace>
+		<Configurations>Debug;Release;Debug+AssemblyOut</Configurations>
+		<Version>3.2.0.0</Version>
+		<Authors>Salar Khalilzadeh</Authors>
+		<Company>Salar Khalilzadeh</Company>
+		<Product>Salar.Bois</Product>
+		<Description>Salar's Serializer for Binary Object Indexed Serialization, LZ4 wrapper</Description>
+		<Copyright>MPLv2 © Salar Khalilzadeh 2019</Copyright>
+		<PackageProjectUrl>https://github.com/salarcode/Bois</PackageProjectUrl>
+		<PackageLicenseUrl></PackageLicenseUrl>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>Salar.Bois.snk</AssemblyOriginatorKeyFile>
+		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+		<PackageTags>Binary Serializer Serialization Serialize Compact BOIS JSON LZ4 Compressed</PackageTags>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<DocumentationFile>.\bin\Salar.Bois.LZ4.xml</DocumentationFile>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug+AssemblyOut|netcoreapp2.0|AnyCPU'">
+		<DefineConstants>DEBUG;TRACE</DefineConstants>
+		<Optimize>false</Optimize>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
+		<DefineConstants>DEBUG;TRACE</DefineConstants>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="K4os.Compression.LZ4" Version="1.2.15" />
+		<PackageReference Include="Salar.Bois" Version="3.1.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="..\LICENSE.md">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+		</None>
+	</ItemGroup>
 
 </Project>
diff --git a/Salar.Bois/Salar.Bois.csproj b/Salar.Bois/Salar.Bois.csproj
index 5a0c561..28b07d5 100644
--- a/Salar.Bois/Salar.Bois.csproj
+++ b/Salar.Bois/Salar.Bois.csproj
@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp2.0;net45;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.0;net45;net5.0;netstandard2.1</TargetFrameworks>
 		<AssemblyName>Salar.Bois</AssemblyName>
 		<RootNamespace>Salar.Bois</RootNamespace>
 		<Configurations>Debug;Release;Debug+AssemblyOut</Configurations>
-		<Version>3.1.0.0</Version>
+		<Version>3.2.0.0</Version>
 		<Authors>Salar Khalilzadeh</Authors>
 		<Company>Salar Khalilzadeh</Company>
 		<Product>Salar.Bois</Product>
 		<Description>The most compact, extermly fast binary serializer for .NET Code and .NET Framework.
 More info: https://github.com/salarcode/Bois</Description>
-		<Copyright>MPLv2 © Salar Khalilzadeh 2019</Copyright>
+		<Copyright>MPLv2 © Salar Khalilzadeh 2021</Copyright>
 		<PackageProjectUrl>https://github.com/salarcode/Bois</PackageProjectUrl>
 		<PackageLicenseUrl></PackageLicenseUrl>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>Salar.Bois.snk</AssemblyOriginatorKeyFile>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-		<PackageReleaseNotes>+ .NET Standard 2.1 support added.
-* Minor bug related to enums fixed.</PackageReleaseNotes>
+		<PackageReleaseNotes>+ .NET Core 5.0 support added.
++ Generic type serialize/deserialize method added</PackageReleaseNotes>
 		<PackageTags>Binary Serializer Serialization Serialize Compact BOIS JSON LZ4 Compressed</PackageTags>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	</PropertyGroup>
@@ -37,7 +37,7 @@ More info: https://github.com/salarcode/Bois</Description>
 	  <DocumentationFile>.\bin\Salar.Bois.xml</DocumentationFile>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 	  <DocumentationFile>.\bin\Salar.Bois.xml</DocumentationFile>
 	</PropertyGroup>
 
diff --git a/Salar.Bois/Types/BoisTypeCompiler.cs b/Salar.Bois/Types/BoisTypeCompiler.cs
index e51a291..8f6690f 100644
--- a/Salar.Bois/Types/BoisTypeCompiler.cs
+++ b/Salar.Bois/Types/BoisTypeCompiler.cs
@@ -144,7 +144,7 @@ public static ComputeResult ComputeWriter(Type type, BoisComplexTypeInfo typeInf
 				parameterTypes: new[] { typeof(BinaryWriter), type/*typeof(object)*/, typeof(Encoding) },
 				m: module,
 				skipVisibility: true);
-#if NetFX || NETFRAMEWORK || NETSTANDARD
+#if NetFX || NETFRAMEWORK || NETSTANDARD || NET5_0_OR_GREATER || NETCOREAPP2_2_OR_GREATER
 			ilMethod.DefineParameter(1, ParameterAttributes.None, "writer");
 			ilMethod.DefineParameter(2, ParameterAttributes.None, "instance");
 			ilMethod.DefineParameter(3, ParameterAttributes.None, "encoding");
@@ -698,7 +698,7 @@ public static ComputeResult ComputeReader(Type type, BoisComplexTypeInfo typeInf
 			   parameterTypes: new[] { typeof(BinaryReader), typeof(Encoding) },
 			   m: module,
 			   skipVisibility: true);
-#if NetFX || NETFRAMEWORK || NETSTANDARD
+#if NetFX || NETFRAMEWORK || NETSTANDARD || NET5_0_OR_GREATER || NETCOREAPP2_2_OR_GREATER
 			ilMethod.DefineParameter(1, ParameterAttributes.None, "reader");
 			ilMethod.DefineParameter(2, ParameterAttributes.None, "encoding");
 #endif