diff --git a/paket.dependencies b/paket.dependencies
index b6ef4ae6..40201811 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -2,7 +2,7 @@ source https://api.nuget.org/v3/index.json
 
 
 storage: none
-nuget FSharp.Core 4.6.2
+nuget FSharp.Core 4.7.0
 nuget Hopac
 nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
 nuget Ply
@@ -10,6 +10,7 @@ nuget Ply
 group Test
 source https://api.nuget.org/v3/index.json
 storage: none
+nuget FSharp.Core 4.7.0
 nuget Expecto
 nuget Expecto.Hopac
 nuget Fable.Mocha 2.10.0
diff --git a/paket.lock b/paket.lock
index 511c9c21..ad2638d5 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,37 +1,14 @@
 STORAGE: NONE
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    FSharp.Core (4.6.2)
-      System.Collections (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Console (>= 4.0) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Diagnostics.Debug (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Diagnostics.Tools (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Globalization (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.IO (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Linq (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Linq.Expressions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Linq.Queryable (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Net.Requests (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Reflection (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Reflection.Extensions (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Resources.ResourceManager (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Runtime (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Runtime.Extensions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Runtime.Numerics (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Text.RegularExpressions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Threading (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Threading.Tasks (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Threading.Tasks.Parallel (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Threading.Thread (>= 4.0) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Threading.ThreadPool (>= 4.0.10) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Threading.Timer (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
+    FSharp.Core (4.7)
     Hopac (0.3.23)
       FSharp.Core (>= 3.1.2.5) - restriction: < netstandard1.6
       FSharp.Core (>= 4.0.1.7-alpha) - restriction: >= netstandard1.6
       NETStandard.Library (>= 1.6) - restriction: >= netstandard1.6
     Microsoft.Build.Tasks.Git (1.1.0-beta-20204-02) - copy_local: true
     Microsoft.NETCore.Platforms (3.1) - restriction: || (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (>= net45) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (>= net461) (>= netstandard1.6)) (>= netcoreapp2.0) (&& (< netstandard1.0) (>= netstandard1.6) (< portable-net45+win8)) (&& (< netstandard1.0) (>= netstandard1.6) (>= win8)) (&& (< netstandard1.0) (>= netstandard1.6) (< win8)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= netstandard1.6) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.6) (>= uap10.1)) (&& (>= netstandard1.6) (>= wp8))
-    Microsoft.NETCore.Targets (3.1) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    Microsoft.NETCore.Targets (3.1) - restriction: || (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.2) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
     Microsoft.SourceLink.Common (1.1.0-beta-20204-02) - copy_local: true
     Microsoft.SourceLink.GitHub (1.1.0-beta-20204-02) - copy_local: true
       Microsoft.Build.Tasks.Git (>= 1.1.0-beta-20204-02)
@@ -139,7 +116,7 @@ NUGET
       System.Resources.ResourceManager (>= 4.3) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)
       System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)
       System.Threading (>= 4.3) - restriction: && (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)
-    System.Collections (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Collections (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
@@ -154,13 +131,13 @@ NUGET
       System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
-    System.Console (4.3.1) - restriction: || (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
+    System.Console (4.3.1) - restriction: || (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1.2) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Diagnostics.Debug (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Diagnostics.Debug (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
@@ -176,7 +153,7 @@ NUGET
       System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Runtime.InteropServices (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
       System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
-    System.Diagnostics.Tools (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Diagnostics.Tools (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -184,7 +161,7 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
-    System.Globalization (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Globalization (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
@@ -200,7 +177,7 @@ NUGET
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime.InteropServices (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.IO (4.3) - restriction: || (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.IO (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
@@ -243,13 +220,13 @@ NUGET
       System.Threading.Tasks (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
     System.IO.FileSystem.Primitives (4.3) - restriction: || (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Linq (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Linq (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.6) (< win8) (< wp8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Diagnostics.Debug (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Resources.ResourceManager (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.6) (< win8) (< wp8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime.Extensions (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Linq.Expressions (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Linq.Expressions (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       System.Collections (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Diagnostics.Debug (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Globalization (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -267,15 +244,6 @@ NUGET
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime.Extensions (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Linq.Queryable (4.3) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Linq (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
-      System.Linq.Expressions (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
-      System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Reflection.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
     System.Memory (4.5.4) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (>= net45) (< netstandard1.3) (>= netstandard1.6) (>= uap10.0)) (&& (< net45) (>= net46) (< netstandard1.2) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard2.0)) (&& (< net45) (>= net46) (< netstandard1.5) (>= netstandard1.6)) (&& (< net45) (>= net46) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (< netstandard1.2) (>= netstandard2.0) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard2.0) (>= uap10.0)) (&& (>= netstandard1.6) (>= uap10.1))
       System.Buffers (>= 4.5.1) - restriction: || (&& (>= monoandroid) (< netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (< uap10.1) (>= wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos)
       System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
@@ -313,25 +281,11 @@ NUGET
       System.Text.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
-    System.Net.Primitives (4.3.1) - restriction: || (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Net.Primitives (4.3.1) - restriction: || (&& (< net45) (>= net46) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8))
       Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8))
       System.Runtime (>= 4.3.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8))
       System.Runtime.Handles (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Net.Requests (4.3) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Diagnostics.Tracing (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.IO (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8))
-      System.Net.Http (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Net.Primitives (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8))
-      System.Net.WebHeaderCollection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (>= netstandard1.0) (< netstandard1.1) (< win8) (< wp8))
-      System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
     System.Net.Sockets (4.3) - restriction: || (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -339,24 +293,19 @@ NUGET
       System.Net.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading.Tasks (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Net.WebHeaderCollection (4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
-      System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.ObjectModel (4.3) - restriction: || (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.ObjectModel (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Reflection (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Reflection (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.IO (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Reflection.Primitives (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
-    System.Reflection.Emit (4.7) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)
+    System.Reflection.Emit (4.7) - restriction: || (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netcoreapp2.0) (>= netstandard2.0) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (>= wpa81)) (>= uap10.1)
@@ -364,45 +313,45 @@ NUGET
       System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Runtime.InteropServices (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
-    System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< netstandard1.1) (>= netstandard1.6) (>= win8)) (&& (>= netstandard1.6) (< netstandard2.0) (>= wpa81)) (&& (>= netstandard1.6) (>= uap10.1))
+    System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.2) (>= netstandard1.6) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= netstandard2.0) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.6) (>= uap10.1)) (&& (>= netstandard2.0) (< portable-net45+win8+wpa81))
       System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Reflection.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
-    System.Reflection.Emit.Lightweight (4.7) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)
+    System.Reflection.Emit.Lightweight (4.7) - restriction: || (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netcoreapp2.0) (>= netstandard2.0) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (< netstandard2.0) (>= wpa81)) (&& (>= portable-net45+win8+wp8+wpa81) (< portable-net45+wp8) (< win8)) (&& (< portable-net45+wp8) (>= win8)) (>= uap10.1)
       System.Reflection.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarintvos) (< xamarinwatchos)
-    System.Reflection.Extensions (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Reflection.Extensions (4.3) - restriction: || (&& (< monoandroid) (< netstandard1.0) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.0) (>= netstandard1.6) (< portable-net45+win8)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Reflection.Primitives (4.3) - restriction: || (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Reflection.Primitives (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Reflection.TypeExtensions (4.7) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)
+    System.Reflection.TypeExtensions (4.7) - restriction: || (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       System.Reflection (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.5) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.5) (< uap10.1))
       System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.5) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.5) (< uap10.1))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.5) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.5) (< uap10.1))
-    System.Resources.ResourceManager (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Resources.ResourceManager (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Runtime (4.3.1) - restriction: || (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Runtime (4.3.1) - restriction: || (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
     System.Runtime.CompilerServices.Unsafe (4.7.1) - restriction: || (&& (>= monoandroid) (< netstandard1.1) (>= netstandard1.6) (>= uap10.0)) (&& (>= monoandroid) (< netstandard1.1) (>= netstandard2.0)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard1.2)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard1.4)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= net46)) (&& (>= monotouch) (< netstandard1.2)) (&& (>= monotouch) (< netstandard1.3)) (&& (>= monotouch) (< netstandard1.4)) (&& (>= monotouch) (< netstandard1.5)) (&& (>= monotouch) (>= uap10.1)) (&& (>= net45) (>= netcoreapp2.0) (< netstandard1.3) (>= uap10.0)) (&& (>= net45) (< netstandard1.1) (>= netstandard1.6) (>= uap10.0)) (&& (>= net45) (< netstandard1.3) (>= netstandard1.6) (>= uap10.0)) (&& (>= net45) (< netstandard1.3) (>= netstandard2.0) (>= uap10.0)) (&& (>= net45) (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< net45) (>= net46) (< netstandard1.2) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.2) (>= netstandard2.0)) (&& (< net45) (>= net46) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.3) (>= netstandard2.0)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard2.0)) (&& (< net45) (>= net46) (< netstandard1.5) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.5) (>= netstandard2.0)) (&& (< net45) (>= net46) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (>= net461) (< netstandard1.2) (>= netstandard1.6)) (&& (< net45) (>= net461) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (>= net461) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (>= net461) (< netstandard1.5) (>= netstandard1.6)) (&& (< net45) (>= net461) (>= netstandard1.6) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard2.0) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (>= netcoreapp2.0) (< netstandard1.2)) (&& (>= net46) (>= netcoreapp2.0) (< netstandard1.3)) (&& (>= net46) (>= netcoreapp2.0) (< netstandard1.4)) (&& (>= net46) (>= netcoreapp2.0) (< netstandard1.5)) (&& (>= net46) (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= net46) (< netstandard1.1) (>= netstandard1.6)) (&& (>= net46) (< netstandard1.1) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.2) (>= netstandard1.6) (>= wpa81)) (&& (>= net46) (< netstandard1.3) (>= netstandard1.6) (>= wpa81)) (&& (>= net46) (< netstandard1.4) (>= netstandard1.6) (>= wpa81)) (&& (>= net46) (< netstandard1.4) (>= netstandard2.0) (>= wpa81)) (&& (>= net46) (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= net46) (< netstandard1.5) (>= netstandard1.6) (>= wpa81)) (&& (>= net46) (>= netstandard1.6) (< netstandard2.0) (>= wpa81)) (&& (>= net46) (< netstandard2.0) (>= xamarintvos)) (&& (>= net46) (< netstandard2.0) (>= xamarinwatchos)) (&& (>= net461) (< netstandard1.3) (>= netstandard1.6) (>= uap10.0)) (&& (>= net461) (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= net461) (>= netstandard2.0)) (&& (>= netcoreapp2.0) (< netstandard1.5) (>= uap10.0)) (&& (>= netcoreapp2.0) (>= uap10.1)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.1) (>= netstandard2.0) (>= uap10.0)) (&& (< netstandard1.2) (>= netstandard1.6) (< win8) (>= wpa81)) (&& (< netstandard1.2) (>= netstandard2.0) (< win8) (>= wpa81)) (&& (< netstandard1.2) (>= xamarinios)) (&& (< netstandard1.2) (>= xamarinmac)) (&& (< netstandard1.2) (>= xamarintvos)) (&& (< netstandard1.2) (>= xamarinwatchos)) (&& (< netstandard1.3) (>= xamarinios)) (&& (< netstandard1.3) (>= xamarinmac)) (&& (< netstandard1.3) (>= xamarintvos)) (&& (< netstandard1.3) (>= xamarinwatchos)) (&& (< netstandard1.4) (>= xamarinios)) (&& (< netstandard1.4) (>= xamarinmac)) (&& (< netstandard1.4) (>= xamarintvos)) (&& (< netstandard1.4) (>= xamarinwatchos)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard2.0) (>= uap10.0)) (&& (< netstandard1.5) (>= xamarinios)) (&& (< netstandard1.5) (>= xamarinmac)) (&& (< netstandard1.5) (>= xamarintvos)) (&& (< netstandard1.5) (>= xamarinwatchos)) (&& (>= netstandard1.6) (>= uap10.1)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.0) (>= wp8)) (&& (< netstandard2.0) (>= xamarinios)) (&& (< netstandard2.0) (>= xamarinmac)) (&& (>= uap10.1) (>= xamarinios)) (&& (>= uap10.1) (>= xamarinmac)) (&& (>= uap10.1) (>= xamarintvos)) (&& (>= uap10.1) (>= xamarinwatchos))
-    System.Runtime.Extensions (4.3.1) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Runtime.Extensions (4.3.1) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime (>= 4.3.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
-    System.Runtime.Handles (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
+    System.Runtime.Handles (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -421,7 +370,7 @@ NUGET
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime.InteropServices (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.1) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Runtime.Numerics (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
+    System.Runtime.Numerics (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
       System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
@@ -526,7 +475,7 @@ NUGET
       System.Security.Cryptography.Primitives (>= 4.3) - restriction: && (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Text.Encoding (>= 4.3) - restriction: && (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Text.Encoding (4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Text.Encoding (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
@@ -535,37 +484,23 @@ NUGET
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Text.Encoding (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
-    System.Text.RegularExpressions (4.3.1) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Text.RegularExpressions (4.3.1) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       System.Collections (>= 4.3) - restriction: && (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Globalization (>= 4.3) - restriction: && (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Resources.ResourceManager (>= 4.3) - restriction: && (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime.Extensions (>= 4.3.1) - restriction: && (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monotouch) (< net45) (< netcoreapp1.1) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Threading (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Threading (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
-    System.Threading.Tasks (4.3) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
+    System.Threading.Tasks (4.3) - restriction: || (&& (< net45) (>= net46) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
     System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (>= netstandard2.0)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< win8)) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net461) (&& (< netstandard1.0) (>= win8)) (&& (< netstandard2.0) (>= wpa81)) (>= wp8)
-    System.Threading.Tasks.Parallel (4.3) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Collections.Concurrent (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
-      System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Diagnostics.Tracing (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
-      System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
-    System.Threading.Thread (4.3) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Threading.ThreadPool (4.3) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
-      System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-      System.Runtime.Handles (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Threading.Timer (4.3) - restriction: || (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
+    System.Threading.Timer (4.3) - restriction: || (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -1172,8 +1107,8 @@ NUGET
       FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
     Fable.Mocha (2.10)
       Fable.Core (>= 3.0) - restriction: >= netstandard2.0
-      FSharp.Core (>= 4.6.2) - restriction: >= netstandard2.0
-    FSharp.Core (4.6.2) - restriction: || (>= net461) (>= netstandard2.0)
+      FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
+    FSharp.Core (4.7)
     Hopac (0.4.1) - restriction: || (>= net461) (>= netstandard2.0)
       FSharp.Core (>= 4.5 < 5.0) - restriction: >= netstandard2.0
     Mono.Cecil (0.11.2) - restriction: || (>= net461) (>= netstandard2.0)
diff --git a/src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj b/src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj
index 571ec65a..03f6f26a 100644
--- a/src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj
+++ b/src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj
@@ -27,6 +27,8 @@
     <Compile Include="ValidationCE.fs" />
     <Compile Include="Option.fs" />
     <Compile Include="OptionCE.fs" />
+    <Compile Include="ValueOption.fs" />
+    <Compile Include="ValueOptionCE.fs" />
     <Compile Include="AsyncOption.fs" />
     <Compile Include="AsyncOptionCE.fs" />
     <Compile Include="AsyncOptionOp.fs" />
diff --git a/src/FsToolkit.ErrorHandling/Option.fs b/src/FsToolkit.ErrorHandling/Option.fs
index 186c9577..4ff14866 100644
--- a/src/FsToolkit.ErrorHandling/Option.fs
+++ b/src/FsToolkit.ErrorHandling/Option.fs
@@ -3,6 +3,16 @@ namespace FsToolkit.ErrorHandling
 [<RequireQualifiedAccess>]
 module Option =
 
+    let ofValueOption (vopt: _ voption) =
+        match vopt with
+        | ValueSome v -> Some v
+        | ValueNone -> None
+
+    let toValueOption (opt: _ option) =
+        match opt with
+        | Some v -> ValueSome v
+        | None -> ValueNone
+
     let traverseResult f opt =
         match opt with
         | None -> Ok None
@@ -30,11 +40,12 @@ module Option =
     /// <param name="option1">The input option</param>
     /// <param name="option2">The input option</param>
     /// <returns></returns>
-    let zip (option1: option<'a>) (option2: option<'b>) =
+    let zip (option1: 'a option) (option2: 'b option) =
         match option1, option2 with
         | Some v1, Some v2 -> Some(v1, v2)
         | _ -> None
 
+
     let ofResult =
         function
         | Ok v -> Some v
diff --git a/src/FsToolkit.ErrorHandling/OptionCE.fs b/src/FsToolkit.ErrorHandling/OptionCE.fs
index 942e9564..63eb3ed1 100644
--- a/src/FsToolkit.ErrorHandling/OptionCE.fs
+++ b/src/FsToolkit.ErrorHandling/OptionCE.fs
@@ -67,8 +67,12 @@ module OptionCE =
         member inline _.Source(result: _ option) : _ option = result
 
 
-    let option = OptionBuilder()
+        // /// <summary>
+        // /// Method lets us transform data types into our internal representation.
+        // /// </summary>
+        member inline _.Source(vopt: ValueOption<_>) : Option<_> = vopt |> Option.ofValueOption
 
+    let option = OptionBuilder()
 
 [<AutoOpen>]
 // Having members as extensions gives them lower priority in
@@ -102,7 +106,6 @@ module OptionExtensions =
         /// </summary>
         member inline _.Source(s: #seq<_>) = s
 
-
         // /// <summary>
         // /// Method lets us transform data types into our internal representation.
         // /// </summary>
diff --git a/src/FsToolkit.ErrorHandling/ValueOption.fs b/src/FsToolkit.ErrorHandling/ValueOption.fs
new file mode 100644
index 00000000..ed1a63cd
--- /dev/null
+++ b/src/FsToolkit.ErrorHandling/ValueOption.fs
@@ -0,0 +1,53 @@
+namespace FsToolkit.ErrorHandling
+
+#if !FABLE_COMPILER
+[<RequireQualifiedAccess>]
+module ValueOption =
+
+    let ofOption (opt: 'a option) =
+        match opt with
+        | Some v -> ValueSome v
+        | None -> ValueNone
+
+    let toOption (vopt: 'a voption) =
+        match vopt with
+        | ValueSome v -> Some v
+        | ValueNone -> None
+
+    let traverseResult f vopt =
+        match vopt with
+        | ValueNone -> Ok ValueNone
+        | ValueSome v -> f v |> Result.map ValueSome
+
+    let sequenceResult opt = traverseResult id opt
+
+    let inline tryParse< ^T when ^T: (static member TryParse : string * byref< ^T > -> bool) and ^T: (new : unit -> ^T)>
+        valueToParse
+        =
+        let mutable output = new ^T()
+
+        let parsed =
+            (^T: (static member TryParse : string * byref< ^T > -> bool) (valueToParse, &output))
+
+        match parsed with
+        | true -> ValueSome output
+        | _ -> ValueNone
+
+    /// <summary>
+    /// Takes two voptions and returns a tuple of the pair or none if either are none
+    /// </summary>
+    /// <param name="voption1">The input option</param>
+    /// <param name="voption2">The input option</param>
+    /// <returns></returns>
+    let zip (voption1: 'a voption) (voption2: 'b voption) =
+        match voption1, voption2 with
+        | ValueSome v1, ValueSome v2 -> ValueSome(v1, v2)
+        | _ -> ValueNone
+
+
+    let ofResult =
+        function
+        | Ok v -> ValueSome v
+        | Error _ -> ValueNone
+
+#endif
diff --git a/src/FsToolkit.ErrorHandling/ValueOptionCE.fs b/src/FsToolkit.ErrorHandling/ValueOptionCE.fs
new file mode 100644
index 00000000..41cae503
--- /dev/null
+++ b/src/FsToolkit.ErrorHandling/ValueOptionCE.fs
@@ -0,0 +1,118 @@
+namespace FsToolkit.ErrorHandling
+
+
+#if !FABLE_COMPILER
+[<AutoOpen>]
+module ValueOptionCE =
+    open System
+
+    type ValueOptionBuilder() =
+        member inline _.Return(x) = ValueSome x
+
+        member inline _.ReturnFrom(m: 'T voption) = m
+
+        member inline _.Bind(m: 'a voption, f: 'a -> 'b voption) = ValueOption.bind f m
+
+        // Could not get it to work solely with Source. In loop cases it would potentially match the #seq overload and ask for type annotation
+        member this.Bind(m: 'a when 'a: null, f: 'a -> 'b voption) = this.Bind(m |> ValueOption.ofObj, f)
+
+        member inline this.Zero() = this.Return()
+
+        member inline _.Combine(m, f) = ValueOption.bind f m
+        member inline this.Combine(m1: _ voption, m2: _ voption) = this.Bind(m1, (fun () -> m2))
+
+        member inline _.Delay(f: unit -> _) = f
+
+        member inline _.Run(f) = f ()
+
+        member inline this.TryWith(m, h) =
+            try
+                this.Run m
+            with
+            | e -> h e
+
+        member inline this.TryFinally(m, compensation) =
+            try
+                this.Run m
+            finally
+                compensation ()
+
+        member inline this.Using(resource: 'T :> IDisposable, binder) : _ voption =
+            this.TryFinally(
+                (fun () -> binder resource),
+                (fun () ->
+                    if not <| obj.ReferenceEquals(resource, null) then
+                        resource.Dispose())
+            )
+
+        member this.While(guard: unit -> bool, generator: unit -> _ voption) : _ voption =
+            if not <| guard () then
+                this.Zero()
+            else
+                this.Bind(this.Run generator, (fun () -> this.While(guard, generator)))
+
+        member inline this.For(sequence: #seq<'T>, binder: 'T -> _ voption) : _ voption =
+            this.Using(
+                sequence.GetEnumerator(),
+                fun enum -> this.While(enum.MoveNext, this.Delay(fun () -> binder enum.Current))
+            )
+
+        member inline _.BindReturn(x, f) = ValueOption.map f x
+
+        member inline _.BindReturn(x, f) =
+            x |> ValueOption.ofObj |> ValueOption.map f
+
+        member inline _.MergeSources(option1, option2) = ValueOption.zip option1 option2
+
+        /// <summary>
+        /// Method lets us transform data types into our internal representation.  This is the identity method to recognize the self type.
+        ///
+        /// See https://stackoverflow.com/questions/35286541/why-would-you-use-builder-source-in-a-custom-computation-expression-builder
+        /// </summary>
+        member inline _.Source(result: _ voption) : _ voption = result
+
+
+        // /// <summary>
+        // /// Method lets us transform data types into our internal representation.
+        // /// </summary>
+        member inline _.Source(vopt: _ option) : _ voption = vopt |> ValueOption.ofOption
+
+    let voption = ValueOptionBuilder()
+
+[<AutoOpen>]
+// Having members as extensions gives them lower priority in
+// overload resolution and allows skipping more type annotations.
+module ValueOptionExtensionsLower =
+    type ValueOptionBuilder with
+        member inline _.Source(nullableObj: 'a when 'a: null) = nullableObj |> ValueOption.ofObj
+        member inline _.Source(m: string) = m |> ValueOption.ofObj
+
+        member inline _.MergeSources(nullableObj1, option2) =
+            ValueOption.zip (ValueOption.ofObj nullableObj1) option2
+
+
+        member inline _.MergeSources(option1, nullableObj2) =
+            ValueOption.zip (option1) (ValueOption.ofObj nullableObj2)
+
+
+        member inline _.MergeSources(nullableObj1, nullableObj2) =
+            ValueOption.zip (ValueOption.ofObj nullableObj1) (ValueOption.ofObj nullableObj2)
+
+[<AutoOpen>]
+// Having members as extensions gives them lower priority in
+// overload resolution and allows skipping more type annotations.
+// The later declared, the higher than previous extension methods, this is magic
+module ValueOptionExtensions =
+    open System
+
+    type ValueOptionBuilder with
+        /// <summary>
+        /// Needed to allow `for..in` and `for..do` functionality
+        /// </summary>
+        member inline _.Source(s: #seq<_>) = s
+
+        // /// <summary>
+        // /// Method lets us transform data types into our internal representation.
+        // /// </summary>
+        member inline _.Source(nullable: Nullable<'a>) : 'a voption = nullable |> ValueOption.ofNullable
+#endif
diff --git a/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj b/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj
index b3b4e691..d8f7aa5e 100644
--- a/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj
+++ b/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj
@@ -20,6 +20,8 @@
     <Compile Include="ResultOption.fs" />
     <Compile Include="Option.fs" />
     <Compile Include="OptionCE.fs" />
+    <Compile Include="ValueOption.fs" />
+    <Compile Include="ValueOptionCE.fs" />
     <Compile Include="AsyncOption.fs" />
     <Compile Include="AsyncOptionCE.fs" />
     <Compile Include="List.fs" />
diff --git a/tests/FsToolkit.ErrorHandling.Tests/Main.fs b/tests/FsToolkit.ErrorHandling.Tests/Main.fs
index 15192d02..b401579a 100644
--- a/tests/FsToolkit.ErrorHandling.Tests/Main.fs
+++ b/tests/FsToolkit.ErrorHandling.Tests/Main.fs
@@ -14,6 +14,10 @@ let allTests =
           ResultOptionTests.allTests
           OptionTests.allTests
           OptionCETests.allTests
+#if !FABLE_COMPILER
+          ValueOptionTests.allTests
+          ValueOptionCETests.allTests
+#endif
           AsyncOptionTests.allTests
           AsyncOptionCETests.allTests
           ListTests.allTests
diff --git a/tests/FsToolkit.ErrorHandling.Tests/OptionCE.fs b/tests/FsToolkit.ErrorHandling.Tests/OptionCE.fs
index 531b0342..1d8d480f 100644
--- a/tests/FsToolkit.ErrorHandling.Tests/OptionCE.fs
+++ b/tests/FsToolkit.ErrorHandling.Tests/OptionCE.fs
@@ -78,7 +78,7 @@ let ceTests =
                       try
                           return data
                       with
-                      | e -> return! raise e
+                      | e -> return raise e
                   }
 
               Expect.equal actual (Some data) "Try with failed"
@@ -442,7 +442,29 @@ let ``OptionCE applicative tests`` =
                       return a + b - c
                   }
 
-              Expect.equal actual None "Should be None" ]
+              Expect.equal actual None "Should be None"
+
+          testCase "ValueOption.Some"
+          <| fun () ->
+              let actual =
+                  option {
+                      let! a = ValueSome 3
+                      return a
+                  }
+
+              Expect.equal actual (Some 3) "Should be None"
+
+          testCase "ValueOption.None"
+          <| fun () ->
+              let actual =
+                  option {
+                      let! a = ValueNone
+                      return a
+                  }
+
+              Expect.equal actual (None) "Should be None" ]
+
+
 
 let allTests =
     testList
diff --git a/tests/FsToolkit.ErrorHandling.Tests/ValueOption.fs b/tests/FsToolkit.ErrorHandling.Tests/ValueOption.fs
new file mode 100644
index 00000000..f30259f2
--- /dev/null
+++ b/tests/FsToolkit.ErrorHandling.Tests/ValueOption.fs
@@ -0,0 +1,77 @@
+module ValueOptionTests
+
+#if !FABLE_COMPILER
+open System
+open Expecto
+open SampleDomain
+open TestData
+open TestHelpers
+open FsToolkit.ErrorHandling
+
+
+let traverseResultTests =
+    testList
+        "ValueOption.traverseResult Tests"
+        [ testCase "traverseResult with ValueSome of valid data"
+          <| fun _ ->
+              let (latitude, longitude) = (ValueSome lat), (ValueSome lng)
+
+              latitude
+              |> ValueOption.traverseResult Latitude.TryCreate
+              |> Expect.hasOkValue (ValueSome validLat)
+
+              longitude
+              |> ValueOption.traverseResult Longitude.TryCreate
+              |> Expect.hasOkValue (ValueSome validLng) ]
+
+
+let tryParseTests =
+    testList
+        "ValueOption.tryParse"
+        [ testCase "Can Parse int"
+          <| fun _ ->
+              let expected = 3
+
+              let actual =
+                  ValueOption.tryParse<int> (string expected)
+
+              Expect.equal actual (ValueSome expected) "Should be parsed"
+
+          testCase "Can Parse double"
+          <| fun _ ->
+              let expected: float = 3.0
+
+              let actual =
+                  ValueOption.tryParse<float> (string expected)
+
+              Expect.equal actual (ValueSome expected) "Should be parsed"
+
+          testCase "Can Parse Guid"
+          <| fun _ ->
+              let expectedGuid = Guid.NewGuid()
+
+              let parsedValue =
+                  ValueOption.tryParse<Guid> (string expectedGuid)
+
+              Expect.equal parsedValue (ValueSome expectedGuid) "Should be same guid"
+
+          ]
+
+
+let ofResultTests =
+    testList
+        "ValueOption.ofResult Tests"
+        [ testCase "ofResult simple cases"
+          <| fun _ ->
+              Expect.equal (ValueOption.ofResult (Ok 123)) (ValueSome 123) "Ok int"
+              Expect.equal (ValueOption.ofResult (Ok "abc")) (ValueSome "abc") "Ok string"
+              Expect.equal (ValueOption.ofResult (Error "x")) ValueNone "Error _" ]
+
+
+let allTests =
+    testList
+        "ValueOption Tests"
+        [ traverseResultTests
+          tryParseTests
+          ofResultTests ]
+#endif
diff --git a/tests/FsToolkit.ErrorHandling.Tests/ValueOptionCE.fs b/tests/FsToolkit.ErrorHandling.Tests/ValueOptionCE.fs
new file mode 100644
index 00000000..9d614a01
--- /dev/null
+++ b/tests/FsToolkit.ErrorHandling.Tests/ValueOptionCE.fs
@@ -0,0 +1,471 @@
+module ValueOptionCETests
+
+#if !FABLE_COMPILER
+
+open Expecto
+open FsToolkit.ErrorHandling
+open System
+open System.Collections.Generic
+
+let makeDisposable () =
+    { new System.IDisposable with
+        member this.Dispose() = () }
+
+
+// type 'a option = | ValueSome of 'a | None
+
+let ceTests =
+    testList
+        "CE Tests"
+        [ testCase "Return value"
+          <| fun _ ->
+              let expected = ValueSome 42
+              let actual = voption { return 42 }
+              Expect.equal actual expected "Should return value wrapped in option"
+          testCase "ReturnFrom ValueSome"
+          <| fun _ ->
+              let expected = ValueSome 42
+              let actual = voption { return! (ValueSome 42) }
+              Expect.equal actual expected "Should return value wrapped in option"
+          testCase "ReturnFrom ValueNone"
+          <| fun _ ->
+              let expected = ValueNone
+              let actual = voption { return! ValueNone }
+              Expect.equal actual expected "Should return value wrapped in option"
+          testCase "Bind ValueSome"
+          <| fun _ ->
+              let expected = ValueSome 42
+
+              let actual =
+                  voption {
+                      let! value = ValueSome 42
+                      return value
+                  }
+
+              Expect.equal actual expected "Should bind value wrapped in option"
+          testCase "Bind ValueNone"
+          <| fun _ ->
+              let expected = ValueNone
+
+              let actual =
+                  voption {
+                      let! value = ValueNone
+                      return value
+                  }
+
+              Expect.equal actual expected "Should bind value wrapped in option"
+          testCase "Zero/Combine/Delay/Run"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      let result = data
+                      if true then ()
+                      return result
+                  }
+
+              Expect.equal actual (ValueSome data) "Should be ok"
+          testCase "Try With"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      try
+                          return data
+                      with
+                      | e -> return raise e
+                  }
+
+              Expect.equal actual (ValueSome data) "Try with failed"
+          testCase "Try Finally"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      try
+                          return data
+                      finally
+                          ()
+                  }
+
+              Expect.equal actual (ValueSome data) "Try with failed"
+          testCase "Using null"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      use d = null
+                      return data
+                  }
+
+              Expect.equal actual (ValueSome data) "Should be ok"
+          testCase "Using disposeable"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      use d = makeDisposable ()
+                      return data
+                  }
+
+              Expect.equal actual (ValueSome data) "Should be ok"
+          testCase "Using bind disposeable"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      use! d = (makeDisposable () |> Some)
+                      return data
+                  }
+
+              Expect.equal actual (ValueSome data) "Should be ok"
+          testCase "While"
+          <| fun () ->
+              let data = 42
+              let mutable index = 0
+
+              let actual =
+                  voption {
+                      while index < 10 do
+                          index <- index + 1
+
+                      return data
+                  }
+
+              Expect.equal actual (ValueSome data) "Should be ok"
+          testCase "For in"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      for i in [ 1 .. 10 ] do
+                          ()
+
+                      return data
+                  }
+
+              Expect.equal actual (ValueSome data) "Should be ok"
+          testCase "For in ResizeArray"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      for i in ResizeArray [ 1 .. 10 ] do
+                          ()
+
+                      return data
+                  }
+
+              Expect.equal actual (ValueSome data) "Should be ok"
+          testCase "For to"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption {
+                      for i = 1 to 10 do
+                          ()
+
+                      return data
+                  }
+
+              Expect.equal actual (ValueSome data) "Should be ok"
+          testCase "Nullable value"
+          <| fun () ->
+              let data = 42
+
+              let actual =
+                  voption { return! System.Nullable<int> data }
+
+              Expect.equal actual (ValueSome data) ""
+          testCase "Nullable null"
+          <| fun () ->
+              let actual = voption { return! System.Nullable<_>() }
+              Expect.equal actual ValueNone ""
+
+          testCase "string value"
+          <| fun () ->
+              let data = "hello"
+
+              let actual =
+                  voption {
+                      let! v = data
+                      return v
+                  }
+
+              Expect.equal actual (ValueSome data) ""
+
+          testCase "string null"
+          <| fun () ->
+              let (data: string) = null
+
+              let actual =
+                  voption {
+                      let! v = data
+                      return v
+                  }
+
+              Expect.equal actual ValueNone ""
+
+          testCase "Uri null"
+          <| fun () ->
+              let (data: Uri) = null
+
+              let actual =
+                  voption {
+                      let! v = data
+                      return v
+                  }
+
+              Expect.equal actual ValueNone ""
+
+          testCase "MemoryStream null"
+          <| fun () ->
+              let (data: IO.MemoryStream) = null
+
+              let actual =
+                  voption {
+                      let! v = data
+                      return v
+                  }
+
+              Expect.equal actual ValueNone ""
+
+          testCase "ResizeArray null"
+          <| fun () ->
+              let (data: ResizeArray<string>) = null
+
+              let actual =
+                  voption {
+                      let! v = data
+                      return v
+                  }
+
+              Expect.equal actual ValueNone "" ]
+
+[<AllowNullLiteral>]
+type CustomClass(x: int) =
+
+    member _.getX = x
+
+
+let ``ValueOptionCE applicative tests`` =
+    testList
+        "ValueOptionCE applicative tests"
+        [ testCase "Happy Path ValueOption.ValueSome"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = ValueSome 3
+                      and! b = ValueSome 2
+                      and! c = ValueSome 1
+                      return a + b - c
+                  }
+
+              Expect.equal actual (ValueSome 4) "Should be ValueSome 4"
+
+          testCase "Happy Path Nullable"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = Nullable<_> 3
+                      and! b = Nullable<_> 2
+                      and! c = Nullable<_> 1
+                      return a + b - c
+                  }
+
+              Expect.equal actual (ValueSome 4) "Should be ValueSome 4"
+
+          testCase "Happy Path null Objects"
+          <| fun () ->
+              // let hello = CustomClass
+              let actual =
+                  voption {
+                      let! a = CustomClass 3
+                      and! b = CustomClass 2
+                      and! c = CustomClass 1
+                      return a.getX + b.getX - c.getX
+                  }
+
+              Expect.equal actual (ValueSome 4) "Should be ValueSome 4"
+
+
+          testCase "Happy Path strings"
+          <| fun () ->
+              let hello = "Hello "
+              let world = "world "
+              let fromfsharp = "from F#"
+
+              let actual =
+                  voption {
+                      let! a = hello
+                      and! b = world
+                      and! c = fromfsharp
+                      return a + b + c
+                  }
+
+              Expect.equal actual (ValueSome "Hello world from F#") "Should be Some"
+
+          testCase "Happy Path ResizeArray"
+          <| fun () ->
+              let r1 = ResizeArray [ 3 ]
+              let r2 = ResizeArray [ 2 ]
+              let r3 = ResizeArray [ 1 ]
+
+              let actual =
+                  voption {
+                      let! a = r1
+                      and! b = r2
+                      and! c = r3
+                      a.AddRange b
+                      a.AddRange c
+
+                      return Seq.sum a
+                  }
+
+              Expect.equal actual (ValueSome 6) "Should be Some"
+
+          testCase "Happy Path Option.Some/Nullable"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = ValueSome 3
+                      and! b = Nullable 2
+                      and! c = Nullable 1
+                      return a + b - c
+                  }
+
+              Expect.equal actual (ValueSome 4) "Should be ValueSome 4"
+
+          testCase "Happy Path Option.Some/Nullable/Objects"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = ValueSome 3
+                      and! b = Nullable 2
+                      and! c = CustomClass 1
+                      return a + b - c.getX
+                  }
+
+              Expect.equal actual (ValueSome 4) "Should be ValueSome 4"
+
+
+          testCase "Happy Combo all"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = Nullable<_> 3
+                      and! b = ValueSome 2
+                      and! c = "hello"
+                      and! d = ResizeArray [ 1 ]
+                      and! e = CustomClass 5
+                      and! f = Uri "https://github.com/"
+                      return sprintf "%d %d %s %d %d %s" a b c (Seq.head d) e.getX (string f)
+                  }
+
+              Expect.equal actual (ValueSome "3 2 hello 1 5 https://github.com/") "Should be Some"
+          testCase "Fail Path ValueOption.ValueNone"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = ValueSome 3
+                      and! b = ValueSome 2
+                      and! c = None
+                      return a + b - c
+                  }
+
+              Expect.equal actual ValueNone "Should be None"
+
+          testCase "Fail Path Nullable"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = Nullable 3
+                      and! b = Nullable 2
+                      and! c = Nullable<_>()
+                      return a + b - c
+                  }
+
+              Expect.equal actual (ValueNone) "Should be None"
+
+          testCase "Fail Path Objects"
+          <| fun () ->
+              let c1 = CustomClass 3
+              let c2 = CustomClass 2
+              let c3: CustomClass = null
+
+              let actual =
+                  voption {
+                      let! a = c1
+                      and! b = c2
+                      and! c = c3
+                      return a.getX + b.getX - c.getX
+                  }
+
+              Expect.equal actual (ValueNone) "Should be None"
+
+
+          testCase "Fail Path strings"
+          <| fun () ->
+              let c1 = CustomClass 3
+              let c2 = CustomClass 2
+              let c3: CustomClass = null
+
+              let actual =
+                  voption {
+                      let! a = c1
+                      and! b = c2
+                      and! c = c3
+                      return a.getX + b.getX - c.getX
+                  }
+
+              Expect.equal actual (ValueNone) "Should be None"
+
+          testCase "Fail Path ValueOption.ValueSome/Nullable"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = Nullable<_> 3
+                      and! b = ValueSome 2
+                      and! c = Nullable<_>()
+                      return a + b - c
+                  }
+
+              Expect.equal actual ValueNone "Should be None"
+
+          testCase "ValueOption.ValueSome"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = ValueSome 3
+                      return a
+                  }
+
+              Expect.equal actual (ValueSome 3) "Should be None"
+
+          testCase "ValueOption.ValueNone"
+          <| fun () ->
+              let actual =
+                  voption {
+                      let! a = ValueNone
+                      return a
+                  }
+
+              Expect.equal actual (ValueNone) "Should be None" ]
+
+
+
+let allTests =
+    testList
+        "ValueOption CE tests"
+        [ ceTests
+          ``ValueOptionCE applicative tests`` ]
+#endif
diff --git a/tools/FunctionMap/Program.fs b/tools/FunctionMap/Program.fs
index 582cbd5e..a1b06c08 100644
--- a/tools/FunctionMap/Program.fs
+++ b/tools/FunctionMap/Program.fs
@@ -2,19 +2,32 @@
 open System
 open System.Reflection
 
+type Comparison =
+| Exact 
+| Contains
+
+let inline contains (value) (sequence : ^a)   =
+    let bool = (^a : (member Contains : 'b -> bool) (sequence, value))
+    bool
+
+let inline comparison (value) (comparision, compareValue )  =
+    match comparision with
+    | Exact -> value = compareValue
+    | Contains -> value |> contains compareValue      
 
 let namesToFilter = [
-    "GetType"
-    "ToString"
-    "Equals"
-    "GetHashCode"
+    Exact, "GetType"
+    Exact, "ToString"
+    Exact, "Equals"
+    Exact, "GetHashCode"
+    Contains, "op_"
 ]
 
 let getMethodsByModuleName moduleName (types : Type seq) =
     types 
     |> Seq.filter(fun t -> t.Name = moduleName)
     |> Seq.collect(fun t -> t.GetMethods())
-    |> Seq.filter(fun m -> namesToFilter |> Seq.contains m.Name |> not )
+    |> Seq.filter(fun m -> namesToFilter |> Seq.exists(comparison m.Name) |> not )
 
 
 let report moduleName (methods : MethodInfo seq) = 
@@ -29,34 +42,85 @@ let report moduleName (methods : MethodInfo seq) =
 let normalize (name : string) : string =
     String(Char.ToLower(name.[0]) |> Array.singleton) + name.Substring(1)
 
+type Module = {
+    ReflectionLookupName : string
+    CSVOutputName : string
+}
+    with 
+        static member Create r c = 
+            {
+                ReflectionLookupName = r
+                CSVOutputName = c
+            }
+
+/// List of modules to get info for
+let allModules : list<Module>=
+    [
+        Module.Create "OptionModule" "Option" 
+        Module.Create "Option" "Option" 
+        Module.Create "ValueOption" "ValueOption"
+        Module.Create "Validation"  "Validation"
+        Module.Create "Async" "Async"
+        Module.Create "FSharpAsync" "Async"
+        Module.Create "Job" "Job"
+        Module.Create "ResultModule" "Result" 
+        Module.Create "Result" "Result" 
+        Module.Create "AsyncResult" "AsyncResult"
+        Module.Create "TaskResult"  "TaskResult"
+        Module.Create "JobResult"  "JobResult"
+    ]
+
+let createCsvRow method modules =
+    let outputModules = allModules |> List.map(fun m -> m.CSVOutputName) |> List.distinct
+    let sparseSet = Array.create<string> (outputModules |> List.length) ""
+    for ((moduleName : string), (mInfo : MethodInfo)) in modules do
+        let index = outputModules |> List.findIndex (fun m -> m = moduleName)
+        sparseSet.[index] <- mInfo.DeclaringType.FullName
+    let data = 
+        sparseSet 
+        |> Array.map (fun b ->
+            if b |> contains "FSharp.Core" then "FSharp.Core"
+            elif b |> contains "FsToolkit" then "FsToolkit"
+            elif b |> contains "Hopac" then "Hopac"
+            elif b |> contains "FSharpAsync" then "FSharp.Core"
+            else b
+        ) 
+        |> String.concat ","
+    sprintf "%s,%s" method data
+
+let createCsv headers rows =
+    printfn "%s" headers
+    for row in rows do
+        printfn "%s" row
+
 [<EntryPoint>]
 let main argv =
     let types = [
         yield! Assembly.Load("FSharp.Core").GetTypes()
         yield! Assembly.Load("FsToolkit.ErrorHandling").GetTypes()
         yield! Assembly.Load("FsToolkit.ErrorHandling.TaskResult").GetTypes()
+        yield! Assembly.Load("Hopac").GetTypes()
         yield! Assembly.Load("FsToolkit.ErrorHandling.JobResult").GetTypes()
     ]
     let getMethodsByModuleName name = getMethodsByModuleName name types
     // types |> Seq.iter(fun f -> f.Name |> printfn "%s")
-    [
-        "ResultModule" //Fsharp.Core 
-        "OptionModule" //Fsharp.Core 
-        "Option"
-        "Result" 
-        "Validation" 
-        "Async"
-        "AsyncResult"
-        "TaskResult" 
-        "JobResult" 
-    ]
-    |> Seq.collect(fun name -> getMethodsByModuleName name |> Seq.map(fun m -> name, m))
+
+    let headers = 
+        let methods = "Methods"
+        let tail = allModules |> Seq.map(fun m -> m.CSVOutputName) |> Seq.distinct |> String.concat ","
+        sprintf "%s,%s" methods tail
+
+    allModules
+    |> Seq.collect(fun name -> getMethodsByModuleName name.ReflectionLookupName |> Seq.map(fun m -> name.CSVOutputName, m))
     |> Seq.groupBy(fun (name, method) -> normalize method.Name)
     |> Seq.sortBy(fst)
-    |> Seq.iter(fun (method, group) ->
-        let moduleNames = group |> Seq.map(fst) |> String.concat ","
-        printfn "%s : %s" method moduleNames
+    |> Seq.map(fun (method, group) ->
+        // let moduleNames = group |> Seq.map(fst) |> String.concat ","
+        // printfn "%s : %s" method moduleNames
+        // let modules = group |> Seq.map(fst)
+        createCsvRow method (group)
     )
+    |> createCsv headers
     
 
     0 
\ No newline at end of file
diff --git a/tools/FunctionMap/README.md b/tools/FunctionMap/README.md
new file mode 100644
index 00000000..8d7b70fd
--- /dev/null
+++ b/tools/FunctionMap/README.md
@@ -0,0 +1,177 @@
+# FunctionMap
+
+## Table
+
+|Methods                 |Option     |ValueOption|Validation|Async    |Job      |Result     |AsyncResult|TaskResult|JobResult|
+|------------------------|-----------|-----------|----------|---------|---------|-----------|-----------|----------|---------|
+|abort                   |           |           |          |         |Hopac    |           |           |          |         |
+|apply                   |           |           |FsToolkit |FsToolkit|Hopac    |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|apply'                  |           |           |          |         |FsToolkit|           |           |          |         |
+|asBeginEnd              |           |           |          |FSharp.Core|         |           |           |          |         |
+|awaitEvent              |           |           |          |FSharp.Core|         |           |           |          |         |
+|awaitIAsyncResult       |           |           |          |FSharp.Core|         |           |           |          |         |
+|awaitTask               |           |           |          |FSharp.Core|Hopac    |           |           |          |         |
+|awaitUnitTask           |           |           |          |         |Hopac    |           |           |          |         |
+|awaitWaitHandle         |           |           |          |FSharp.Core|         |           |           |          |         |
+|bind                    |FSharp.Core|FSharp.Core|FsToolkit |FsToolkit|Hopac    |FSharp.Core|FsToolkit  |FsToolkit |FsToolkit|
+|bindAsync               |           |           |          |         |Hopac    |           |           |          |         |
+|bindTask                |           |           |          |         |Hopac    |           |           |          |         |
+|bindUnitTask            |           |           |          |         |Hopac    |           |           |          |         |
+|cancelDefaultToken      |           |           |          |FSharp.Core|         |           |           |          |         |
+|catch                   |           |           |          |FSharp.Core|Hopac    |           |FsToolkit  |FsToolkit |FsToolkit|
+|choice                  |           |           |          |FSharp.Core|         |           |           |          |         |
+|conCollect              |           |           |          |         |Hopac    |           |           |          |         |
+|conIgnore               |           |           |          |         |Hopac    |           |           |          |         |
+|contains                |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|count                   |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|defaultError            |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|defaultValue            |FSharp.Core|FSharp.Core|          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|defaultWith             |FSharp.Core|FSharp.Core|          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|delay                   |           |           |          |         |Hopac    |           |           |          |         |
+|delayWith               |           |           |          |         |Hopac    |           |           |          |         |
+|either                  |           |           |          |         |         |FsToolkit  |           |          |         |
+|eitherMap               |           |           |          |         |         |FsToolkit  |           |          |         |
+|error                   |           |           |FsToolkit |         |         |           |           |          |         |
+|exists                  |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|filter                  |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|flatten                 |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|fold                    |FSharp.Core|FSharp.Core|          |         |         |FsToolkit  |           |          |         |
+|foldBack                |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|foldResult              |           |           |          |         |         |           |FsToolkit  |FsToolkit |FsToolkit|
+|forAll                  |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|forDownTo               |           |           |          |         |Hopac    |           |           |          |         |
+|forDownToIgnore         |           |           |          |         |Hopac    |           |           |          |         |
+|forN                    |           |           |          |         |Hopac    |           |           |          |         |
+|forNIgnore              |           |           |          |         |Hopac    |           |           |          |         |
+|forUpTo                 |           |           |          |         |Hopac    |           |           |          |         |
+|forUpToIgnore           |           |           |          |         |Hopac    |           |           |          |         |
+|forever                 |           |           |          |         |Hopac    |           |           |          |         |
+|foreverIgnore           |           |           |          |         |Hopac    |           |           |          |         |
+|foreverServer           |           |           |          |         |Hopac    |           |           |          |         |
+|fromAsync               |           |           |          |         |Hopac    |           |           |          |         |
+|fromBeginEnd            |           |           |          |FSharp.Core|Hopac    |           |           |          |         |
+|fromContinuations       |           |           |          |FSharp.Core|Hopac    |           |           |          |         |
+|fromEndBegin            |           |           |          |         |Hopac    |           |           |          |         |
+|fromTask                |           |           |          |         |Hopac    |           |           |          |FsToolkit|
+|fromUnitTask            |           |           |          |         |Hopac    |           |           |          |FsToolkit|
+|getMain                 |           |           |          |Hopac    |         |           |           |          |         |
+|getValue                |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|get_CancellationToken   |           |           |          |FSharp.Core|         |           |           |          |         |
+|get_DefaultCancellationToken|           |           |          |FSharp.Core|         |           |           |          |         |
+|ignore                  |           |           |          |FSharp.Core|Hopac    |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|ignoreError             |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|isError                 |           |           |          |         |         |FsToolkit  |           |          |         |
+|isNone                  |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|isOk                    |           |           |          |         |         |FsToolkit  |           |          |         |
+|isSome                  |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|iterate                 |FSharp.Core|FSharp.Core|          |         |Hopac    |           |           |          |         |
+|iterateServer           |           |           |          |         |Hopac    |           |           |          |         |
+|join                    |           |           |          |         |Hopac    |           |           |          |         |
+|lift                    |           |           |          |         |Hopac    |           |           |          |         |
+|liftTask                |           |           |          |         |Hopac    |           |           |          |         |
+|liftUnitTask            |           |           |          |         |Hopac    |           |           |          |         |
+|map                     |FSharp.Core|FSharp.Core|FsToolkit |FsToolkit|Hopac    |FSharp.Core|FsToolkit  |FsToolkit |FsToolkit|
+|map2                    |FSharp.Core|FSharp.Core|FsToolkit |FsToolkit|FsToolkit|FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|map3                    |FSharp.Core|FSharp.Core|FsToolkit |FsToolkit|FsToolkit|FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|mapError                |           |           |FsToolkit |         |         |FSharp.Core|FsToolkit  |FsToolkit |FsToolkit|
+|mapErrors               |           |           |FsToolkit |         |         |           |           |          |         |
+|ofAsync                 |           |           |          |         |         |           |FsToolkit  |FsToolkit |FsToolkit|
+|ofChoice                |           |           |FsToolkit |         |         |FsToolkit  |           |          |         |
+|ofJob                   |           |           |          |         |         |           |           |          |FsToolkit|
+|ofJobOn                 |           |           |          |Hopac    |         |           |           |          |         |
+|ofNullable              |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|ofObj                   |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|ofResult                |           |           |FsToolkit |         |         |           |FsToolkit  |FsToolkit |FsToolkit|
+|ofTask                  |           |           |          |         |         |           |FsToolkit  |FsToolkit |         |
+|ofTaskAction            |           |           |          |         |         |           |FsToolkit  |          |         |
+|ofValueOption           |FsToolkit  |           |          |         |         |           |           |          |         |
+|ok                      |           |           |FsToolkit |         |         |           |           |          |         |
+|onCancel                |           |           |          |FSharp.Core|         |           |           |          |         |
+|onThreadPool            |           |           |          |         |Hopac    |           |           |          |         |
+|orElse                  |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|orElseWith              |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|parallel                |           |           |          |FSharp.Core|         |           |           |          |         |
+|paranoid                |           |           |          |         |Hopac    |           |           |          |         |
+|queue                   |           |           |          |         |Hopac    |           |           |          |         |
+|queueIgnore             |           |           |          |         |Hopac    |           |           |          |         |
+|raises                  |           |           |          |         |Hopac    |           |           |          |         |
+|requireEmpty            |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|requireEqual            |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|requireEqualTo          |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|requireFalse            |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|requireHead             |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|requireNone             |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|requireNotEmpty         |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|requireNotNull          |           |           |          |         |         |FsToolkit  |           |          |         |
+|requireSome             |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|requireTrue             |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|result                  |           |           |          |         |Hopac    |           |           |          |         |
+|retn                    |           |           |FsToolkit |         |         |           |FsToolkit  |FsToolkit |FsToolkit|
+|returnError             |           |           |          |         |         |           |FsToolkit  |FsToolkit |FsToolkit|
+|runSynchronously        |           |           |          |FSharp.Core|         |           |           |          |         |
+|seqCollect              |           |           |          |         |Hopac    |           |           |          |         |
+|seqIgnore               |           |           |          |         |Hopac    |           |           |          |         |
+|sequenceAsync           |           |           |          |         |         |FsToolkit  |           |          |         |
+|sequenceJob             |           |           |          |         |         |FsToolkit  |           |          |         |
+|sequenceResult          |FsToolkit  |           |          |         |         |           |           |          |         |
+|sequenceTask            |           |           |          |         |         |FsToolkit  |           |          |         |
+|sequential              |           |           |          |FSharp.Core|         |           |           |          |         |
+|server                  |           |           |          |         |Hopac    |           |           |          |         |
+|setError                |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|setMain                 |           |           |          |Hopac    |         |           |           |          |         |
+|singleton               |           |           |          |FsToolkit|FsToolkit|           |           |          |         |
+|sleep                   |           |           |          |FSharp.Core|         |           |           |          |         |
+|start                   |           |           |          |FSharp.Core|Hopac    |           |           |          |         |
+|startAsTask             |           |           |          |FSharp.Core|         |           |           |          |         |
+|startChild              |           |           |          |FSharp.Core|         |           |           |          |         |
+|startChildAsTask        |           |           |          |FSharp.Core|         |           |           |          |         |
+|startIgnore             |           |           |          |         |Hopac    |           |           |          |         |
+|startImmediate          |           |           |          |FSharp.Core|         |           |           |          |         |
+|startImmediateAsTask    |           |           |          |FSharp.Core|         |           |           |          |         |
+|startWithContinuations  |           |           |          |FSharp.Core|         |           |           |          |         |
+|startWithFinalizer      |           |           |          |         |Hopac    |           |           |          |         |
+|startWithFinalizerIgnore|           |           |          |         |Hopac    |           |           |          |         |
+|switchToContext         |           |           |          |FSharp.Core|         |           |           |          |         |
+|switchToNewThread       |           |           |          |FSharp.Core|         |           |           |          |         |
+|switchToThreadPool      |           |           |          |FSharp.Core|         |           |           |          |         |
+|tee                     |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|teeError                |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|teeErrorIf              |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|teeIf                   |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|thunk                   |           |           |          |         |Hopac    |           |           |          |         |
+|toAlt                   |           |           |          |Hopac    |         |           |           |          |         |
+|toAltOn                 |           |           |          |Hopac    |         |           |           |          |         |
+|toArray                 |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|toAsync                 |           |           |          |         |Hopac    |           |           |          |         |
+|toJob                   |           |           |          |Hopac    |         |           |           |          |         |
+|toJobOn                 |           |           |          |Hopac    |         |           |           |          |         |
+|toList                  |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|toNullable              |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|toObj                   |FSharp.Core|FSharp.Core|          |         |         |           |           |          |         |
+|toValueOption           |FsToolkit  |           |          |         |         |           |           |          |         |
+|traverseResult          |FsToolkit  |           |          |         |         |           |           |          |         |
+|tryCancelled            |           |           |          |FSharp.Core|         |           |           |          |         |
+|tryCreate               |           |           |          |         |         |FsToolkit  |           |          |         |
+|tryFinallyFun           |           |           |          |         |Hopac    |           |           |          |         |
+|tryFinallyFunDelay      |           |           |          |         |Hopac    |           |           |          |         |
+|tryFinallyJob           |           |           |          |         |Hopac    |           |           |          |         |
+|tryFinallyJobDelay      |           |           |          |         |Hopac    |           |           |          |         |
+|tryIn                   |           |           |          |         |Hopac    |           |           |          |         |
+|tryInDelay              |           |           |          |         |Hopac    |           |           |          |         |
+|tryParse                |FsToolkit  |           |          |         |         |           |           |          |         |
+|tryWith                 |           |           |          |         |Hopac    |           |           |          |         |
+|tryWithDelay            |           |           |          |         |Hopac    |           |           |          |         |
+|unit                    |           |           |          |         |Hopac    |           |           |          |         |
+|useIn                   |           |           |          |         |Hopac    |           |           |          |         |
+|using                   |           |           |          |         |Hopac    |           |           |          |         |
+|usingAsync              |           |           |          |         |Hopac    |           |           |          |         |
+|valueOr                 |           |           |          |         |         |FsToolkit  |           |          |         |
+|whenDo                  |           |           |          |         |Hopac    |           |           |          |         |
+|whileDo                 |           |           |          |         |Hopac    |           |           |          |         |
+|whileDoDelay            |           |           |          |         |Hopac    |           |           |          |         |
+|whileDoIgnore           |           |           |          |         |Hopac    |           |           |          |         |
+|withError               |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|zip                     |FsToolkit  |           |FsToolkit |FsToolkit|FsToolkit|FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+|zipError                |           |           |          |         |         |FsToolkit  |FsToolkit  |FsToolkit |FsToolkit|
+
+