diff --git a/src/Akka.Persistence.Cassandra.Tests/Akka.Persistence.Cassandra.Tests.csproj b/src/Akka.Persistence.Cassandra.Tests/Akka.Persistence.Cassandra.Tests.csproj
index 5653a4ab..7d8f609c 100644
--- a/src/Akka.Persistence.Cassandra.Tests/Akka.Persistence.Cassandra.Tests.csproj
+++ b/src/Akka.Persistence.Cassandra.Tests/Akka.Persistence.Cassandra.Tests.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
+  <Import Project="..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -15,7 +15,8 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>fa451739</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,35 +36,37 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Akka, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Akka.1.0.6\lib\net45\Akka.dll</HintPath>
+    <Reference Include="Akka, Version=1.1.1.27, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.1.1.1\lib\net45\Akka.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.Persistence, Version=1.0.6.17, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Akka.Persistence.1.0.6.17-beta\lib\net45\Akka.Persistence.dll</HintPath>
+    <Reference Include="Akka.Persistence, Version=1.1.1.28, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.Persistence.1.1.1.28-beta\lib\net45\Akka.Persistence.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.Persistence.TestKit, Version=1.0.6.17, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Akka.Persistence.TestKit.1.0.6.17-beta\lib\net45\Akka.Persistence.TestKit.dll</HintPath>
+    <Reference Include="Akka.Persistence.TestKit, Version=1.1.1.28, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.Persistence.TestKit.1.1.1.28-beta\lib\net45\Akka.Persistence.TestKit.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.TestKit, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Akka.TestKit.1.0.6\lib\net45\Akka.TestKit.dll</HintPath>
+    <Reference Include="Akka.TestKit, Version=1.1.1.27, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.TestKit.1.1.1\lib\net45\Akka.TestKit.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.TestKit.Xunit2, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Akka.TestKit.Xunit2.1.0.6\lib\net45\Akka.TestKit.Xunit2.dll</HintPath>
+    <Reference Include="Akka.TestKit.Xunit2, Version=1.1.1.27, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.TestKit.Xunit2.1.1.1\lib\net45\Akka.TestKit.Xunit2.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Cassandra, Version=2.7.0.0, Culture=neutral, PublicKeyToken=10b231fbfc8c4b4d, processorArchitecture=MSIL">
-      <HintPath>..\packages\CassandraCSharpDriver.2.7.3\lib\net40\Cassandra.dll</HintPath>
+    <Reference Include="Cassandra, Version=3.0.0.0, Culture=neutral, PublicKeyToken=10b231fbfc8c4b4d, processorArchitecture=MSIL">
+      <HintPath>..\packages\CassandraCSharpDriver.3.0.8\lib\net40\Cassandra.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.ProtocolBuffers">
-      <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath>
+    <Reference Include="Google.ProtocolBuffers, Version=2.4.1.555, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.555\lib\net40\Google.ProtocolBuffers.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Google.ProtocolBuffers.Serialization">
-      <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.Serialization.dll</HintPath>
+    <Reference Include="Google.ProtocolBuffers.Serialization, Version=2.4.1.555, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.555\lib\net40\Google.ProtocolBuffers.Serialization.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="LZ4">
       <HintPath>..\packages\lz4net.1.0.5.93\lib\net40-client\LZ4.dll</HintPath>
@@ -72,6 +75,10 @@
       <HintPath>..\Packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -81,11 +88,17 @@
     <Reference Include="xunit.abstractions">
       <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -118,6 +131,7 @@
     <PropertyGroup>
       <ErrorText>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=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
+    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
   </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.
diff --git a/src/Akka.Persistence.Cassandra.Tests/CassandraIntegrationSpec.cs b/src/Akka.Persistence.Cassandra.Tests/CassandraIntegrationSpec.cs
index a72465c6..3d580e2c 100644
--- a/src/Akka.Persistence.Cassandra.Tests/CassandraIntegrationSpec.cs
+++ b/src/Akka.Persistence.Cassandra.Tests/CassandraIntegrationSpec.cs
@@ -4,6 +4,7 @@
 using Akka.TestKit;
 using Akka.Util.Internal;
 using Xunit;
