diff --git a/mantis-network/src/main/java/io/reactivex/mantis/network/push/RouterFactory.java b/mantis-network/src/main/java/io/reactivex/mantis/network/push/RouterFactory.java
index 6fc97c9e8..775d93cd8 100644
--- a/mantis-network/src/main/java/io/reactivex/mantis/network/push/RouterFactory.java
+++ b/mantis-network/src/main/java/io/reactivex/mantis/network/push/RouterFactory.java
@@ -2,6 +2,30 @@
 
 import rx.functions.Func1;
 
+import java.nio.ByteBuffer;
+
 public interface RouterFactory {
     public <T> Router<T> scalarStageToStageRouter(String name, final Func1<T, byte[]> toBytes);
+
+    public default <K, V> Router<KeyValuePair<K, V>> keyedRouter(String name,
+                                                                 final Func1<K, byte[]> keyEncoder,
+                                                                 final Func1<V, byte[]> valueEncoder) {
+        return new ConsistentHashingRouter<K, V>(name, new Func1<KeyValuePair<K, V>, byte[]>() {
+            @Override
+            public byte[] call(KeyValuePair<K, V> kvp) {
+                byte[] keyBytes = kvp.getKeyBytes();
+                byte[] valueBytes = valueEncoder.call(kvp.getValue());
+                return
+                    // length + opcode + notification type + key length
+                    ByteBuffer.allocate(4 + 1 + 1 + 4 + keyBytes.length + valueBytes.length)
+                        .putInt(1 + 1 + 4 + keyBytes.length + valueBytes.length) // length
+                        .put((byte) 1) // opcode
+                        .put((byte) 1) // notification type
+                        .putInt(keyBytes.length) // key length
+                        .put(keyBytes) // key bytes
+                        .put(valueBytes) // value bytes
+                        .array();
+            }
+        }, HashFunctions.xxh3());
+    };
 }
diff --git a/mantis-network/src/main/java/io/reactivex/mantis/network/push/Routers.java b/mantis-network/src/main/java/io/reactivex/mantis/network/push/Routers.java
index 7e8592fba..c508eb865 100644
--- a/mantis-network/src/main/java/io/reactivex/mantis/network/push/Routers.java
+++ b/mantis-network/src/main/java/io/reactivex/mantis/network/push/Routers.java
@@ -31,26 +31,14 @@ public class Routers implements RouterFactory {
     public Routers() {}
 
 
+    /**
+     * Deprecated: use RouterFactory.keyedRouter instead
+     */
+    @Deprecated
     public static <K, V> Router<KeyValuePair<K, V>> consistentHashingLegacyTcpProtocol(String name,
                                                                                        final Func1<K, byte[]> keyEncoder,
                                                                                        final Func1<V, byte[]> valueEncoder) {
-        return new ConsistentHashingRouter<K, V>(name, new Func1<KeyValuePair<K, V>, byte[]>() {
-            @Override
-            public byte[] call(KeyValuePair<K, V> kvp) {
-                byte[] keyBytes = kvp.getKeyBytes();
-                byte[] valueBytes = valueEncoder.call(kvp.getValue());
-                return
-                        // length + opcode + notification type + key length
-                        ByteBuffer.allocate(4 + 1 + 1 + 4 + keyBytes.length + valueBytes.length)
-                                .putInt(1 + 1 + 4 + keyBytes.length + valueBytes.length) // length
-                                .put((byte) 1) // opcode
-                                .put((byte) 1) // notification type
-                                .putInt(keyBytes.length) // key length
-                                .put(keyBytes) // key bytes
-                                .put(valueBytes) // value bytes
-                                .array();
-            }
-        }, HashFunctions.xxh3());
+        return new Routers().keyedRouter(name, keyEncoder, valueEncoder);
     }
 
     private static byte[] dataPayload(byte[] data) {
diff --git a/mantis-runtime/src/main/java/io/mantisrx/runtime/executor/WorkerPublisherRemoteObservable.java b/mantis-runtime/src/main/java/io/mantisrx/runtime/executor/WorkerPublisherRemoteObservable.java
index 73092c926..4cbc3196f 100644
--- a/mantis-runtime/src/main/java/io/mantisrx/runtime/executor/WorkerPublisherRemoteObservable.java
+++ b/mantis-runtime/src/main/java/io/mantisrx/runtime/executor/WorkerPublisherRemoteObservable.java
@@ -135,6 +135,8 @@ private <K> LegacyTcpPushServer<KeyValuePair<K, T>> startKeyValueStage(KeyValueS
         Func1<T, byte[]> valueEncoder = t1 -> stage.getOutputCodec().encode(t1);
         Func1<K, byte[]> keyEncoder = t1 -> stage.getOutputKeyCodec().encode(t1);
 
+        Router<KeyValuePair<K, T>> router = this.routerFactory.keyedRouter(jobName, keyEncoder, valueEncoder);
+
         ServerConfig<KeyValuePair<K, T>> config = new ServerConfig.Builder<KeyValuePair<K, T>>()
             .name(name)
             .port(serverPort)
@@ -144,7 +146,7 @@ private <K> LegacyTcpPushServer<KeyValuePair<K, T>> startKeyValueStage(KeyValueS
             .maxChunkTimeMSec(maxChunkTimeMSec())
             .bufferCapacity(bufferCapacity())
             .useSpscQueue(useSpsc())
-            .router(Routers.consistentHashingLegacyTcpProtocol(jobName, keyEncoder, valueEncoder))
+            .router(router)
             .build();
 
         if (stage instanceof ScalarToGroup || stage instanceof GroupToGroup) {