diff --git a/PCLExt.FileStorage.sln b/PCLExt.FileStorage.sln
index c304d7b..9c7d699 100644
--- a/PCLExt.FileStorage.sln
+++ b/PCLExt.FileStorage.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Android"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.iOS", "src\PCLExt.FileStorage.iOS\PCLExt.FileStorage.iOS.csproj", "{03DA3968-61A3-44D1-9F99-F55D31E07813}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Core", "src\PCLExt.FileStorage.Core\PCLExt.FileStorage.Core.csproj", "{94E4FE17-7F2B-4623-8FFA-12F4056CCB2A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCLExt.FileStorage.Core", "src\PCLExt.FileStorage.Core\PCLExt.FileStorage.Core.csproj", "{94E4FE17-7F2B-4623-8FFA-12F4056CCB2A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Android.Test", "src\PCLExt.FileStorage.Android.Test\PCLExt.FileStorage.Android.Test.csproj", "{CB89F319-1C9D-4574-8874-25F592EC76CD}"
 EndProject
@@ -17,11 +17,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.NetFX",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.macOS", "src\PCLExt.FileStorage.macOS\PCLExt.FileStorage.macOS.csproj", "{0B02DE9A-C3C5-4DB9-B87F-6B05C3566946}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Core.Test", "src\PCLExt.FileStorage.Core.Test\PCLExt.FileStorage.Core.Test.csproj", "{316FFBA8-57A8-4B4A-8352-F1E3361D8710}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCLExt.FileStorage.Core.Test", "src\PCLExt.FileStorage.Core.Test\PCLExt.FileStorage.Core.Test.csproj", "{316FFBA8-57A8-4B4A-8352-F1E3361D8710}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.NetFX.Test", "src\PCLExt.FileStorage.NetFX.Test\PCLExt.FileStorage.NetFX.Test.csproj", "{119368DE-E6BD-4746-BCD8-BBFE458579CC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Standard.Abstractions", "src\PCLExt.FileStorage.Standard.Abstractions\PCLExt.FileStorage.Standard.Abstractions.csproj", "{5D529A12-F49C-40FE-B3C3-17747D73879E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCLExt.FileStorage.Standard.Abstractions", "src\PCLExt.FileStorage.Standard.Abstractions\PCLExt.FileStorage.Standard.Abstractions.csproj", "{5D529A12-F49C-40FE-B3C3-17747D73879E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Portable111", "src\PCLExt.FileStorage.Portable111\PCLExt.FileStorage.Portable111.csproj", "{A7C97A2B-F996-4CAF-87D8-F3A60B2B4D44}"
 EndProject
