diff --git a/build.cmd b/build.cmd
old mode 100644
new mode 100755
diff --git a/build/tools/nuget/nuget.exe b/build/tools/nuget/nuget.exe
old mode 100644
new mode 100755
diff --git a/src/Eventful.CsTests/Eventful.CsTests.csproj b/src/Eventful.CsTests/Eventful.CsTests.csproj
index 1e53980..f0ce1a1 100644
--- a/src/Eventful.CsTests/Eventful.CsTests.csproj
+++ b/src/Eventful.CsTests/Eventful.CsTests.csproj
@@ -36,18 +36,29 @@
     <Reference Include="EventStore.ClientAPI">
       <HintPath>..\packages\EventStore.Client.3.0.1\lib\net40\EventStore.ClientAPI.dll</HintPath>
     </Reference>
-    <Reference Include="FSharp.Core, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="FSharpx.Collections, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
+    <Reference Include="FSharp.Control.AsyncSeq, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FSharp.Control.AsyncSeq.2.0.1\lib\net45\FSharp.Control.AsyncSeq.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="FSharpx.Core, Version=1.8.41.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FSharpx.Core.1.8.41\lib\40\FSharpx.Core.dll</HintPath>
+    <Reference Include="FSharp.Core, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FSharp.Core.3.1.2.1\lib\net40\FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharpx.Async, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharpx.Collections, Version=1.10.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FSharpx.Collections.1.10.1\lib\net40\FSharpx.Collections.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharpx.Extras, Version=1.10.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FSharpx.Extras.1.10.2\lib\40\FSharpx.Extras.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Metrics, Version=0.2.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Metrics, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Metrics.NET.0.2.6\lib\net45\Metrics.dll</HintPath>
+      <HintPath>..\..\..\packages\Metrics.NET.0.3.2-pre\lib\net45\Metrics.dll</HintPath>
     </Reference>
     <Reference Include="Serilog">
       <HintPath>..\packages\Serilog.1.5.7\lib\net45\Serilog.dll</HintPath>
diff --git a/src/Eventful.CsTests/app.config b/src/Eventful.CsTests/app.config
index 7523206..3f8fb78 100644
--- a/src/Eventful.CsTests/app.config
+++ b/src/Eventful.CsTests/app.config
@@ -51,7 +51,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/Eventful.CsTests/packages.config b/src/Eventful.CsTests/packages.config
index fecca31..1fd6a60 100644
--- a/src/Eventful.CsTests/packages.config
+++ b/src/Eventful.CsTests/packages.config
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EventStore.Client" version="3.0.1" targetFramework="net45" />
-  <package id="FSharpx.Collections" version="1.9.4" targetFramework="net45" />
-  <package id="FSharpx.Core" version="1.8.41" targetFramework="net45" />
-  <package id="Metrics.NET" version="0.2.6" targetFramework="net45" />
+  <package id="FSharp.Control.AsyncSeq" version="2.0.1" targetFramework="net45" />
+  <package id="Metrics.NET" version="0.3.2-pre" targetFramework="net45" />
+  <package id="FSharp.Core" version="3.1.2.1" targetFramework="net45" />
+  <package id="FSharpx.Async" version="1.12.0" targetFramework="net45" />
+  <package id="FSharpx.Extras" version="1.10.2" targetFramework="net45" />
   <package id="Serilog" version="1.5.7" targetFramework="net45" />
   <package id="xunit" version="1.9.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Eventful.EventStore/Client.fs b/src/Eventful.EventStore/Client.fs
index e991db4..f1897fc 100644
--- a/src/Eventful.EventStore/Client.fs
+++ b/src/Eventful.EventStore/Client.fs
@@ -4,6 +4,7 @@ open FSharp.Control
 open EventStore.ClientAPI
 open System
 open FSharpx
+open FSharpx.Functional
 open Eventful
 
 /// simple F# wrapper around EventStore functions
@@ -86,7 +87,7 @@ type EventStoreClient (connection : IEventStoreConnection) =
 
     member x.getNextPosition () = async {
         let position = Position.End
-        let! (finalSlice : AllEventsSlice) = connection.ReadAllEventsBackwardAsync(position, 1, false, null)
+        let! (finalSlice : AllEventsSlice) = connection.ReadAllEventsBackwardAsync(position, 1, false, null) |> Async.AwaitTask
         let nextPosition = finalSlice.NextPosition
         return nextPosition }
 
diff --git a/src/Eventful.EventStore/EventStoreSystem.fs b/src/Eventful.EventStore/EventStoreSystem.fs
index ae5593b..2cd1cfa 100644
--- a/src/Eventful.EventStore/EventStoreSystem.fs
+++ b/src/Eventful.EventStore/EventStoreSystem.fs
@@ -6,6 +6,7 @@ open EventStore.ClientAPI
 open System
 open FSharpx
 open FSharpx.Collections
