diff --git a/Ruffles.Tests/Channels/ReliableSequencedChannelTests.cs b/Ruffles.Tests/Channels/ReliableSequencedChannelTests.cs
index 5e7729f..fc57144 100644
--- a/Ruffles.Tests/Channels/ReliableSequencedChannelTests.cs
+++ b/Ruffles.Tests/Channels/ReliableSequencedChannelTests.cs
@@ -25,8 +25,8 @@ public void TestSimpleMessage()
 
             byte[] message = BufferHelper.GetRandomBuffer(1024, 0);
 
-            HeapMemory messageMemory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message, 0, 1024), out bool dealloc)[0];
-            ArraySegment<byte>? payload = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(messageMemory.Buffer, (int)messageMemory.VirtualOffset + 2, (int)messageMemory.VirtualCount - 2), out bool hasMore);
+            HeapMemory messageMemory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message, 0, 1024), out _, out bool dealloc)[0];
+            ArraySegment<byte>? payload = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(messageMemory.Buffer, (int)messageMemory.VirtualOffset + 2, (int)messageMemory.VirtualCount - 2), out _, out bool hasMore);
 
             Assert.NotNull(payload);
             Assert.False(hasMore);
@@ -53,16 +53,16 @@ public void TestOutOfOrder()
             byte[] message3 = BufferHelper.GetRandomBuffer(1024, 2);
 
             // Sequence all payloads as outgoing
-            HeapMemory message1Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message1, 0, 1024), out bool dealloc)[0];
-            HeapMemory message2Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message2, 0, 1024), out dealloc)[0];
-            HeapMemory message3Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message3, 0, 1024), out dealloc)[0];
+            HeapMemory message1Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message1, 0, 1024), out _, out bool dealloc)[0];
+            HeapMemory message2Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message2, 0, 1024), out _, out dealloc)[0];
+            HeapMemory message3Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message3, 0, 1024), out _, out dealloc)[0];
 
             // Consume 1st payload
-            ArraySegment<byte>? payload1 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory.Buffer, (int)message1Memory.VirtualOffset + 2, (int)message1Memory.VirtualCount - 2), out bool hasMore1);
+            ArraySegment<byte>? payload1 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory.Buffer, (int)message1Memory.VirtualOffset + 2, (int)message1Memory.VirtualCount - 2), out _, out bool hasMore1);
             // Consume 3rd payload
-            ArraySegment<byte>? payload3 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory.Buffer, (int)message3Memory.VirtualOffset + 2, (int)message3Memory.VirtualCount - 2), out bool hasMore3);
+            ArraySegment<byte>? payload3 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory.Buffer, (int)message3Memory.VirtualOffset + 2, (int)message3Memory.VirtualCount - 2), out _, out bool hasMore3);
             // Consume 2nd payload
-            ArraySegment<byte>? payload2 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message2Memory.Buffer, (int)message2Memory.VirtualOffset + 2, (int)message2Memory.VirtualCount - 2), out bool hasMore2);
+            ArraySegment<byte>? payload2 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message2Memory.Buffer, (int)message2Memory.VirtualOffset + 2, (int)message2Memory.VirtualCount - 2), out _, out bool hasMore2);
 
             HeapMemory pollMemory = serverChannel.HandlePoll();
 
diff --git a/Ruffles.Tests/Channels/ReliableSequencedFragmentedChannelTests.cs b/Ruffles.Tests/Channels/ReliableSequencedFragmentedChannelTests.cs
index 5794849..a649f94 100644
--- a/Ruffles.Tests/Channels/ReliableSequencedFragmentedChannelTests.cs
+++ b/Ruffles.Tests/Channels/ReliableSequencedFragmentedChannelTests.cs
@@ -4,6 +4,7 @@
 using Ruffles.Tests.Helpers;
 using Ruffles.Tests.Stubs;
 using System;
+using System.Collections.Generic;
 
 namespace Ruffles.Tests.Channels
 {
@@ -25,8 +26,8 @@ public void TestSimpleMessageSingleFragment()
 
             byte[] message = BufferHelper.GetRandomBuffer(1024, 0);
 
-            HeapMemory messageMemory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message, 0, 1024), out bool dealloc)[0];
-            ArraySegment<byte>? payload = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(messageMemory.Buffer, (int)messageMemory.VirtualOffset + 2, (int)messageMemory.VirtualCount - 2), out bool hasMore);
+            HeapMemory messageMemory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message, 0, 1024), out _, out bool dealloc)[0];
+            ArraySegment<byte>? payload = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(messageMemory.Buffer, (int)messageMemory.VirtualOffset + 2, (int)messageMemory.VirtualCount - 2), out _, out bool hasMore);
 
             Assert.Null(payload);
             Assert.True(hasMore);
@@ -57,16 +58,16 @@ public void TestOutOfOrderSingleFragment()
             byte[] message3 = BufferHelper.GetRandomBuffer(1024, 2);
 
             // Sequence all payloads as outgoing