@@ -47,10 +47,9 @@ Global
 		{CB89F319-1C9D-4574-8874-25F592EC76CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB89F319-1C9D-4574-8874-25F592EC76CD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{CB89F319-1C9D-4574-8874-25F592EC76CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB89F319-1C9D-4574-8874-25F592EC76CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB89F319-1C9D-4574-8874-25F592EC76CD}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{12AB9E53-8A6F-4B3A-8E2F-202799854F91}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{12AB9E53-8A6F-4B3A-8E2F-202799854F91}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{12AB9E53-8A6F-4B3A-8E2F-202799854F91}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{12AB9E53-8A6F-4B3A-8E2F-202799854F91}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{12AB9E53-8A6F-4B3A-8E2F-202799854F91}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
 		{54DBACEB-B898-494B-AD88-2A407CB55A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54DBACEB-B898-494B-AD88-2A407CB55A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54DBACEB-B898-494B-AD88-2A407CB55A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -62,11 +61,9 @@ Global
 		{316FFBA8-57A8-4B4A-8352-F1E3361D8710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{316FFBA8-57A8-4B4A-8352-F1E3361D8710}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{316FFBA8-57A8-4B4A-8352-F1E3361D8710}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{316FFBA8-57A8-4B4A-8352-F1E3361D8710}.Release|Any CPU.Build.0 = Release|Any CPU
 		{119368DE-E6BD-4746-BCD8-BBFE458579CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{119368DE-E6BD-4746-BCD8-BBFE458579CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{119368DE-E6BD-4746-BCD8-BBFE458579CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{119368DE-E6BD-4746-BCD8-BBFE458579CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D529A12-F49C-40FE-B3C3-17747D73879E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5D529A12-F49C-40FE-B3C3-17747D73879E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D529A12-F49C-40FE-B3C3-17747D73879E}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/common/CommonAssemblyInfo.cs b/common/CommonAssemblyInfo.cs
index dd05eb0..b29d615 100644
--- a/common/CommonAssemblyInfo.cs
+++ b/common/CommonAssemblyInfo.cs
@@ -7,5 +7,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/common/PCLExt.FileStorage.nuspec b/common/PCLExt.FileStorage.nuspec
index c057a7e..f48eeb0 100644
--- a/common/PCLExt.FileStorage.nuspec
+++ b/common/PCLExt.FileStorage.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>PCLExt.FileStorage</id>
-        <version>1.2.1.1</version>
+        <version>1.3.0.0</version>
         <title>PCL Extension - File Storage API</title>
         <authors>Daniel Plaisted,Aragas</authors>
         <owners>Aragas</owners>
@@ -10,37 +10,39 @@
         <projectUrl>https://github.com/Aragas/PCLExt.FileStorage</projectUrl>
         <iconUrl>https://raw.githubusercontent.com/Aragas/PCLExt.FileStorage/master/common/sushi_64.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>PCL Extension provides file system implementations for PCL, .NET, Xamarin.iOS, Xamarin.Android and Xamarin.Mac. This makes it easier to create cross-platform .NET libraries and apps. Supports .NET Standard now.</description>
+        <description>PCL Extension provides file system implementations for PCL, .NET Framework, .NET Core, Xamarin.iOS, Xamarin.Android and Xamarin.Mac. This makes it easier to create cross-platform .NET libraries and apps. Supports .NET Standard now.</description>
         <summary>PCL Extension provides file system implementations for PCL platform</summary>
-        <tags>io storage file system portable pcl android mac ios xamarin monoandroid monotouch core netcore netstandard</tags>
+        <tags>io storage file system filesystem filestorage portable pcl android mac ios xamarin monoandroid monotouch core netcore netstandard</tags>
     </metadata>
     <files>
-        <file src="..\src\PCLExt.FileStorage.Portable.Abstractions\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\MonoAndroid10\PCLExt.FileStorage.Abstractions.dll" />
-        <file src="..\src\PCLExt.FileStorage.Portable.Abstractions\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\MonoAndroid10\PCLExt.FileStorage.Abstractions.xml" />
+        <file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\MonoAndroid10\PCLExt.FileStorage.Abstractions.dll" />
+        <file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\MonoAndroid10\PCLExt.FileStorage.Abstractions.xml" />
         <file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.dll" target="lib\MonoAndroid10\PCLExt.FileStorage.dll" />
         <file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.xml" target="lib\MonoAndroid10\PCLExt.FileStorage.xml" />
 		
-        <file src="..\src\PCLExt.FileStorage.Portable.Abstractions\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\net45\PCLExt.FileStorage.Abstractions.dll" />
-        <file src="..\src\PCLExt.FileStorage.Portable.Abstractions\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\net45\PCLExt.FileStorage.Abstractions.xml" />
-        <file src="..\src\PCLExt.FileStorage.Desktop\bin\Release\PCLExt.FileStorage.dll" target="lib\net45\PCLExt.FileStorage.dll" />
-        <file src="..\src\PCLExt.FileStorage.Desktop\bin\Release\PCLExt.FileStorage.xml" target="lib\net45\PCLExt.FileStorage.xml" />
+        <file src="..\src\PCLExt.FileStorage.NetFX\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\net45\PCLExt.FileStorage.Abstractions.dll" />
+        <file src="..\src\PCLExt.FileStorage.NetFX\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\net45\PCLExt.FileStorage.Abstractions.xml" />
+        <file src="..\src\PCLExt.FileStorage.NetFX\bin\Release\PCLExt.FileStorage.dll" target="lib\net45\PCLExt.FileStorage.dll" />
+        <file src="..\src\PCLExt.FileStorage.NetFX\bin\Release\PCLExt.FileStorage.xml" target="lib\net45\PCLExt.FileStorage.xml" />
 		
+        <file src="..\src\PCLExt.FileStorage.Core\bin\Release\netstandard2.0\PCLExt.FileStorage.Abstractions.dll" target="lib\netstandard2.0\PCLExt.FileStorage.Abstractions.dll" />
+        <file src="..\src\PCLExt.FileStorage.Core\bin\Release\netstandard2.0\PCLExt.FileStorage.Abstractions.xml" target="lib\netstandard2.0\PCLExt.FileStorage.Abstractions.xml" />
         <file src="..\src\PCLExt.FileStorage.Core\bin\Release\netstandard2.0\PCLExt.FileStorage.dll" target="lib\netstandard2.0\PCLExt.FileStorage.dll" />
         <file src="..\src\PCLExt.FileStorage.Core\bin\Release\netstandard2.0\PCLExt.FileStorage.xml" target="lib\netstandard2.0\PCLExt.FileStorage.xml" />
 		
-        <file src="..\src\PCLExt.FileStorage.Portable.Abstractions\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.Abstractions.dll" />
-        <file src="..\src\PCLExt.FileStorage.Portable.Abstractions\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.Abstractions.xml" />
-        <file src="..\src\PCLExt.FileStorage.Portable\bin\Release\PCLExt.FileStorage.dll" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.dll" />
-        <file src="..\src\PCLExt.FileStorage.Portable\bin\Release\PCLExt.FileStorage.xml" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.xml" />
+        <file src="..\src\PCLExt.FileStorage.Portable111\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.Abstractions.dll" />
+        <file src="..\src\PCLExt.FileStorage.Portable111\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.Abstractions.xml" />
+        <file src="..\src\PCLExt.FileStorage.Portable111\bin\Release\PCLExt.FileStorage.dll" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.dll" />
+        <file src="..\src\PCLExt.FileStorage.Portable111\bin\Release\PCLExt.FileStorage.xml" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.xml" />
 		
-        <file src="..\src\PCLExt.FileStorage.Portable.Abstractions\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\Xamarin.iOS10\PCLExt.FileStorage.Abstractions.dll" />
-        <file src="..\src\PCLExt.FileStorage.Portable.Abstractions\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\Xamarin.iOS10\PCLExt.FileStorage.Abstractions.xml" />
+        <file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\Xamarin.iOS10\PCLExt.FileStorage.Abstractions.dll" />
+        <file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\Xamarin.iOS10\PCLExt.FileStorage.Abstractions.xml" />
         <file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.dll" target="lib\Xamarin.iOS10\PCLExt.FileStorage.dll" />
         <file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.xml" target="lib\Xamarin.iOS10\PCLExt.FileStorage.xml" />
 		
-        <file src="..\src\PCLExt.FileStorage.Mac\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\Xamarin.Mac20\PCLExt.FileStorage.Abstractions.dll" />
-        <file src="..\src\PCLExt.FileStorage.Mac\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\Xamarin.Mac20\PCLExt.FileStorage.Abstractions.xml" />
-        <file src="..\src\PCLExt.FileStorage.Mac\bin\Release\PCLExt.FileStorage.dll" target="lib\Xamarin.Mac20\PCLExt.FileStorage.dll" />
-        <file src="..\src\PCLExt.FileStorage.Mac\bin\Release\PCLExt.FileStorage.xml" target="lib\Xamarin.Mac20\PCLExt.FileStorage.xml" />
+        <file src="..\src\PCLExt.FileStorage.macOS\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\Xamarin.Mac20\PCLExt.FileStorage.Abstractions.dll" />
+        <file src="..\src\PCLExt.FileStorage.macOS\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\Xamarin.Mac20\PCLExt.FileStorage.Abstractions.xml" />
+        <file src="..\src\PCLExt.FileStorage.macOS\bin\Release\PCLExt.FileStorage.dll" target="lib\Xamarin.Mac20\PCLExt.FileStorage.dll" />
+        <file src="..\src\PCLExt.FileStorage.macOS\bin\Release\PCLExt.FileStorage.xml" target="lib\Xamarin.Mac20\PCLExt.FileStorage.xml" />
     </files>
 </package>
\ No newline at end of file
diff --git a/src/PCLExt.FileStorage.Android.Test/PCLExt.FileStorage.Android.Test.csproj b/src/PCLExt.FileStorage.Android.Test/PCLExt.FileStorage.Android.Test.csproj
index c3ec84f..d8e72b8 100644
--- a/src/PCLExt.FileStorage.Android.Test/PCLExt.FileStorage.Android.Test.csproj
+++ b/src/PCLExt.FileStorage.Android.Test/PCLExt.FileStorage.Android.Test.csproj
@@ -36,7 +36,7 @@
     <DebugSymbols>True</DebugSymbols>
     <Optimize>True</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NUNIT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
diff --git a/src/PCLExt.FileStorage.Core/PCLExt.FileStorage.Core.csproj b/src/PCLExt.FileStorage.Core/PCLExt.FileStorage.Core.csproj
index 528b9a2..9d838fd 100644
--- a/src/PCLExt.FileStorage.Core/PCLExt.FileStorage.Core.csproj
+++ b/src/PCLExt.FileStorage.Core/PCLExt.FileStorage.Core.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>PCLExt.FileStorage</RootNamespace>
-    <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>PCLExt.FileStorage</AssemblyName>
   </PropertyGroup>
diff --git a/src/PCLExt.FileStorage.Standard.Abstractions/PCLExt.FileStorage.Standard.Abstractions.csproj b/src/PCLExt.FileStorage.Standard.Abstractions/PCLExt.FileStorage.Standard.Abstractions.csproj
index e841044..cd3ae87 100644
--- a/src/PCLExt.FileStorage.Standard.Abstractions/PCLExt.FileStorage.Standard.Abstractions.csproj
+++ b/src/PCLExt.FileStorage.Standard.Abstractions/PCLExt.FileStorage.Standard.Abstractions.csproj
@@ -3,6 +3,16 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.0</TargetFramework>
     <RootNamespace>PCLExt.FileStorage</RootNamespace>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyName>PCLExt.FileStorage.Abstractions</AssemblyName>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard1.0\PCLExt.FileStorage.Abstractions.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\common\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/PCLExt.FileStorage.Standard.Abstractions/Properties/AssemblyInfo.cs b/src/PCLExt.FileStorage.Standard.Abstractions/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..db952e1
--- /dev/null
+++ b/src/PCLExt.FileStorage.Standard.Abstractions/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("PCLExt.FileStorage.Abstractions")]
+[assembly: AssemblyDescription("")]
\ No newline at end of file
diff --git a/src/PCLExt.FileStorage.iOS.Test/PCLExt.FileStorage.iOS.Test.csproj b/src/PCLExt.FileStorage.iOS.Test/PCLExt.FileStorage.iOS.Test.csproj
index be923fb..83989bb 100644
--- a/src/PCLExt.FileStorage.iOS.Test/PCLExt.FileStorage.iOS.Test.csproj
+++ b/src/PCLExt.FileStorage.iOS.Test/PCLExt.FileStorage.iOS.Test.csproj
@@ -33,6 +33,7 @@
     <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <DefineConstants>__UNIFIED__;__MOBILE__;__IOS__;NUNIT;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>