+open FSharpx.Functional
 
 type EventStoreSystem<'TCommandContext, 'TEventContext,'TMetadata, 'TBaseEvent when 'TMetadata : equality and 'TEventContext :> System.IDisposable> 
     ( 
diff --git a/src/Eventful.EventStore/EventStreamInterpreter.fs b/src/Eventful.EventStore/EventStreamInterpreter.fs
index ec03e7c..10c3c86 100644
--- a/src/Eventful.EventStore/EventStreamInterpreter.fs
+++ b/src/Eventful.EventStore/EventStreamInterpreter.fs
@@ -34,7 +34,7 @@ module EventStreamInterpreter =
         (readSnapshot : string -> Map<string,Type> -> Async<StateSnapshot>)
         (startContext : ContextStartData)
         (prog : FreeEventStream<obj,'A,'TMetadata>) : Async<'A> = 
-        let rec loop prog (values : Map<EventToken,(byte[]*byte[])>) (writes : Vector<string * int * obj * 'TMetadata>) : Async<'A> =
+        let rec loop prog (values : Map<EventToken,(byte[]*byte[])>) (writes : PersistentVector<string * int * obj * 'TMetadata>) : Async<'A> =
             match prog with
             | FreeEventStream (GetEventStoreTypeToClassMap ((), f)) ->
                 let next = f eventStoreTypeToClassMap
@@ -162,4 +162,4 @@ module EventStreamInterpreter =
                 async {
                     return result
                 }
-        loop prog Map.empty Vector.empty
\ No newline at end of file
+        loop prog Map.empty PersistentVector.empty
\ No newline at end of file
diff --git a/src/Eventful.EventStore/Eventful.EventStore.fsproj b/src/Eventful.EventStore/Eventful.EventStore.fsproj
index c09be27..bb455fd 100644
--- a/src/Eventful.EventStore/Eventful.EventStore.fsproj
+++ b/src/Eventful.EventStore/Eventful.EventStore.fsproj
@@ -78,23 +78,32 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="EventStore.ClientAPI" />
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="FSharp.Control.AsyncSeq">
+      <HintPath>..\packages\FSharp.Control.AsyncSeq.2.0.1\lib\net45\FSharp.Control.AsyncSeq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\packages\FSharp.Core.3.1.2.1\lib\net40\FSharp.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FSharp.Data">
       <HintPath>..\packages\FSharp.Data.2.2.0\lib\net40\FSharp.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="FSharpx.Async">
+      <HintPath>..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharpx.Collections">
-      <HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
+      <HintPath>..\packages\FSharpx.Collections.1.10.1\lib\net40\FSharpx.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FSharpx.Core">
-      <HintPath>..\packages\FSharpx.Core.1.8.41\lib\40\FSharpx.Core.dll</HintPath>
+    <Reference Include="FSharpx.Extras">
+      <HintPath>..\packages\FSharpx.Extras.1.10.2\lib\40\FSharpx.Extras.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Metrics">
-      <HintPath>..\packages\Metrics.NET.0.2.6\lib\net45\Metrics.dll</HintPath>
+      <HintPath>..\..\..\packages\Metrics.NET.0.3.2-pre\lib\net45\Metrics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
diff --git a/src/Eventful.EventStore/MultiTenancyEventStoreSubscriber.fs b/src/Eventful.EventStore/MultiTenancyEventStoreSubscriber.fs
index b080cb4..a7e9800 100644
--- a/src/Eventful.EventStore/MultiTenancyEventStoreSubscriber.fs
+++ b/src/Eventful.EventStore/MultiTenancyEventStoreSubscriber.fs
@@ -3,7 +3,7 @@
 open EventStore.ClientAPI
 open Eventful
 open Metrics
-open FSharp.Control
+open FSharpx.Control
 
 type MultiTenancyEventStoreSubscriber<'TWrappedEvent>
     (
diff --git a/src/Eventful.EventStore/app.config b/src/Eventful.EventStore/app.config
index 63e4732..86ba0af 100644
--- a/src/Eventful.EventStore/app.config
+++ b/src/Eventful.EventStore/app.config
@@ -12,7 +12,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/Eventful.EventStore/packages.config b/src/Eventful.EventStore/packages.config
index df9520b..78f3c36 100644
--- a/src/Eventful.EventStore/packages.config
+++ b/src/Eventful.EventStore/packages.config
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EventStore.Client" version="3.0.1" targetFramework="net45" />
+  <package id="FSharp.Control.AsyncSeq" version="2.0.1" targetFramework="net45" />
+  <package id="FSharp.Core" version="3.1.2.1" targetFramework="net45" />
   <package id="FSharp.Data" version="2.2.0" targetFramework="net45" />
-  <package id="FSharpx.Collections" version="1.9.4" targetFramework="net45" />
-  <package id="FSharpx.Core" version="1.8.41" targetFramework="net45" />
-  <package id="Metrics.NET" version="0.2.6" targetFramework="net45" />
+  <package id="FSharpx.Async" version="1.12.0" targetFramework="net45" />
+  <package id="FSharpx.Collections" version="1.10.1" targetFramework="net45" />
+  <package id="Metrics.NET" version="0.3.2-pre" targetFramework="net45" />
+  <package id="FSharpx.Extras" version="1.10.2" targetFramework="net45" />
   <package id="Serilog" version="1.5.7" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Eventful.Neo4j/Eventful.Neo4j.fsproj b/src/Eventful.Neo4j/Eventful.Neo4j.fsproj
index 7d23176..9490eaa 100644
--- a/src/Eventful.Neo4j/Eventful.Neo4j.fsproj
+++ b/src/Eventful.Neo4j/Eventful.Neo4j.fsproj
@@ -72,28 +72,37 @@
     <Compile Include="Neo4jReadQueue.fs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Control.AsyncSeq">
+      <HintPath>..\..\..\packages\FSharp.Control.AsyncSeq.2.0.1\lib\net45\FSharp.Control.AsyncSeq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\packages\FSharp.Core.3.1.2.1\lib\net40\FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharp.Data">
       <HintPath>..\packages\FSharp.Data.2.2.0\lib\net40\FSharp.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="FSharpx.Async">
+      <HintPath>..\..\..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharpx.Collections">
-      <HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
+      <HintPath>..\..\..\packages\FSharpx.Collections.1.10.1\lib\net40\FSharpx.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FSharpx.Core">
-      <HintPath>..\packages\FSharpx.Core.1.8.41\lib\40\FSharpx.Core.dll</HintPath>
+    <Reference Include="FSharpx.Extras">
+      <HintPath>..\..\..\packages\FSharpx.Extras.1.10.2\lib\40\FSharpx.Extras.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Metrics">
-      <HintPath>..\packages\Metrics.NET.0.2.8\lib\net45\Metrics.dll</HintPath>
+      <HintPath>..\..\..\packages\Metrics.NET.0.3.2-pre\lib\net45\Metrics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog">
@@ -129,11 +138,6 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Eventful.Neo4j/Neo4jOperations.fs b/src/Eventful.Neo4j/Neo4jOperations.fs
index fb7c03d..30c1fed 100644
--- a/src/Eventful.Neo4j/Neo4jOperations.fs
+++ b/src/Eventful.Neo4j/Neo4jOperations.fs
@@ -98,7 +98,7 @@ module Operations =
     // TODO: Use the transaction support http://neo4j.com/docs/stable/rest-api-transactional.html
     //       Neo4jClient doesn't yet support this. CypherNet does, but doesn't support MERGE.
     let chainQ (query : CypherQuery) =
-        { query with Query = query.Query.With("1 as dummy") }
+        { query with Query = query.Query.With("count(*) as dummy") }
 
 
     let graphLabel (query : CypherQuery) =
@@ -361,6 +361,8 @@ module Operations =
 
             loop emptyState)
 
+        agent.Error.Add (fun exn -> log.ErrorWithException <| lazy ("Neo4j transaction batcher failed", exn))
+
         { new ITransactionBatcher with
             member x.Add graphName actions =
                 async {
diff --git a/src/Eventful.Neo4j/app.config b/src/Eventful.Neo4j/app.config
index e3d0b73..6c17b56 100644
--- a/src/Eventful.Neo4j/app.config
+++ b/src/Eventful.Neo4j/app.config
@@ -14,6 +14,10 @@
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/Eventful.Neo4j/packages.config b/src/Eventful.Neo4j/packages.config
index 314a778..d585b97 100644
--- a/src/Eventful.Neo4j/packages.config
+++ b/src/Eventful.Neo4j/packages.config
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="FSharp.Control.AsyncSeq" version="2.0.1" targetFramework="net45" />
+  <package id="FSharp.Core" version="3.1.2.1" targetFramework="net45" />
   <package id="FSharp.Data" version="2.2.0" targetFramework="net45" />
-  <package id="FSharpx.Collections" version="1.9.4" targetFramework="net45" />
-  <package id="FSharpx.Core" version="1.8.41" targetFramework="net45" />
-  <package id="Metrics.NET" version="0.2.8" targetFramework="net45" />
+  <package id="FSharpx.Async" version="1.12.0" targetFramework="net45" />
+  <package id="FSharpx.Collections" version="1.10.1" targetFramework="net45" />
+  <package id="Metrics.NET" version="0.3.2-pre" targetFramework="net45" />
+  <package id="FSharpx.Extras" version="1.10.2" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
   <package id="Serilog" version="1.5.7" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Eventful.RavenDb/AggregateStatePersistence.fs b/src/Eventful.RavenDb/AggregateStatePersistence.fs
index 6837c95..0361817 100644
--- a/src/Eventful.RavenDb/AggregateStatePersistence.fs
+++ b/src/Eventful.RavenDb/AggregateStatePersistence.fs
@@ -2,6 +2,7 @@
 
 open System
 open FSharpx
+open FSharpx.Functional
 open FSharpx.Option
 open Raven.Json.Linq
 open Eventful
@@ -173,7 +174,7 @@ module AggregateStatePersistence =
                 |> Seq.toList
                 |> function
                     | [aggregateType] -> aggregateType
-                    | x -> failwith <| sprintf "Got messages for mixed aggreate type. Stream: %s, AggregateTypes: %A" streamId x
+                    | x -> failwith <| sprintf "Got messages for mixed aggregate type. Stream: %s, AggregateTypes: %A" streamId x
 
             match handlers.AggregateTypes |> Map.tryFind aggregateType with
             | Some aggregateConfig -> 
diff --git a/src/Eventful.RavenDb/Eventful.RavenDb.fsproj b/src/Eventful.RavenDb/Eventful.RavenDb.fsproj
index 0d979ee..09d75d1 100644
--- a/src/Eventful.RavenDb/Eventful.RavenDb.fsproj
+++ b/src/Eventful.RavenDb/Eventful.RavenDb.fsproj
@@ -82,16 +82,28 @@
       <HintPath>..\packages\FSharp.Collections.ParallelSeq.1.0.2\lib\net40\FSharp.Collections.ParallelSeq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="FSharp.Control.AsyncSeq">
+      <HintPath>..\..\..\packages\FSharp.Control.AsyncSeq.2.0.1\lib\net45\FSharp.Control.AsyncSeq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\packages\FSharp.Core.3.1.2.1\lib\net40\FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharpx.Async">
+      <HintPath>..\..\..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharpx.Collections">
-      <HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
+      <HintPath>..\..\..\packages\FSharpx.Collections.1.10.1\lib\net40\FSharpx.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FSharpx.Core">
-      <HintPath>..\packages\FSharpx.Core.1.8.41\lib\40\FSharpx.Core.dll</HintPath>
+    <Reference Include="FSharpx.Extras">
+      <HintPath>..\..\..\packages\FSharpx.Extras.1.10.2\lib\40\FSharpx.Extras.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Metrics">
-      <HintPath>..\packages\Metrics.NET.0.2.6\lib\net45\Metrics.dll</HintPath>
+      <HintPath>..\..\..\packages\Metrics.NET.0.3.2-pre\lib\net45\Metrics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
@@ -114,9 +126,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Caching" />
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Eventful\Eventful.fsproj">
diff --git a/src/Eventful.RavenDb/WakeupMonitor.fs b/src/Eventful.RavenDb/WakeupMonitor.fs
index df5abd1..9d13c30 100644
--- a/src/Eventful.RavenDb/WakeupMonitor.fs
+++ b/src/Eventful.RavenDb/WakeupMonitor.fs
@@ -70,7 +70,14 @@ type WakeupMonitor
 
                 do! 
                     getWakeups (DateTime.UtcNow |> UtcDateTime.fromDateTime)
-                    |> AsyncSeq.iter (fun (streamId, aggregateType, wakeupTime) -> onStreamWakeup streamId aggregateType wakeupTime)
+                    |> AsyncSeq.iter (
+                        fun (streamId, aggregateType, wakeupTime) -> 
+                            try
+                                onStreamWakeup streamId aggregateType wakeupTime
+                            with
+                            | ex ->
+                                log.WarnWithException(lazy (sprintf "Error onStreamWakeup with streamId %s" streamId, ex))
+                    )
                 return! loop ()
             }
                 
diff --git a/src/Eventful.RavenDb/app.config b/src/Eventful.RavenDb/app.config
index cba1092..a7ffcf1 100644
--- a/src/Eventful.RavenDb/app.config
+++ b/src/Eventful.RavenDb/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/Eventful.RavenDb/packages.config b/src/Eventful.RavenDb/packages.config
index df30e6b..fa54b28 100644
--- a/src/Eventful.RavenDb/packages.config
+++ b/src/Eventful.RavenDb/packages.config
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FSharp.Collections.ParallelSeq" version="1.0.2" targetFramework="net45" />
-  <package id="FSharpx.Collections" version="1.9.4" targetFramework="net45" />
-  <package id="FSharpx.Core" version="1.8.41" targetFramework="net45" />
-  <package id="Metrics.NET" version="0.2.6" targetFramework="net45" />
+  <package id="FSharp.Control.AsyncSeq" version="2.0.1" targetFramework="net45" />
+  <package id="FSharp.Core" version="3.1.2.1" targetFramework="net45" />
+  <package id="Metrics.NET" version="0.3.2-pre" targetFramework="net45" />
+  <package id="FSharpx.Async" version="1.12.0" targetFramework="net45" />
+  <package id="FSharpx.Collections" version="1.10.1" targetFramework="net45" />
+  <package id="FSharpx.Extras" version="1.10.2" targetFramework="net45" />
   <package id="RavenDB.Client" version="2.5.2935" targetFramework="net45" />
   <package id="Serilog" version="1.5.7" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Eventful.Testing/Eventful.Testing.fsproj b/src/Eventful.Testing/Eventful.Testing.fsproj
index 7cb96fb..b88016a 100644
--- a/src/Eventful.Testing/Eventful.Testing.fsproj
+++ b/src/Eventful.Testing/Eventful.Testing.fsproj
@@ -79,18 +79,27 @@
       <HintPath>..\packages\FsCheck.Xunit.1.0.1\lib\net45\FsCheck.Xunit.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FSharpx.Collections">
-      <HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
+    <Reference Include="FSharp.Control.AsyncSeq">
+      <HintPath>..\..\..\packages\FSharp.Control.AsyncSeq.2.0.1\lib\net45\FSharp.Control.AsyncSeq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FSharpx.Core">
-      <HintPath>..\packages\FSharpx.Core.1.8.41\lib\40\FSharpx.Core.dll</HintPath>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\packages\FSharp.Core.3.1.2.1\lib\net40\FSharp.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="FSharpx.Async">
+      <HintPath>..\..\..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharpx.Collections">
+      <HintPath>..\..\..\packages\FSharpx.Collections.1.10.1\lib\net40\FSharpx.Collections.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharpx.Extras">
+      <HintPath>..\..\..\packages\FSharpx.Extras.1.10.2\lib\40\FSharpx.Extras.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="mscorlib" />
     <Reference Include="Serilog">
       <HintPath>..\packages\Serilog.1.5.7\lib\net45\Serilog.dll</HintPath>
     </Reference>
diff --git a/src/Eventful.Testing/TestEventStore.fs b/src/Eventful.Testing/TestEventStore.fs
index 5495640..72f6155 100644
--- a/src/Eventful.Testing/TestEventStore.fs
+++ b/src/Eventful.Testing/TestEventStore.fs
@@ -1,6 +1,7 @@
 namespace Eventful.Testing
 
 open FSharpx.Collections
+open FSharpx.Functional
 open FSharpx.Option
 open FSharpx
 open Eventful
@@ -15,8 +16,8 @@ type WakeupRecord = {
 
 type TestEventStore<'TMetadata when 'TMetadata : equality> = {
     Position : EventPosition
-    Events : Map<string,Vector<EventPosition * EventStreamEvent<'TMetadata>>>
-    StreamMetadata : Map<string,Vector<EventStreamMetadata>>
+    Events : Map<string,PersistentVector<EventPosition * EventStreamEvent<'TMetadata>>>
+    StreamMetadata : Map<string,PersistentVector<EventStreamMetadata>>
     PendingEvents : Queue<(int * PersistedStreamEntry<'TMetadata>)>
     AggregateStateSnapShots : Map<string, StateSnapshot>
     WakeupQueue : IPriorityQueue<WakeupRecord>
@@ -44,10 +45,10 @@ module TestEventStore =
     let getStreamMetadata streamId (store : TestEventStore<'TMetadata>) =
         store.StreamMetadata
         |> Map.tryFind streamId
-        |> Option.bind Vector.tryLast
+        |> Option.bind PersistentVector.tryLast
         |> Option.getOrElse EventStreamMetadata.Default
 
-    let getMinimumEventNumber (streamMetadata : EventStreamMetadata) (stream : Vector<'a>) =
+    let getMinimumEventNumber (streamMetadata : EventStreamMetadata) (stream : PersistentVector<'a>) =
         match streamMetadata.MaxCount with
         | Some maxCount when stream.Length > maxCount -> stream.Length - maxCount
         | _ -> 0
@@ -56,8 +57,8 @@ module TestEventStore =
         let streamEvents = 
             store.Events 
             |> Map.tryFind streamId
-            |> FSharpx.Option.getOrElse Vector.empty
-            |> Vector.map snd
+            |> FSharpx.Option.getOrElse PersistentVector.empty
+            |> PersistentVector.map snd
             
         streamEvents.Length - 1
 
@@ -67,15 +68,15 @@ module TestEventStore =
         let fullStream =
             store.Events
             |> Map.tryFind streamId
-            |> Option.getOrElse Vector.empty
-            |> Vector.map snd
+            |> Option.getOrElse PersistentVector.empty
+            |> PersistentVector.map snd
 
         let minimumEventNumber = getMinimumEventNumber streamMetadata fullStream
 
         if minimumEventNumber = 0 then
             fullStream
         else
-            fullStream |> Seq.skip minimumEventNumber |> Vector.ofSeq
+            fullStream |> Seq.skip minimumEventNumber |> PersistentVector.ofSeq
 
     let tryGetEventAtOrAfter streamId startEventNumber (store : TestEventStore<'TMetadata>) =
         maybe {
@@ -85,7 +86,7 @@ module TestEventStore =
             let minimumEventNumber = getMinimumEventNumber streamMetadata stream
             let eventNumberToGet = Math.Max (minimumEventNumber, startEventNumber)
 
-            let! (_, entry) = stream |> Vector.tryNth eventNumberToGet
+            let! (_, entry) = stream |> PersistentVector.tryNth eventNumberToGet
             return (entry, eventNumberToGet)
         }
 
@@ -98,13 +99,13 @@ module TestEventStore =
         let streamEvents = 
             match store.Events |> Map.tryFind stream with
             | Some events -> events
-            | None -> Vector.empty
+            | None -> PersistentVector.empty
 
         let eventId = Guid.NewGuid()
 
         let eventPosition = nextPosition store.Position
         let eventNumber = streamEvents.Length
-        let streamEvents' = streamEvents |> Vector.conj (eventPosition, streamEvent)
+        let streamEvents' = streamEvents |> PersistentVector.conj (eventPosition, streamEvent)
 
         let persistedStreamEntry = 
             match streamEvent with
@@ -143,8 +144,8 @@ module TestEventStore =
         let metadataStream = 
             store.StreamMetadata
             |> Map.tryFind streamId
-            |> Option.getOrElse Vector.empty
-            |> Vector.conj streamMetadata
+            |> Option.getOrElse PersistentVector.empty
+            |> PersistentVector.conj streamMetadata
 
         { store with StreamMetadata = store.StreamMetadata |> Map.add streamId metadataStream }
 
diff --git a/src/Eventful.Testing/TestInterpreter.fs b/src/Eventful.Testing/TestInterpreter.fs
index bb22a46..b21784d 100644
--- a/src/Eventful.Testing/TestInterpreter.fs
+++ b/src/Eventful.Testing/TestInterpreter.fs
@@ -17,7 +17,7 @@ module TestInterpreter =
         (eventStoreTypeToClassMap : EventStoreTypeToClassMap)
         (classToEventStoreTypeMap : ClassToEventStoreTypeMap)
         (values : Map<EventToken,(obj * 'TMetadata)>) 
-        (writes : Vector<string * int * EventStreamEvent<'TMetadata>>)
+        (writes : PersistentVector<string * int * EventStreamEvent<'TMetadata>>)
         : (TestEventStore<'TMetadata> * 'T)= 
         match prog with
         | FreeEventStream (GetEventStoreTypeToClassMap ((), f)) ->
@@ -86,7 +86,7 @@ module TestInterpreter =
                 
             if expectedValueCorrect then
                 let eventStore' = 
-                    events |> Vector.ofSeq |> Vector.fold (fun s e -> s |> TestEventStore.addEvent stream e) eventStore
+                    events |> PersistentVector.ofSeq |> PersistentVector.fold (fun s e -> s |> TestEventStore.addEvent stream e) eventStore
 
                 interpret (next (WriteSuccess eventStore'.Position)) eventStore' useSnapshots eventStoreTypeToClassMap classToEventStoreTypeMap values writes
             else
diff --git a/src/Eventful.Testing/TestSystem.fs b/src/Eventful.Testing/TestSystem.fs
index e7658e1..4c4e4cf 100644
--- a/src/Eventful.Testing/TestSystem.fs
+++ b/src/Eventful.Testing/TestSystem.fs
@@ -30,7 +30,7 @@ type TestSystem<'TMetadata, 'TCommandContext, 'TEventContext, 'TBaseEvent when '
             state.Handlers.EventStoreTypeToClassMap 
             state.Handlers.ClassToEventStoreTypeMap
             Map.empty 
-            Vector.empty
+            PersistentVector.empty
 
     let interpreter = {
         new IInterpreter<'TMetadata> with
@@ -108,7 +108,7 @@ type TestSystem<'TMetadata, 'TCommandContext, 'TEventContext, 'TBaseEvent when '
             AggregateStateBuilder.dynamicRun stateBuilder.GetBlockBuilders identity evt metadata s
         
         streamEvents
-        |> Vector.map (function
+        |> PersistentVector.map (function
             | Event { Body = body; Metadata = metadata } ->
                 (body, metadata)
             | EventLink (streamId, eventNumber, _) ->
@@ -116,7 +116,7 @@ type TestSystem<'TMetadata, 'TCommandContext, 'TEventContext, 'TBaseEvent when '
                 | Some (Event { Body = body; Metadata = metadata }) -> (body, metadata)
                 | Some (EventLink _) -> failwith "found link to a link"
                 | None -> failwith "found a dangling link")
-        |> Vector.fold run Map.empty
+        |> PersistentVector.fold run Map.empty
         |> stateBuilder.GetState
 
     member x.OnTimeChange onTimeChange =
diff --git a/src/Eventful.Testing/app.config b/src/Eventful.Testing/app.config
index e3d0b73..6c17b56 100644
--- a/src/Eventful.Testing/app.config
+++ b/src/Eventful.Testing/app.config
@@ -14,6 +14,10 @@
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/Eventful.Testing/packages.config b/src/Eventful.Testing/packages.config
index d993220..b5b7002 100644
--- a/src/Eventful.Testing/packages.config
+++ b/src/Eventful.Testing/packages.config
@@ -2,8 +2,11 @@
 <packages>
   <package id="FsCheck" version="1.0.1" targetFramework="net45" />
   <package id="FsCheck.Xunit" version="1.0.1" targetFramework="net45" />
-  <package id="FSharpx.Collections" version="1.9.4" targetFramework="net45" />
-  <package id="FSharpx.Core" version="1.8.41" targetFramework="net45" />
+  <package id="FSharp.Control.AsyncSeq" version="2.0.1" targetFramework="net45" />
+  <package id="FSharp.Core" version="3.1.2.1" targetFramework="net45" />
+  <package id="FSharpx.Async" version="1.12.0" targetFramework="net45" />
+  <package id="FSharpx.Collections" version="1.10.1" targetFramework="net45" />
+  <package id="FSharpx.Extras" version="1.10.2" targetFramework="net45" />
   <package id="Serilog" version="1.5.7" targetFramework="net45" />
   <package id="Unquote" version="2.2.2" targetFramework="net45" />
   <package id="xunit" version="1.9.2" targetFramework="net45" />
diff --git a/src/Eventful/AggregateBuilder.fs b/src/Eventful/AggregateBuilder.fs
index 3a5f86e..bf16d68 100644
--- a/src/Eventful/AggregateBuilder.fs
+++ b/src/Eventful/AggregateBuilder.fs
@@ -475,7 +475,8 @@ module AggregateActionBuilder =
                 return 
                     match result with
                     | Choice1Of2 _ -> ()
-                    | Choice2Of2 AlreadyProcessed -> ()
+                    | Choice2Of2 AlreadyProcessed ->
+                        log.Warn <| lazy (sprintf "Got AlreadyProcessed when running event handlers for event #%i on stream %s (%s)" event.EventNumber event.StreamId event.EventType)
                     | Choice2Of2 a ->
                         failwith <| sprintf "Event handler failed: %A" a
             }
diff --git a/src/Eventful/BulkProjector.fs b/src/Eventful/BulkProjector.fs
index 8329547..304f8ff 100644
--- a/src/Eventful/BulkProjector.fs
+++ b/src/Eventful/BulkProjector.fs
@@ -8,6 +8,7 @@ open System.Threading.Tasks
 open Metrics
 
 open FSharpx
+open FSharpx.Functional
 
 type IProjector<'TMessage, 'TContext, 'TAction> = 
     abstract member Compare : obj -> obj -> int
diff --git a/src/Eventful/Eventful.fsproj b/src/Eventful/Eventful.fsproj
index 3380d94..29265b8 100644
--- a/src/Eventful/Eventful.fsproj
+++ b/src/Eventful/Eventful.fsproj
@@ -106,24 +106,33 @@
       <HintPath>..\packages\Autofac.WebApi2.3.4.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="FSharp.Control.AsyncSeq">
+      <HintPath>..\..\..\packages\FSharp.Control.AsyncSeq.2.0.1\lib\net45\FSharp.Control.AsyncSeq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\packages\FSharp.Core.3.1.2.1\lib\net40\FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharpx.Async">
+      <HintPath>..\..\..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FSharpx.Collections">
-      <HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
+      <HintPath>..\..\..\packages\FSharpx.Collections.1.10.1\lib\net40\FSharpx.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FSharpx.Core">
-      <HintPath>..\packages\FSharpx.Core.1.8.41\lib\40\FSharpx.Core.dll</HintPath>
+    <Reference Include="FSharpx.Extras">
+      <HintPath>..\..\..\packages\FSharpx.Extras.1.10.2\lib\40\FSharpx.Extras.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Metrics">
-      <HintPath>..\packages\Metrics.NET.0.2.6\lib\net45\Metrics.dll</HintPath>
+      <HintPath>..\..\..\packages\Metrics.NET.0.3.2-pre\lib\net45\Metrics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog">
diff --git a/src/Eventful/EventfulHandlers.fs b/src/Eventful/EventfulHandlers.fs
index c963459..86baf76 100644
--- a/src/Eventful/EventfulHandlers.fs
+++ b/src/Eventful/EventfulHandlers.fs
@@ -5,6 +5,7 @@ open Eventful.EventStream
 open Eventful.MultiCommand
 open FSharpx
 open FSharpx.Collections
+open FSharpx.Functional
 open FSharp.Control
 
                                             // Source StreamId, Source Event Number, Event -> Program
diff --git a/src/Eventful/StateBuilder.fs b/src/Eventful/StateBuilder.fs
index 00d9bac..4dbdb76 100644
--- a/src/Eventful/StateBuilder.fs
+++ b/src/Eventful/StateBuilder.fs
@@ -2,6 +2,7 @@
 
 open System
 open FSharpx
+open FSharpx.Functional
 open Eventful
 
 type StateRunner<'TMetadata, 'TState, 'TEvent> = 'TEvent -> 'TMetadata -> 'TState -> 'TState
@@ -266,34 +267,34 @@ module AggregateStateBuilder =
     }
 
     let tuple2 b1 b2 =
-        combine FSharpx.Prelude.tuple2 b1 b2
+        combine FSharpx.Functional.Prelude.tuple2 b1 b2
 
     let tuple3 b1 b2 b3 =
         (tuple2 b2 b3)
-        |> combine FSharpx.Prelude.tuple2 b1
+        |> combine FSharpx.Functional.Prelude.tuple2 b1
         |> map (fun (a,(b,c)) -> (a,b,c))
 
     let tuple4 b1 b2 b3 b4 =
         (tuple3 b2 b3 b4)
-        |> combine FSharpx.Prelude.tuple2 b1
+        |> combine FSharpx.Functional.Prelude.tuple2 b1
         |> map (fun (a,(b,c,d)) -> (a,b,c,d))
 
     let tuple5 b1 b2 b3 b4 b5 =
         (tuple4 b2 b3 b4 b5)
-        |> combine FSharpx.Prelude.tuple2 b1
+        |> combine FSharpx.Functional.Prelude.tuple2 b1
         |> map (fun (a,(b,c,d,e)) -> (a,b,c,d,e))
 
     let tuple6 b1 b2 b3 b4 b5 b6 =
         (tuple5 b2 b3 b4 b5 b6)
-        |> combine FSharpx.Prelude.tuple2 b1
+        |> combine FSharpx.Functional.Prelude.tuple2 b1
         |> map (fun (a,(b,c,d,e,f)) -> (a,b,c,d,e,f))
 
     let tuple7 b1 b2 b3 b4 b5 b6 b7 =
         (tuple6 b2 b3 b4 b5 b6 b7)
-        |> combine FSharpx.Prelude.tuple2 b1
+        |> combine FSharpx.Functional.Prelude.tuple2 b1
         |> map (fun (a,(b,c,d,e,f,g)) -> (a,b,c,d,e,f,g))
 
     let tuple8 b1 b2 b3 b4 b5 b6 b7 b8 =
         (tuple7 b2 b3 b4 b5 b6 b7 b8)
-        |> combine FSharpx.Prelude.tuple2 b1
+        |> combine FSharpx.Functional.Prelude.tuple2 b1
         |> map (fun (a,(b,c,d,e,f,g,h)) -> (a,b,c,d,e,f,g,h))
\ No newline at end of file
diff --git a/src/Eventful/Validation.fs b/src/Eventful/Validation.fs
index 1e17868..7414abb 100644
--- a/src/Eventful/Validation.fs
+++ b/src/Eventful/Validation.fs
@@ -9,10 +9,24 @@ open FSharpx.Validation
 
 type ValidationFailure = string option * string
 
-type CommandFailure = 
-| CommandException of string option * Exception
-| CommandError of string
-| CommandFieldError of string * string
+type CommandFailure =
+    | CommandException of string option * Exception
+    | CommandError of string
+    | CommandFieldError of string * string
+    with
+    override x.ToString() =
+        match x with
+        | CommandException (maybeDescription, ex) ->
+            let description =
+                match maybeDescription with
+                | Some desc -> " " + desc
+                | None -> ""
+
+            sprintf "CommandException%s: %O" description ex
+        | CommandError error ->
+            "CommandError " + error
+        | CommandFieldError (field, error) ->
+            sprintf "CommandFieldError in %s: %s" field error
 
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module CommandFailure =
diff --git a/src/Eventful/app.config b/src/Eventful/app.config
index cba1092..a7ffcf1 100644
--- a/src/Eventful/app.config
+++ b/src/Eventful/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/Eventful/packages.config b/src/Eventful/packages.config
index 3853e8a..b0dd271 100644
--- a/src/Eventful/packages.config
+++ b/src/Eventful/packages.config
@@ -2,11 +2,14 @@
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="Autofac.WebApi2" version="3.4.0" targetFramework="net45" />
-  <package id="FSharpx.Collections" version="1.9.4" targetFramework="net45" />
-  <package id="FSharpx.Core" version="1.8.41" targetFramework="net45" />
-  <package id="Metrics.NET" version="0.2.6" targetFramework="net45" />
+  <package id="FSharp.Control.AsyncSeq" version="2.0.1" targetFramework="net45" />
+  <package id="FSharp.Core" version="3.1.2.1" targetFramework="net45" />
+  <package id="Metrics.NET" version="0.3.2-pre" targetFramework="net45" />
+  <package id="FSharpx.Async" version="1.12.0" targetFramework="net45" />
+  <package id="FSharpx.Collections" version="1.10.1" targetFramework="net45" />
+  <package id="FSharpx.Extras" version="1.10.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
   <package id="Serilog" version="1.5.7" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/vendor/Neo4jClient b/vendor/Neo4jClient
index 16b5454..92a04c6 160000
--- a/vendor/Neo4jClient
+++ b/vendor/Neo4jClient
@@ -1 +1 @@
-Subproject commit 16b5454db24985bbf4de182aa4ecf0200c96b587
+Subproject commit 92a04c6fa4824edf075ba497e34c272d6f125880