+using Akka.Persistence;
 
 namespace Akka.Persistence.Cassandra.Tests
 {
@@ -41,11 +42,11 @@ public CassandraIntegrationSpec()
         public void Cassandra_journal_should_write_and_replay_messages()
         {
             // Start a persistence actor and write some messages to it
-            var actor1 = Sys.ActorOf(Props.Create<PersistentActorA>(_actorId));
+            var actor1 = Sys.ActorOf(Props.Create<PersistentActorA>(_actorId, TestActor));
             WriteAndVerifyMessages(actor1, 1L, 16L);
 
             // Now start a new instance (same persistence Id) and it should recover with those same messages
-            var actor2 = Sys.ActorOf(Props.Create<PersistentActorA>(_actorId));
+            var actor2 = Sys.ActorOf(Props.Create<PersistentActorA>(_actorId, TestActor));
             for (long i = 1L; i <= 16L; i++)
             {
                 string msg = string.Format("a-{0}", i);
@@ -66,7 +67,7 @@ public void Cassandra_journal_should_not_replay_deleted_messages(bool permanentD
             TestProbe deleteProbe = CreateTestProbe();
             Sys.EventStream.Subscribe(deleteProbe.Ref, typeof (DeleteMessagesTo));
 
-            var actor1 = Sys.ActorOf(Props.Create<PersistentActorA>(_actorId));
+            var actor1 = Sys.ActorOf(Props.Create<PersistentActorA>(_actorId, TestActor));
             WriteAndVerifyMessages(actor1, 1L, 16L);
 
             // Tell the actor to delete some messages and make sure it's finished
@@ -74,7 +75,7 @@ public void Cassandra_journal_should_not_replay_deleted_messages(bool permanentD
             deleteProbe.ExpectMsg<DeleteMessagesTo>();
 
             // Start a second copy of the actor and verify it starts replaying from the correct spot
-            Sys.ActorOf(Props.Create<PersistentActorA>(_actorId));
+            Sys.ActorOf(Props.Create<PersistentActorA>(_actorId, TestActor));
             for (long i = 4L; i <= 16L; i++)
             {
                 string msg = string.Format("a-{0}", i);
@@ -86,7 +87,7 @@ public void Cassandra_journal_should_not_replay_deleted_messages(bool permanentD
             deleteProbe.ExpectMsg<DeleteMessagesTo>();
 
             // Start another copy and verify playback again
-            Sys.ActorOf(Props.Create<PersistentActorA>(_actorId));
+            Sys.ActorOf(Props.Create<PersistentActorA>(_actorId, TestActor));
             for (long i = 8L; i <= 16L; i++)
             {
                 string msg = string.Format("a-{0}", i);
@@ -98,7 +99,7 @@ public void Cassandra_journal_should_not_replay_deleted_messages(bool permanentD
         public void Cassandra_journal_should_replay_message_incrementally()
         {
             // Write some messages to a Persistent Actor
-            var actor = Sys.ActorOf(Props.Create<PersistentActorA>(_actorId));
+            var actor = Sys.ActorOf(Props.Create<PersistentActorA>(_actorId, TestActor));
             WriteAndVerifyMessages(actor, 1L, 6L);
 
             TestProbe probe = CreateTestProbe();
@@ -140,34 +141,6 @@ public void Persistent_actor_should_recover_from_a_snapshot_with_follow_up_messa
             ExpectHandled("b", 2, true);
         }
 
-        [Fact]
-        public void Persistent_actor_should_recover_from_a_snapshot_with_follow_up_messages_and_an_upper_bound()
-        {
-            // Create an actor and trigger manual recovery so it will accept new messages
-            var actor1 = Sys.ActorOf(Props.Create<PersistentActorCWithManualRecovery>(_actorId, TestActor));
-            actor1.Tell(new Recover(SnapshotSelectionCriteria.None));
-
-            // Write a message, snapshot, then write some follow-up messages
-            actor1.Tell("a");
-            ExpectHandled("a", 1, false);
-            actor1.Tell("snap");
-            ExpectMsg("snapped-a-1");
-            WriteSameMessageAndVerify(actor1, "a", 2L, 7L);
-
-            // Create another copy of that actor and manually recover to an upper bound (i.e. past state) and verify
-            // we get the expected messages after the snapshot
-            var actor2 = Sys.ActorOf(Props.Create<PersistentActorCWithManualRecovery>(_actorId, TestActor));
-            actor2.Tell(new Recover(SnapshotSelectionCriteria.Latest, toSequenceNr: 3L));
-            ExpectMsg("offered-a-1");
-            ExpectHandled("a", 2, true);
-            ExpectHandled("a", 3, true);
-
-            // Should continue working after recovery to previous state, but highest sequence number should take into 
-            // account other messages that were written but not replayed
-            actor2.Tell("d");
-            ExpectHandled("d", 8L, false);
-        }
-
         [Fact]
         public void Persistent_actor_should_recover_from_a_snapshot_without_follow_up_messages_inside_a_partition()
         {
@@ -274,10 +247,12 @@ public HandledMessage(string message, long sequenceNumber, bool isRecovering)
         public class PersistentActorA : PersistentActor
         {
             private readonly string _persistenceId;
+            private readonly IActorRef _testActor;
 
-            public PersistentActorA(string persistenceId)
+            public PersistentActorA(string persistenceId, IActorRef testActor)
             {
                 _persistenceId = persistenceId;
+                _testActor = testActor;
             }
 
             public override string PersistenceId
@@ -290,7 +265,8 @@ protected override bool ReceiveRecover(object message)
                 if (message is string)
                 {
                     var payload = (string) message;
-                    Handle(payload);
+                    //Handle(payload);
+                    _testActor.Tell(new HandledMessage(payload, LastSequenceNr, IsRecovering), Self);
                     return true;
                 }
 
@@ -302,7 +278,7 @@ protected override bool ReceiveCommand(object message)
                 if (message is DeleteToCommand)
                 {
                     var delete = (DeleteToCommand) message;
-                    DeleteMessages(delete.SequenceNumber, delete.Permanent);
+                    DeleteMessages(delete.SequenceNumber);
                     return true;
                 }
 
@@ -382,7 +358,7 @@ protected override bool ReceiveCommand(object message)
                 if (message is DeleteToCommand)
                 {
                     var delete = (DeleteToCommand) message;
-                    DeleteMessages(delete.SequenceNumber, delete.Permanent);
+                    DeleteMessages(delete.SequenceNumber);
                     return true;
                 }
                 
@@ -396,19 +372,6 @@ private void Handle(string payload)
             }
         }
 
-        public class PersistentActorCWithManualRecovery : PersistentActorC
-        {
-            public PersistentActorCWithManualRecovery(string persistenceId, IActorRef probe)
-                : base(persistenceId, probe)
-            {
-            }
-
-            protected override void PreRestart(Exception reason, object message)
-            {
-                // Don't do automatic recovery
-            }
-        }
-
         public class ViewA : PersistentView
         {
             private readonly string _viewId;
diff --git a/src/Akka.Persistence.Cassandra.Tests/packages.config b/src/Akka.Persistence.Cassandra.Tests/packages.config
index 0a3fa908..5f140ba7 100644
--- a/src/Akka.Persistence.Cassandra.Tests/packages.config
+++ b/src/Akka.Persistence.Cassandra.Tests/packages.config
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Akka" version="1.0.6" targetFramework="net45" />
-  <package id="Akka.Persistence" version="1.0.6.17-beta" targetFramework="net45" />
-  <package id="Akka.Persistence.TestKit" version="1.0.6.17-beta" targetFramework="net45" />
-  <package id="Akka.TestKit" version="1.0.6" targetFramework="net45" />
-  <package id="Akka.TestKit.Xunit2" version="1.0.6" targetFramework="net45" />
-  <package id="CassandraCSharpDriver" version="2.7.3" targetFramework="net45" />
-  <package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
+  <package id="Akka" version="1.1.1" targetFramework="net45" />
+  <package id="Akka.Persistence" version="1.1.1.28-beta" targetFramework="net45" />
+  <package id="Akka.Persistence.TestKit" version="1.1.1.28-beta" targetFramework="net45" />
+  <package id="Akka.TestKit" version="1.1.1" targetFramework="net45" />
+  <package id="Akka.TestKit.Xunit2" version="1.1.1" targetFramework="net45" />
+  <package id="CassandraCSharpDriver" version="3.0.8" targetFramework="net45" />
+  <package id="Google.ProtocolBuffers" version="2.4.1.555" targetFramework="net45" />
   <package id="lz4net" version="1.0.5.93" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="xunit" version="2.0.0" targetFramework="net45" />
+  <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
+  <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Akka.Persistence.Cassandra/Akka.Persistence.Cassandra.csproj b/src/Akka.Persistence.Cassandra/Akka.Persistence.Cassandra.csproj
index 7fe0e087..85464bff 100644
--- a/src/Akka.Persistence.Cassandra/Akka.Persistence.Cassandra.csproj
+++ b/src/Akka.Persistence.Cassandra/Akka.Persistence.Cassandra.csproj
@@ -32,23 +32,25 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Akka, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Akka.1.0.6\lib\net45\Akka.dll</HintPath>
+    <Reference Include="Akka, Version=1.1.1.27, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.1.1.1\lib\net45\Akka.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.Persistence, Version=1.0.6.17, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Akka.Persistence.1.0.6.17-beta\lib\net45\Akka.Persistence.dll</HintPath>
+    <Reference Include="Akka.Persistence, Version=1.1.1.28, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.Persistence.1.1.1.28-beta\lib\net45\Akka.Persistence.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Cassandra, Version=2.7.0.0, Culture=neutral, PublicKeyToken=10b231fbfc8c4b4d, processorArchitecture=MSIL">
-      <HintPath>..\packages\CassandraCSharpDriver.2.7.3\lib\net40\Cassandra.dll</HintPath>
+    <Reference Include="Cassandra, Version=3.0.0.0, Culture=neutral, PublicKeyToken=10b231fbfc8c4b4d, processorArchitecture=MSIL">
+      <HintPath>..\packages\CassandraCSharpDriver.3.0.8\lib\net40\Cassandra.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.ProtocolBuffers">
-      <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath>
+    <Reference Include="Google.ProtocolBuffers, Version=2.4.1.555, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.555\lib\net40\Google.ProtocolBuffers.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Google.ProtocolBuffers.Serialization">
-      <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.Serialization.dll</HintPath>
+    <Reference Include="Google.ProtocolBuffers.Serialization, Version=2.4.1.555, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.555\lib\net40\Google.ProtocolBuffers.Serialization.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="LZ4">
       <HintPath>..\packages\lz4net.1.0.5.93\lib\net40-client\LZ4.dll</HintPath>
@@ -57,6 +59,10 @@
       <HintPath>..\Packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/src/Akka.Persistence.Cassandra/Journal/CassandraJournal.cs b/src/Akka.Persistence.Cassandra/Journal/CassandraJournal.cs
index 3f26993f..a5802d40 100644
--- a/src/Akka.Persistence.Cassandra/Journal/CassandraJournal.cs
+++ b/src/Akka.Persistence.Cassandra/Journal/CassandraJournal.cs
@@ -6,6 +6,8 @@
 using Akka.Persistence.Journal;
 using Akka.Serialization;
 using Cassandra;
+using Akka.Actor;
+using System.Collections.Immutable;
 
 namespace Akka.Persistence.Cassandra.Journal
 {
@@ -21,7 +23,6 @@ public class CassandraJournal : AsyncWriteJournal
 
         private readonly CassandraExtension _cassandraExtension;
         private readonly Serializer _serializer;
-        private readonly int _maxDeletionBatchSize;
 
         private ISession _session;
         private PreparedStatement _writeMessage;
@@ -42,7 +43,6 @@ public CassandraJournal()
 
             // Use setting from the persistence extension when batch deleting
             PersistenceExtension persistence = Context.System.PersistenceExtension();
-            _maxDeletionBatchSize = persistence.Settings.Journal.MaxDeletionBatchSize;
         }
         
         protected override void PreStart()
@@ -90,7 +90,8 @@ protected override void PreStart()
             }
         }
 
-        public override async Task ReplayMessagesAsync(string persistenceId, long fromSequenceNr, long toSequenceNr, long max,
+        //                    Task ReplayMessagesAsync(IActorContext context, string persistenceId, long fromSequenceNr, long toSequenceNr, long max, Action<IPersistentRepresentation> recoveryCallback);
+        public override async Task ReplayMessagesAsync(IActorContext context, string persistenceId, long fromSequenceNr, long toSequenceNr, long max,
                                                        Action<IPersistentRepresentation> replayCallback)
         {
             long partitionNumber = GetPartitionNumber(fromSequenceNr);
@@ -182,57 +183,64 @@ public override async Task<long> ReadHighestSequenceNrAsync(string persistenceId
             return maxSequenceNumber;
         }
 
-        protected override async Task WriteMessagesAsync(IEnumerable<IPersistentRepresentation> messages)
+        protected override Task<IImmutableList<Exception>> WriteMessagesAsync(IEnumerable<AtomicWrite> messages)
         {
-            // It's implied by the API/docs that a batch of messages will be for a single persistence id
-            List<IPersistentRepresentation> messageList = messages.ToList();
+            var tasks = messages.Select(async write =>
+            {
+                // It's implied by the API/docs that a batch of messages will be for a single persistence id
+                var messageList = write.Payload as IImmutableList<IPersistentRepresentation>;
 
-            if (!messageList.Any())
-                return;
+                if (!messageList.Any())
+                    return;
 
-            string persistenceId = messageList[0].PersistenceId;
+                string persistenceId = messageList[0].PersistenceId;
 
-            long seqNr = messageList[0].SequenceNr;
-            bool writeHeader = IsNewPartition(seqNr);
-            long partitionNumber = GetPartitionNumber(seqNr);
+                long seqNr = messageList[0].SequenceNr;
+                bool writeHeader = IsNewPartition(seqNr);
+                long partitionNumber = GetPartitionNumber(seqNr);
 
-            if (messageList.Count > 1)
-            {
-                // See if this collection of writes would span multiple partitions and if so, move all the writes to the next partition
-                long lastMessagePartition = GetPartitionNumber(messageList[messageList.Count - 1].SequenceNr);
-                if (lastMessagePartition != partitionNumber)
+                if (messageList.Count > 1)
                 {
-                    partitionNumber = lastMessagePartition;
-                    writeHeader = true;
+                    // See if this collection of writes would span multiple partitions and if so, move all the writes to the next partition
+                    long lastMessagePartition = GetPartitionNumber(messageList[messageList.Count - 1].SequenceNr);
+                    if (lastMessagePartition != partitionNumber)
+                    {
+                        partitionNumber = lastMessagePartition;
+                        writeHeader = true;
+                    }
                 }
-            }
 
-            // No need for a batch if writing a single message
-            if (messageList.Count == 1 && writeHeader == false)
-            {
-                IPersistentRepresentation message = messageList[0];
-                IStatement statement = _writeMessage.Bind(persistenceId, partitionNumber, message.SequenceNr, Serialize(message))
-                                                    .SetConsistencyLevel(_cassandraExtension.JournalSettings.WriteConsistency);
-                await _session.ExecuteAsync(statement);
-                return;
-            }
+                // No need for a batch if writing a single message
+                if (messageList.Count == 1 && writeHeader == false)
+                {
+                    IPersistentRepresentation message = messageList[0];
+                    IStatement statement = _writeMessage.Bind(persistenceId, partitionNumber, message.SequenceNr, Serialize(message))
+                                                        .SetConsistencyLevel(_cassandraExtension.JournalSettings.WriteConsistency);
+                    await _session.ExecuteAsync(statement);
+                    return;
+                }
 
-            // Use a batch and add statements for each message
-            var batch = new BatchStatement();
-            foreach (IPersistentRepresentation message in messageList)
-            {
-                batch.Add(_writeMessage.Bind(message.PersistenceId, partitionNumber, message.SequenceNr, Serialize(message)));
-            }
+                // Use a batch and add statements for each message
+                var batch = new BatchStatement();
+                foreach (IPersistentRepresentation message in messageList)
+                {
+                    batch.Add(_writeMessage.Bind(message.PersistenceId, partitionNumber, message.SequenceNr, Serialize(message)));
+                }
 
-            // Add header if necessary
-            if (writeHeader)
-                batch.Add(_writeHeader.Bind(persistenceId, partitionNumber, seqNr));
+                // Add header if necessary
+                if (writeHeader)
+                    batch.Add(_writeHeader.Bind(persistenceId, partitionNumber, seqNr));
 
-            batch.SetConsistencyLevel(_cassandraExtension.JournalSettings.WriteConsistency);
-            await _session.ExecuteAsync(batch);
+                batch.SetConsistencyLevel(_cassandraExtension.JournalSettings.WriteConsistency);
+                await _session.ExecuteAsync(batch);
+            });
+
+            return Task.WhenAll(tasks)
+                       .ContinueWith(y => tasks.Select(x => x.IsFaulted ? TryUnwrapException(x.Exception) : null)
+                                               .ToImmutableList() as IImmutableList<Exception>);
         }
 
-        protected override async Task DeleteMessagesToAsync(string persistenceId, long toSequenceNr, bool isPermanent)
+        protected override async Task DeleteMessagesToAsync(string persistenceId, long toSequenceNr)
         {
             long maxPartitionNumber = GetPartitionNumber(toSequenceNr) + 1L;
             long partitionNumber = 0L;
@@ -268,36 +276,20 @@ protected override async Task DeleteMessagesToAsync(string persistenceId, long t
                 {
                     // Delete either to the end of the partition or to the number specified, whichever comes first
                     long deleteTo = Math.Min(lastSequenceRow.GetValue<long>("sequence_number"), toSequenceNr);
-                    if (isPermanent == false)
-                    {
-                        IStatement writeMarker = _writeDeleteMarker.Bind(persistenceId, partitionNumber, deleteTo)
-                                                                   .SetConsistencyLevel(_cassandraExtension.JournalSettings.WriteConsistency);
-                        await _session.ExecuteAsync(writeMarker).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        // Permanently delete using batches in parallel
-                        long batchFrom = deleteFrom;
-                        long batchTo;
-                        var batches = new List<Task>();
-                        do
-                        {
-                            batchTo = Math.Min(batchFrom + _maxDeletionBatchSize - 1L, deleteTo);
-
-                            var batch = new BatchStatement();
-                            for (long seq = batchFrom; seq <= batchTo; seq++)
-                                batch.Add(_deleteMessagePermanent.Bind(persistenceId, partitionNumber, seq));
-
-                            batch.Add(_writeDeleteMarker.Bind(persistenceId, partitionNumber, batchTo));
-                            batch.SetConsistencyLevel(_cassandraExtension.JournalSettings.WriteConsistency);
-
-                            batches.Add(_session.ExecuteAsync(batch));
-                            batchFrom = batchTo + 1L;
-                        } while (batchTo < deleteTo);
-
-                        await Task.WhenAll(batches).ConfigureAwait(false);
-                    }
-                    
+
+                    // Permanently delete using batches in parallel
+                    long batchFrom = deleteFrom;
+
+                    var batch = new BatchStatement();
+                    for (long seq = batchFrom; seq <= deleteTo; seq++)
+                        batch.Add(_deleteMessagePermanent.Bind(persistenceId, partitionNumber, seq));
+
+                    batch.Add(_writeDeleteMarker.Bind(persistenceId, partitionNumber, deleteTo));
+                    batch.SetConsistencyLevel(_cassandraExtension.JournalSettings.WriteConsistency);
+
+
+                    await _session.ExecuteAsync(batch).ConfigureAwait(false);
+
                     // If we've deleted everything we're supposed to, no need to continue
                     if (deleteTo == toSequenceNr)
                         return;
@@ -321,7 +313,7 @@ private IPersistentRepresentation MapRowToPersistentRepresentation(Row row, long
         {
             IPersistentRepresentation pr = Deserialize(row.GetValue<byte[]>("message"));
             if (pr.SequenceNr <= deletedTo)
-                pr = pr.Update(pr.SequenceNr, pr.PersistenceId, true, pr.Sender);
+                pr = pr.Update(pr.SequenceNr, pr.PersistenceId, pr.IsDeleted, pr.Sender, pr.WriterGuid);
 
             return pr;
         }
diff --git a/src/Akka.Persistence.Cassandra/Snapshot/CassandraSnapshotStore.cs b/src/Akka.Persistence.Cassandra/Snapshot/CassandraSnapshotStore.cs
index a776cbac..0f591ca4 100644
--- a/src/Akka.Persistence.Cassandra/Snapshot/CassandraSnapshotStore.cs
+++ b/src/Akka.Persistence.Cassandra/Snapshot/CassandraSnapshotStore.cs
@@ -65,25 +65,6 @@ protected override void PreStart()
             _selectSnapshotMetadata = _session.PrepareFormat(SnapshotStoreStatements.SelectSnapshotMetadata, fullyQualifiedTableName);
         }
 
-        protected override bool Receive(object message)
-        {
-            // Make deletes async as well, but make sure we still publish like the base class does
-            if (message is DeleteSnapshot)
-            {
-                HandleDeleteAsync((DeleteSnapshot) message, msg => DeleteAsync(msg.Metadata));
-            }
-            else if (message is DeleteSnapshots)
-            {
-                HandleDeleteAsync((DeleteSnapshots) message, msg => DeleteAsync(msg.PersistenceId, msg.Criteria));
-            }
-            else
-            {
-                return base.Receive(message);
-            }
-
-            return true;
-        }
-
         protected override async Task<SelectedSnapshot> LoadAsync(string persistenceId, SnapshotSelectionCriteria criteria)
         {
             bool hasNextPage = true;
@@ -186,11 +167,6 @@ protected override async Task DeleteAsync(string persistenceId, SnapshotSelectio
             await _session.ExecuteAsync(batch).ConfigureAwait(false);
         }
 
-        protected override void Saved(SnapshotMetadata metadata)
-        {
-            // No op
-        }
-
         protected override void PostStop()
         {
             base.PostStop();
diff --git a/src/Akka.Persistence.Cassandra/packages.config b/src/Akka.Persistence.Cassandra/packages.config
index 0f2b8b34..1ed60dbb 100644
--- a/src/Akka.Persistence.Cassandra/packages.config
+++ b/src/Akka.Persistence.Cassandra/packages.config
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Akka" version="1.0.6" targetFramework="net45" />
-  <package id="Akka.Persistence" version="1.0.6.17-beta" targetFramework="net45" />
-  <package id="CassandraCSharpDriver" version="2.7.3" targetFramework="net45" />
-  <package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
+  <package id="Akka" version="1.1.1" targetFramework="net45" />
+  <package id="Akka.Persistence" version="1.1.1.28-beta" targetFramework="net45" />
+  <package id="CassandraCSharpDriver" version="3.0.8" targetFramework="net45" />
+  <package id="Google.ProtocolBuffers" version="2.4.1.555" targetFramework="net45" />
   <package id="lz4net" version="1.0.5.93" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+  <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
 </packages>
\ No newline at end of file