-            HeapMemory message1Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message1, 0, 1024), out bool dealloc)[0];
-            HeapMemory message2Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message2, 0, 1024), out dealloc)[0];
-            HeapMemory message3Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message3, 0, 1024), out dealloc)[0];
+            HeapMemory message1Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message1, 0, 1024), out _, out bool dealloc)[0];
+            HeapMemory message2Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message2, 0, 1024), out _, out dealloc)[0];
+            HeapMemory message3Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message3, 0, 1024), out _, out dealloc)[0];
 
             // Consume 1st payload
-            ArraySegment<byte>? payload1 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory.Buffer, (int)message1Memory.VirtualOffset + 2, (int)message1Memory.VirtualCount - 2), out bool hasMore1);
+            ArraySegment<byte>? payload1 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory.Buffer, (int)message1Memory.VirtualOffset + 2, (int)message1Memory.VirtualCount - 2), out _, out bool hasMore1);
             // Consume 3rd payload
-            ArraySegment<byte>? payload3 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory.Buffer, (int)message3Memory.VirtualOffset + 2, (int)message3Memory.VirtualCount - 2), out bool hasMore3);
+            ArraySegment<byte>? payload3 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory.Buffer, (int)message3Memory.VirtualOffset + 2, (int)message3Memory.VirtualCount - 2), out _, out bool hasMore3);
             // Consume 2nd payload
-            ArraySegment<byte>? payload2 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message2Memory.Buffer, (int)message2Memory.VirtualOffset + 2, (int)message2Memory.VirtualCount - 2), out bool hasMore2);
+            ArraySegment<byte>? payload2 = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message2Memory.Buffer, (int)message2Memory.VirtualOffset + 2, (int)message2Memory.VirtualCount - 2), out _, out bool hasMore2);
 
             Assert.Null(payload1);
             Assert.Null(payload2);
@@ -116,16 +117,16 @@ public void TestOutOfFragmentOrderMultiFragment()
             byte[] message3 = BufferHelper.GetRandomBuffer(1024 * 6, 2);
 
             // Sequence all payloads as outgoing
-            HeapMemory[] message1Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message1, 0, 1024 * 5), out bool dealloc);
-            HeapMemory[] message2Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message2, 0, 1024 * 8), out dealloc);
-            HeapMemory[] message3Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message3, 0, 1024 * 6), out dealloc);
+            HeapMemory[] message1Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message1, 0, 1024 * 5), out _, out bool dealloc);
+            HeapMemory[] message2Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message2, 0, 1024 * 8), out _, out dealloc);
+            HeapMemory[] message3Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message3, 0, 1024 * 6), out _, out dealloc);
 
             // Consume 1st payload all except first fragment
             bool[] hasMore1s = new bool[message1Memory.Length];
             ArraySegment<byte>?[] payload1s = new ArraySegment<byte>?[message1Memory.Length];
             for (int i = 1; i < message1Memory.Length; i++)
             {
-                payload1s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory[i].Buffer, (int)message1Memory[i].VirtualOffset + 2, (int)message1Memory[i].VirtualCount - 2), out bool hasMore1);
+                payload1s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory[i].Buffer, (int)message1Memory[i].VirtualOffset + 2, (int)message1Memory[i].VirtualCount - 2), out _, out bool hasMore1);
                 hasMore1s[i] = hasMore1;
             }
             // Consume 3rd payload only last fragment
@@ -133,7 +134,7 @@ public void TestOutOfFragmentOrderMultiFragment()
             ArraySegment<byte>?[] payload3s = new ArraySegment<byte>?[message3Memory.Length];
 
             {
-                payload3s[payload3s.Length - 1] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory[payload3s.Length - 1].Buffer, (int)message3Memory[payload3s.Length - 1].VirtualOffset + 2, (int)message3Memory[payload3s.Length - 1].VirtualCount - 2), out bool hasMore3);
+                payload3s[payload3s.Length - 1] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory[payload3s.Length - 1].Buffer, (int)message3Memory[payload3s.Length - 1].VirtualOffset + 2, (int)message3Memory[payload3s.Length - 1].VirtualCount - 2), out _, out bool hasMore3);
                 hasMore3s[payload3s.Length - 1] = hasMore3;
             }
 
@@ -142,7 +143,7 @@ public void TestOutOfFragmentOrderMultiFragment()
             ArraySegment<byte>?[] payload2s = new ArraySegment<byte>?[message2Memory.Length];
             for (int i = 0; i < message2Memory.Length; i++)
             {
-                payload2s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message2Memory[i].Buffer, (int)message2Memory[i].VirtualOffset + 2, (int)message2Memory[i].VirtualCount - 2), out bool hasMore2);
+                payload2s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message2Memory[i].Buffer, (int)message2Memory[i].VirtualOffset + 2, (int)message2Memory[i].VirtualCount - 2), out _, out bool hasMore2);
                 hasMore2s[i] = hasMore2;
             }
 
@@ -150,14 +151,14 @@ public void TestOutOfFragmentOrderMultiFragment()
                 // Consume 3rd payload all except last fragment (completes the last payload)
                 for (int i = 0; i < message3Memory.Length - 1; i++)
                 {
-                    payload3s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory[i].Buffer, (int)message3Memory[i].VirtualOffset + 2, (int)message3Memory[i].VirtualCount - 2), out bool hasMore3);
+                    payload3s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory[i].Buffer, (int)message3Memory[i].VirtualOffset + 2, (int)message3Memory[i].VirtualCount - 2), out _, out bool hasMore3);
                     hasMore3s[i] = hasMore3;
                 }
             }
 
             {
                 // Consume 1st payload first fragment (completes first payload)
-                payload1s[0] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory[0].Buffer, (int)message1Memory[0].VirtualOffset + 2, (int)message1Memory[0].VirtualCount - 2), out bool hasMore1);
+                payload1s[0] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory[0].Buffer, (int)message1Memory[0].VirtualOffset + 2, (int)message1Memory[0].VirtualCount - 2), out _, out bool hasMore1);
                 hasMore1s[0] = hasMore1;
             }
 
@@ -218,16 +219,16 @@ public void TestOutOfPacketOrderMultiFragment()
             byte[] message3 = BufferHelper.GetRandomBuffer(1024 * 6, 2);
 
             // Sequence all payloads as outgoing
-            HeapMemory[] message1Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message1, 0, 1024 * 5), out bool dealloc);
-            HeapMemory[] message2Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message2, 0, 1024 * 8), out dealloc);
-            HeapMemory[] message3Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message3, 0, 1024 * 6), out dealloc);
+            HeapMemory[] message1Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message1, 0, 1024 * 5), out _, out bool dealloc);
+            HeapMemory[] message2Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message2, 0, 1024 * 8), out _, out dealloc);
+            HeapMemory[] message3Memory = clientChannel.CreateOutgoingMessage(new ArraySegment<byte>(message3, 0, 1024 * 6), out _, out dealloc);
 
             // Consume 1st payload
             bool[] hasMore1s = new bool[message1Memory.Length];
             ArraySegment<byte>?[] payload1s = new ArraySegment<byte>?[message1Memory.Length];
             for (int i = 0; i < message1Memory.Length; i++)
             {
-                payload1s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory[i].Buffer, (int)message1Memory[i].VirtualOffset + 2, (int)message1Memory[i].VirtualCount - 2), out bool hasMore1);
+                payload1s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message1Memory[i].Buffer, (int)message1Memory[i].VirtualOffset + 2, (int)message1Memory[i].VirtualCount - 2), out _, out bool hasMore1);
                 hasMore1s[i] = hasMore1;
             }
             // Consume 3rd payload
@@ -235,7 +236,7 @@ public void TestOutOfPacketOrderMultiFragment()
             ArraySegment<byte>?[] payload3s = new ArraySegment<byte>?[message3Memory.Length];
             for (int i = 0; i < message3Memory.Length; i++)
             {
-                payload3s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory[i].Buffer, (int)message3Memory[i].VirtualOffset + 2, (int)message3Memory[i].VirtualCount - 2), out bool hasMore3);
+                payload3s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message3Memory[i].Buffer, (int)message3Memory[i].VirtualOffset + 2, (int)message3Memory[i].VirtualCount - 2), out _, out bool hasMore3);
                 hasMore3s[i] = hasMore3;
             }
             // Consume 2nd payload
@@ -243,7 +244,7 @@ public void TestOutOfPacketOrderMultiFragment()
             ArraySegment<byte>?[] payload2s = new ArraySegment<byte>?[message2Memory.Length];
             for (int i = 0; i < message2Memory.Length; i++)
             {
-                payload2s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message2Memory[i].Buffer, (int)message2Memory[i].VirtualOffset + 2, (int)message2Memory[i].VirtualCount - 2), out bool hasMore2);
+                payload2s[i] = serverChannel.HandleIncomingMessagePoll(new ArraySegment<byte>(message2Memory[i].Buffer, (int)message2Memory[i].VirtualOffset + 2, (int)message2Memory[i].VirtualCount - 2), out _, out bool hasMore2);
                 hasMore2s[i] = hasMore2;
             }
 
diff --git a/Ruffles.Tests/Stubs/ConnectionStub.cs b/Ruffles.Tests/Stubs/ConnectionStub.cs
index 99e1e5b..bb7f211 100644
--- a/Ruffles.Tests/Stubs/ConnectionStub.cs
+++ b/Ruffles.Tests/Stubs/ConnectionStub.cs
@@ -23,7 +23,7 @@ internal override void Disconnect(bool sendMessage)
             }
         }
 
-        internal override void SendRaw(ArraySegment<byte> payload, bool noMerge)
+        internal override void SendRaw(ArraySegment<byte> payload, bool noMerge, ushort headerSize)
         {
             if (OnSendData != null)
             {