From eeadb75c067efcf7597e7dee3f8e1df31759c082 Mon Sep 17 00:00:00 2001
From: javasabr <javasabr@gmail.com>
Date: Tue, 7 Oct 2025 07:13:54 +0200
Subject: [PATCH 1/6] extend readable/writable packet API

---
 .../impl/AbstractReadableNetworkPacket.java   |  32 ++++
 .../impl/AbstractWritableNetworkPacket.java   |  30 +++
 .../rlib/network/NetworkPacketTest.java       | 173 ++++++++++++++++++
 3 files changed, 235 insertions(+)
 create mode 100644 rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java

diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
index 2b3b720c..bb310683 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
@@ -45,6 +45,23 @@ protected int readByte(ByteBuffer buffer) {
     return buffer.get();
   }
 
+  /**
+   * Reads 1 byte from the buffer.
+   */
+  protected int readByteUnsigned(ByteBuffer buffer) {
+    return buffer.get() & 0xFF;
+  }
+
+  /**
+   * Fills byte array with data from the buffer.
+   */
+  protected byte[] readByteArray(ByteBuffer buffer) {
+    int size = readInt(buffer);
+    byte[] result = new byte[size];
+    buffer.get(result);
+    return result;
+  }
+
   /**
    * Fills byte array with data from the buffer.
    */
@@ -80,6 +97,14 @@ protected int readInt(ByteBuffer buffer) {
     return buffer.getInt();
   }
 
+  /**
+   * Reads 4 bytes from buffer.
+   */
+  protected long readIntUnsigned(ByteBuffer buffer) {
+    return buffer.getInt() & 0xFFFFFFFFL;
+  }
+
+
   /**
    * Reads 8 bytes from buffer.
    */
@@ -94,6 +119,13 @@ protected int readShort(ByteBuffer buffer) {
     return buffer.getShort();
   }
 
+  /**
+   * Reads 2 bytes from buffer.
+   */
+  protected int readShortUnsigned(ByteBuffer buffer) {
+    return buffer.getShort() & 0xFFFF;
+  }
+
   /**
    * Read a string from buffer.
    */
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
index 7bf754f6..fe3df43a 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
@@ -58,6 +58,13 @@ protected void writeFloat(ByteBuffer buffer, float value) {
     buffer.putFloat(value);
   }
 
+  /**
+   * Write 8 bytes to the buffer.
+   */
+  protected void writeDouble(ByteBuffer buffer, double value) {
+    buffer.putDouble(value);
+  }
+
   /**
    * Write 4 bytes to the buffer.
    */
@@ -79,6 +86,29 @@ protected void writeShort(ByteBuffer buffer, int value) {
     buffer.putShort((short) value);
   }
 
+  /**
+   * Writes bytes to the buffer.
+   */
+  protected void writeBytes(ByteBuffer buffer, byte[] bytes) {
+    buffer.put(bytes);
+  }
+
+  /**
+   * Writes bytes to the buffer.
+   */
+  protected void writeBytes(ByteBuffer buffer, byte[] bytes, int offset, int length) {
+    buffer.put(bytes, offset, length);
+  }
+
+  /**
+   * Writes bytes to the buffer.
+   */
+  protected void writeByteArray(ByteBuffer buffer, byte[] bytes) {
+    buffer.putInt(bytes.length);
+    buffer.put(bytes);
+  }
+
+
   /**
    * Writes the string to the buffer.
    */
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java b/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java
new file mode 100644
index 00000000..37b3219a
--- /dev/null
+++ b/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java
@@ -0,0 +1,173 @@
+package javasabr.rlib.network;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javasabr.rlib.network.packet.impl.AbstractReadableNetworkPacket;
+import javasabr.rlib.network.packet.impl.AbstractWritableNetworkPacket;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+class NetworkPacketTest {
+
+  @Builder
+  @ToString
+  @EqualsAndHashCode(exclude = {"byteArrayField", "bytesField1", "bytesField2"})
+  private static class TestReadablePacket extends AbstractReadableNetworkPacket {
+    private int byteField;
+    private int byteUnsignedField;
+    private int shortField;
+    private int shortUnsignedField;
+    private int intField;
+    private long intUnsignedField;
+    private long longField;
+    private float floatField;
+    private double doubleField;
+    private byte[] byteArrayField;
+    private byte[] bytesField1;
+    private byte[] bytesField2;
+    private String stringField;
+
+    @Override
+    protected void readImpl(ByteBuffer buffer) {
+      super.readImpl(buffer);
+      byteField = readByte(buffer);
+      byteUnsignedField = readByteUnsigned(buffer);
+      shortField = readShort(buffer);
+      shortUnsignedField = readShortUnsigned(buffer);
+      intField = readInt(buffer);
+      intUnsignedField = readIntUnsigned(buffer);
+      longField = readLong(buffer);
+      floatField = readFloat(buffer);
+      doubleField = readDouble(buffer);
+      byteArrayField = readByteArray(buffer);
+      int bytesCount = readInt(buffer);
+      bytesField1 = new byte[bytesCount];
+      readBytes(buffer, bytesField1);
+      bytesCount = readInt(buffer);
+      bytesField2 = new byte[bytesCount];
+      readBytes(buffer, bytesField2, 0, bytesCount);
+      stringField = readString(buffer, Integer.MAX_VALUE);
+    }
+  }
+
+  @Builder
+  private static class TestWritablePacket extends AbstractWritableNetworkPacket {
+    private int byteField;
+    private int byteUnsignedField;
+    private int shortField;
+    private int shortUnsignedField;
+    private int intField;
+    private long intUnsignedField;
+    private long longField;
+    private float floatField;
+    private double doubleField;
+    private byte[] byteArrayField;
+    private byte[] bytesField1;
+    private byte[] bytesField2;
+    private String stringField;
+
+    @Override
+    protected void writeImpl(ByteBuffer buffer) {
+      super.writeImpl(buffer);
+      writeByte(buffer, byteField);
+      writeByte(buffer, byteUnsignedField);
+      writeShort(buffer, shortField);
+      writeShort(buffer, shortUnsignedField);
+      writeInt(buffer, intField);
+      writeInt(buffer, (int) intUnsignedField);
+      writeLong(buffer, longField);
+      writeFloat(buffer, floatField);
+      writeDouble(buffer, doubleField);
+      writeByteArray(buffer, byteArrayField);
+      writeInt(buffer, bytesField1.length);
+      writeBytes(buffer, bytesField1);
+      writeInt(buffer, bytesField2.length);
+      writeBytes(buffer, bytesField2, 0, bytesField2.length);
+      writeString(buffer, stringField);
+    }
+  }
+
+  @Test
+  @DisplayName("should write packet correctly")
+  void shouldWritePacketCorrectly() {
+
+    // given:
+    TestWritablePacket packet = TestWritablePacket
+        .builder()
+        .byteField(100)
+        .byteUnsignedField(200)
+        .shortField(25600)
+        .shortUnsignedField(44000)
+        .intField(500_400)
+        .intUnsignedField(3_345_123_436L)
+        .longField(4_564_869_376L)
+        .floatField(1.55F)
+        .doubleField(5.23)
+        .byteArrayField(new byte[] {4, 6, 9})
+        .bytesField1(new byte[] {9, 1, 5, 8, 9})
+        .bytesField2(new byte[] {3, 1, 1, 8, 9, 9, 5})
+        .stringField("test string")
+        .build();
+
+    var buffer = ByteBuffer.allocate(256);
+    byte[] expected = {100, -56, 100, 0, -85, -32, 0, 7, -94, -80, -57, 98, -120, 108,
+                       0, 0, 0, 1, 16, 22, 97, 0, 63, -58, 102, 102, 64, 20, -21, -123,
+                       30, -72, 81, -20, 0, 0, 0, 3, 4, 6, 9, 0, 0, 0, 5, 9, 1, 5,
+                       8, 9, 0, 0, 0, 7, 3, 1, 1, 8, 9, 9, 5, 0, 0, 0, 11, 0, 116,
+                       0, 101, 0, 115, 0, 116, 0, 32, 0, 115, 0, 116, 0, 114, 0,
+                       105, 0, 110, 0, 103};
+
+    // when:
+    packet.write(buffer);
+    buffer.flip();
+
+    // then:
+    byte[] wroteBytes = Arrays.copyOf(buffer.array(), buffer.limit());
+    Assertions.assertArrayEquals(expected, wroteBytes);
+  }
+
+  @Test
+  @DisplayName("should read packet correctly")
+  void shouldReadPacketCorrectly() {
+
+    // given:
+    byte[] data = {100, -56, 100, 0, -85, -32, 0, 7, -94, -80, -57, 98, -120, 108,
+                   0, 0, 0, 1, 16, 22, 97, 0, 63, -58, 102, 102, 64, 20, -21, -123,
+                   30, -72, 81, -20, 0, 0, 0, 3, 4, 6, 9, 0, 0, 0, 5, 9, 1, 5,
+                   8, 9, 0, 0, 0, 7, 3, 1, 1, 8, 9, 9, 5, 0, 0, 0, 11, 0, 116,
+                   0, 101, 0, 115, 0, 116, 0, 32, 0, 115, 0, 116, 0, 114, 0,
+                   105, 0, 110, 0, 103};
+
+    TestReadablePacket packet = TestReadablePacket.builder().build();
+
+    TestReadablePacket expected = TestReadablePacket
+        .builder()
+        .byteField(100)
+        .byteUnsignedField(200)
+        .shortField(25600)
+        .shortUnsignedField(44000)
+        .intField(500_400)
+        .intUnsignedField(3_345_123_436L)
+        .longField(4_564_869_376L)
+        .floatField(1.55F)
+        .doubleField(5.23)
+        .byteArrayField(new byte[] {4, 6, 9})
+        .bytesField1(new byte[] {9, 1, 5, 8, 9})
+        .bytesField2(new byte[] {3, 1, 1, 8, 9, 9, 5})
+        .stringField("test string")
+        .build();
+
+    // when:
+    packet.read(ByteBuffer.wrap(data), data.length);
+
+    // then:
+    Assertions.assertEquals(expected, packet);
+    Assertions.assertArrayEquals(expected.byteArrayField, packet.byteArrayField);
+    Assertions.assertArrayEquals(expected.bytesField1, packet.bytesField1);
+    Assertions.assertArrayEquals(expected.bytesField2, packet.bytesField2);
+  }
+}

From 49518843120a2e62cb71dfe51f238b0b6d0fae48 Mon Sep 17 00:00:00 2001
From: javasabr <javasabr@gmail.com>
Date: Tue, 7 Oct 2025 20:34:29 +0200
Subject: [PATCH 2/6] redesign generics for network API

---
 .../rlib/network/StringNetworkLoadTest.java   | 10 ++--
 .../network/StringSslNetworkLoadTest.java     | 10 ++--
 .../javasabr/rlib/network/Connection.java     | 13 +++--
 .../java/javasabr/rlib/network/Network.java   |  2 +-
 .../javasabr/rlib/network/NetworkFactory.java | 12 ++--
 .../rlib/network/UnsafeConnection.java        |  6 +-
 .../rlib/network/client/ClientNetwork.java    |  2 +-
 .../client/impl/DefaultClientNetwork.java     |  3 +-
 .../rlib/network/impl/AbstractConnection.java | 43 +++++++-------
 .../rlib/network/impl/AbstractNetwork.java    |  2 +-
 .../network/impl/AbstractSslConnection.java   | 11 ++--
 .../network/impl/DefaultBufferAllocator.java  |  9 ---
 .../rlib/network/impl/DefaultConnection.java  | 11 ++--
 .../network/impl/DefaultDataConnection.java   | 15 ++---
 .../impl/DefaultDataSslConnection.java        | 15 ++---
 .../network/impl/IdBasedPacketConnection.java | 19 ++++---
 .../network/impl/PackedIdBasedConnection.java |  7 ++-
 .../network/impl/StringDataConnection.java    | 12 ++--
 .../network/impl/StringDataSslConnection.java | 13 +++--
 .../network/packet/IdBasedNetworkPacket.java  |  3 +-
 .../packet/IdBasedReadableNetworkPacket.java  |  5 +-
 .../packet/IdBasedWritableNetworkPacket.java  |  5 +-
 .../rlib/network/packet/NetworkPacket.java    |  4 +-
 .../network/packet/ReadableNetworkPacket.java |  5 +-
 .../packet/ReusableWritablePacket.java        |  3 +-
 .../network/packet/WritableNetworkPacket.java |  8 +--
 .../AbstractIdBasedReadableNetworkPacket.java |  5 +-
 .../packet/impl/AbstractNetworkPacket.java    |  8 ++-
 .../impl/AbstractNetworkPacketReader.java     |  7 ++-
 .../impl/AbstractNetworkPacketWriter.java     | 41 ++++++-------
 .../impl/AbstractReadableNetworkPacket.java   | 12 ++--
 ...AbstractReusableWritableNetworkPacket.java |  9 +--
 .../impl/AbstractSslNetworkPacketReader.java  |  9 +--
 .../impl/AbstractSslNetworkPacketWriter.java  | 17 +++---
 .../impl/AbstractWritableNetworkPacket.java   | 13 +++--
 .../impl/DefaultNetworkPacketReader.java      |  5 +-
 .../impl/DefaultNetworkPacketWriter.java      | 13 +++--
 .../impl/DefaultReadableNetworkPacket.java    |  4 +-
 .../impl/DefaultSslNetworkPacketReader.java   |  7 ++-
 .../impl/DefaultSslNetworkPacketWriter.java   | 15 ++---
 .../impl/DefaultWritableNetworkPacket.java    |  6 +-
 .../impl/IdBasedNetworkPacketWriter.java      | 11 ++--
 .../packet/impl/IdBasedPacketReader.java      |  9 +--
 .../packet/impl/SslWrapRequestPacket.java     | 11 ++--
 .../packet/impl/StringReadablePacket.java     |  5 +-
 .../impl/StringWritableNetworkPacket.java     |  9 +--
 .../packet/impl/WritablePacketWrapper.java    | 16 +++---
 .../ReadableNetworkPacketRegistry.java        | 18 +++---
 .../IdBasedReadableNetworkPacketRegistry.java | 15 ++---
 .../rlib/network/server/ServerNetwork.java    |  2 +-
 .../server/impl/DefaultServerNetwork.java     |  4 +-
 .../rlib/network/BaseNetworkTest.java         | 57 ++++++++++++++++---
 .../rlib/network/DefaultNetworkTest.java      | 26 ++++-----
 ...asedReadableNetworkPacketRegistryTest.java |  4 +-
 .../rlib/network/NetworkPacketTest.java       | 20 ++++---
 .../rlib/network/StringNetworkTest.java       | 20 +++----
 .../rlib/network/StringSslNetworkTest.java    | 30 +++++-----
 57 files changed, 384 insertions(+), 292 deletions(-)

diff --git a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
index 5b9922f9..64637178 100644
--- a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
+++ b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
@@ -77,7 +77,7 @@ void connectAndSendMessages(
             int delay = random.nextInt(MAX_SEND_DELAY);
             ScheduledFuture<?> schedule = executor.schedule(
                 () -> {
-                  StringWritableNetworkPacket message = newMessage(10, 10240);
+                  var message = newMessage(10, 10240);
                   connection.send(message);
                 }, delay, TimeUnit.MILLISECONDS);
             tasks.add(schedule);
@@ -144,7 +144,7 @@ void testServerWithMultiplyClients() {
           statistics
               .receivedClientPackersPerSecond()
               .accumulate(1);
-          connection.send(new StringWritableNetworkPacket("Echo: " + packet.data()));
+          connection.send(new StringWritableNetworkPacket<>("Echo: " + packet.data()));
           statistics
               .sentEchoPackersPerSecond()
               .accumulate(1);
@@ -200,7 +200,9 @@ private static void initReceivedMessagesTracker(
     }, 1, 1, TimeUnit.SECONDS);
   }
 
-  private static StringWritableNetworkPacket newMessage(int minMessageLength, int maxMessageLength) {
-    return new StringWritableNetworkPacket(StringUtils.generate(minMessageLength, maxMessageLength));
+  private static StringWritableNetworkPacket<StringDataConnection> newMessage(
+      int minMessageLength,
+      int maxMessageLength) {
+    return new StringWritableNetworkPacket<>(StringUtils.generate(minMessageLength, maxMessageLength));
   }
 }
diff --git a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
index 1338f13d..5480fee3 100644
--- a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
+++ b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
@@ -83,7 +83,7 @@ void connectAndSendMessages(
             int delay = random.nextInt(MAX_SEND_DELAY);
             ScheduledFuture<?> schedule = executor.schedule(
                 () -> {
-                  StringWritableNetworkPacket message = newMessage(10, 10240); // 10240
+                  var message = newMessage(10, 10240); // 10240
                   connection.send(message);
                 }, delay, TimeUnit.MILLISECONDS);
             tasks.add(schedule);
@@ -156,7 +156,7 @@ void testServerWithMultiplyClients() {
           statistics
               .receivedClientPackersPerSecond()
               .accumulate(1);
-          connection.send(new StringWritableNetworkPacket("Echo: " + packet.data()));
+          connection.send(new StringWritableNetworkPacket<>("Echo: " + packet.data()));
           statistics
               .sentEchoPackersPerSecond()
               .accumulate(1);
@@ -215,7 +215,9 @@ private static void initReceivedMessagesTracker(
     }, 1, 1, TimeUnit.SECONDS);
   }
 
-  private static StringWritableNetworkPacket newMessage(int minMessageLength, int maxMessageLength) {
-    return new StringWritableNetworkPacket(StringUtils.generate(minMessageLength, maxMessageLength));
+  private static StringWritableNetworkPacket<StringDataSslConnection> newMessage(
+      int minMessageLength,
+      int maxMessageLength) {
+    return new StringWritableNetworkPacket<>(StringUtils.generate(minMessageLength, maxMessageLength));
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/Connection.java b/rlib-network/src/main/java/javasabr/rlib/network/Connection.java
index af7eb4bc..79bfbc06 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/Connection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/Connection.java
@@ -11,11 +11,12 @@
  *
  * @author JavaSaBr
  */
-public interface Connection<R extends ReadableNetworkPacket, W extends WritableNetworkPacket> {
-
-  record ReceivedPacketEvent<C extends Connection<?, ?>, R extends ReadableNetworkPacket>(
-      C connection, R packet) {
+public interface Connection<
+    R extends ReadableNetworkPacket<C>,
+    W extends WritableNetworkPacket<C>,
+    C extends Connection<R, W, C>> {
 
+  record ReceivedPacketEvent<C, R>(C connection, R packet) {
     @Override
     public String toString() {
       return "[" + connection + "|" + packet + ']';
@@ -57,12 +58,12 @@ public String toString() {
   /**
    * Register a consumer to handle received packets.
    */
-  void onReceive(BiConsumer<? super Connection<R, W>, ? super R> consumer);
+  void onReceive(BiConsumer<C, ? super R> consumer);
 
   /**
    * Get a stream of received packet events.
    */
-  Flux<ReceivedPacketEvent<? extends Connection<R, W>, ? extends R>> receivedEvents();
+  Flux<ReceivedPacketEvent<C, ? extends R>> receivedEvents();
 
   /**
    * Get a stream of received packets.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/Network.java b/rlib-network/src/main/java/javasabr/rlib/network/Network.java
index 1778af27..9422c8f2 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/Network.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/Network.java
@@ -5,7 +5,7 @@
  *
  * @author JavaSaBr
  */
-public interface Network<C extends Connection<?, ?>> {
+public interface Network<C extends Connection<?, ?, C>> {
 
   /**
    * Shutdown this network.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java b/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java
index 5d27f4b8..dcf5680d 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java
@@ -23,13 +23,13 @@
 @UtilityClass
 public final class NetworkFactory {
 
-  public static <C extends UnsafeConnection<?, ?>> ClientNetwork<C> clientNetwork(
+  public static <C extends UnsafeConnection<?, ?, C>> ClientNetwork<C> clientNetwork(
       NetworkConfig networkConfig,
       BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection) {
     return new DefaultClientNetwork<>(networkConfig, channelToConnection);
   }
 
-  public static <C extends UnsafeConnection<?, ?>> ServerNetwork<C> serverNetwork(
+  public static <C extends UnsafeConnection<?, ?, C>> ServerNetwork<C> serverNetwork(
       ServerNetworkConfig networkConfig,
       BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection) {
     return new DefaultServerNetwork<>(networkConfig, channelToConnection);
@@ -65,7 +65,7 @@ public static ClientNetwork<StringDataConnection> stringDataClientNetwork(
    * Create id based packet default asynchronous client network.
    */
   public static ClientNetwork<DefaultConnection> defaultClientNetwork(
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> packetRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
     return defaultClientNetwork(
         NetworkConfig.DEFAULT_CLIENT,
         new DefaultBufferAllocator(NetworkConfig.DEFAULT_CLIENT),
@@ -78,7 +78,7 @@ public static ClientNetwork<DefaultConnection> defaultClientNetwork(
   public static ClientNetwork<DefaultConnection> defaultClientNetwork(
       NetworkConfig networkConfig,
       BufferAllocator bufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> packetRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
     return clientNetwork(
         networkConfig,
         (network, channel) -> new DefaultConnection(network, channel, bufferAllocator, packetRegistry));
@@ -139,7 +139,7 @@ public static ServerNetwork<StringDataSslConnection> stringDataSslServerNetwork(
    * Create id based packet default asynchronous server network.
    */
   public static ServerNetwork<DefaultConnection> defaultServerNetwork(
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> packetRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
     return defaultServerNetwork(
         ServerNetworkConfig.DEFAULT_SERVER,
         new DefaultBufferAllocator(ServerNetworkConfig.DEFAULT_SERVER),
@@ -152,7 +152,7 @@ public static ServerNetwork<DefaultConnection> defaultServerNetwork(
   public static ServerNetwork<DefaultConnection> defaultServerNetwork(
       ServerNetworkConfig networkConfig,
       BufferAllocator bufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> packetRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
     return serverNetwork(
         networkConfig,
         (network, channel) -> new DefaultConnection(network, channel, bufferAllocator, packetRegistry));
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
index 7447fc97..80ff54b9 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
@@ -3,8 +3,10 @@
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import javasabr.rlib.network.packet.WritableNetworkPacket;
 
-public interface UnsafeConnection<R extends ReadableNetworkPacket, W extends WritableNetworkPacket>
-    extends Connection<R, W> {
+public interface UnsafeConnection<
+    R extends ReadableNetworkPacket<C>,
+    W extends WritableNetworkPacket<C>,
+    C extends Connection<R, W, C>> extends Connection<R, W, C> {
 
   void onConnected();
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java
index e8a4b7ed..c2384004 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java
@@ -13,7 +13,7 @@
  *
  * @author JavaSaBr
  */
-public interface ClientNetwork<C extends Connection<?, ?>> extends Network<C> {
+public interface ClientNetwork<C extends Connection<?, ?, C>> extends Network<C> {
 
   /**
    * Connect to a server by the address.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
index b682fed9..71c210c6 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
@@ -33,7 +33,8 @@
 @CustomLog
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class DefaultClientNetwork<C extends Connection<?, ?>> extends AbstractNetwork<C> implements ClientNetwork<C> {
+public class DefaultClientNetwork<C extends Connection<?, ?, C>> extends AbstractNetwork<C>
+    implements ClientNetwork<C> {
 
   final AtomicBoolean connecting;
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
index 26c78c55..931cc74a 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
@@ -39,11 +39,14 @@
 @CustomLog
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractConnection<R extends ReadableNetworkPacket, W extends WritableNetworkPacket> implements
-    UnsafeConnection<R, W> {
+public abstract class AbstractConnection<
+    R extends ReadableNetworkPacket<C>,
+    W extends WritableNetworkPacket<C>,
+    C extends AbstractConnection<R, W, C>> implements UnsafeConnection<R, W, C> {
 
-  private static class WritablePacketWithFeedback<W extends WritableNetworkPacket> extends
-      WritablePacketWrapper<CompletableFuture<Boolean>, W> {
+  private static class WritablePacketWithFeedback<
+      W extends WritableNetworkPacket<C>,
+      C extends Connection> extends WritablePacketWrapper<CompletableFuture<Boolean>, W, C> {
 
     public WritablePacketWithFeedback(CompletableFuture<Boolean> attachment, W packet) {
       super(attachment, packet);
@@ -53,16 +56,16 @@ public WritablePacketWithFeedback(CompletableFuture<Boolean> attachment, W packe
   @Getter
   final String remoteAddress;
 
-  final Network<? extends Connection<R, W>> network;
+  final Network<C> network;
   final BufferAllocator bufferAllocator;
   final AsynchronousSocketChannel channel;
-  final Deque<WritableNetworkPacket> pendingPackets;
+  final Deque<WritableNetworkPacket<C>> pendingPackets;
   final StampedLock lock;
 
   final AtomicBoolean isWriting;
   final AtomicBoolean closed;
 
-  final MutableArray<BiConsumer<? super Connection<R, W>, ? super R>> subscribers;
+  final MutableArray<BiConsumer<C, ? super R>> subscribers;
 
   final int maxPacketsByRead;
 
@@ -70,7 +73,7 @@ public WritablePacketWithFeedback(CompletableFuture<Boolean> attachment, W packe
   volatile long lastActivity;
 
   public AbstractConnection(
-      Network<? extends Connection<R, W>> network,
+      Network<C> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       int maxPacketsByRead) {
@@ -94,13 +97,13 @@ public void onConnected() {}
   protected abstract NetworkPacketWriter packetWriter();
 
   @Override
-  public void onReceive(BiConsumer<? super Connection<R, W>, ? super R> consumer) {
+  public void onReceive(BiConsumer<C, ? super R> consumer) {
     subscribers.add(consumer);
     packetReader().startRead();
   }
 
   @Override
-  public Flux<ReceivedPacketEvent<? extends Connection<R, W>, ? extends R>> receivedEvents() {
+  public Flux<ReceivedPacketEvent<C, ? extends R>> receivedEvents() {
     return Flux.create(this::registerFluxOnReceivedEvents);
   }
 
@@ -110,9 +113,9 @@ public Flux<? extends R> receivedPackets() {
   }
 
   protected void registerFluxOnReceivedEvents(
-      FluxSink<ReceivedPacketEvent<? extends Connection<R, W>, ? extends R>> sink) {
+      FluxSink<ReceivedPacketEvent<C, ? extends R>> sink) {
 
-    BiConsumer<Connection<R, W>, R> listener =
+    BiConsumer<C, R> listener =
       (connection, packet) -> sink.next(new ReceivedPacketEvent<>(connection,
         packet));
 
@@ -122,13 +125,13 @@ protected void registerFluxOnReceivedEvents(
   }
 
   protected void registerFluxOnReceivedPackets(FluxSink<? super R> sink) {
-    BiConsumer<Connection<R, W>, R> listener = (connection, packet) -> sink.next(packet);
+    BiConsumer<C, R> listener = (connection, packet) -> sink.next(packet);
     onReceive(listener);
     sink.onDispose(() -> subscribers.remove(listener));
   }
 
   @Nullable
-  protected WritableNetworkPacket nextPacketToWrite() {
+  protected WritableNetworkPacket<C> nextPacketToWrite() {
     long stamp = lock.writeLock();
     try {
       return pendingPackets.poll();
@@ -168,18 +171,18 @@ public boolean closed() {
     return closed.get();
   }
 
-  protected void serializedPacket(WritableNetworkPacket packet) {}
+  protected void serializedPacket(WritableNetworkPacket<?> packet) {}
 
   protected void handleReceivedPacket(R packet) {
     log.debug(packet, remoteAddress, "Handle received packet:[%s] from:[%s]"::formatted);
     subscribers
         .iterations()
-        .forEach(this, packet, BiConsumer::accept);
+        .forEach((C) this, packet, BiConsumer::accept);
   }
 
-  protected void handleSentPacket(WritableNetworkPacket packet, boolean result) {
+  protected void handleSentPacket(WritableNetworkPacket<?> packet, boolean result) {
     if (packet instanceof WritablePacketWithFeedback) {
-      ((WritablePacketWithFeedback<W>) packet)
+      ((WritablePacketWithFeedback<?, ?>) packet)
           .getAttachment()
           .complete(result);
     }
@@ -190,7 +193,7 @@ public final void send(W packet) {
     sendImpl(packet);
   }
 
-  protected void sendImpl(WritableNetworkPacket packet) {
+  protected void sendImpl(WritableNetworkPacket<C> packet) {
 
     if (closed()) {
       return;
@@ -206,7 +209,7 @@ protected void sendImpl(WritableNetworkPacket packet) {
     packetWriter().tryToSendNextPacket();
   }
 
-  protected void queueAtFirst(WritableNetworkPacket packet) {
+  protected void queueAtFirst(WritableNetworkPacket<C> packet) {
     long stamp = lock.writeLock();
     try {
       pendingPackets.addFirst(packet);
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
index 592fc997..4e6e179b 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
@@ -18,7 +18,7 @@
 @CustomLog
 @RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
-public abstract class AbstractNetwork<C extends Connection<?, ?>> implements Network<C> {
+public abstract class AbstractNetwork<C extends Connection<?, ?, C>> implements Network<C> {
   NetworkConfig config;
   BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection;
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSslConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSslConnection.java
index d88aab8b..5fef9d9d 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSslConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSslConnection.java
@@ -2,7 +2,6 @@
 
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import javasabr.rlib.network.packet.WritableNetworkPacket;
@@ -13,13 +12,15 @@
 import lombok.experimental.FieldDefaults;
 
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractSslConnection<R extends ReadableNetworkPacket, W extends WritableNetworkPacket>
-    extends AbstractConnection<R, W> {
+public abstract class AbstractSslConnection<
+    R extends ReadableNetworkPacket<C>,
+    W extends WritableNetworkPacket<C>,
+    C extends AbstractSslConnection<R, W, C>> extends AbstractConnection<R, W, C> {
 
   final SSLEngine sslEngine;
 
   public AbstractSslConnection(
-      Network<? extends Connection<R, W>> network,
+      Network<C> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       SSLContext sslContext,
@@ -36,7 +37,7 @@ public AbstractSslConnection(
   }
 
   @Override
-  protected void sendImpl(WritableNetworkPacket packet) {
+  protected void sendImpl(WritableNetworkPacket<C> packet) {
     super.sendImpl(packet);
     packetReader().startRead();
   }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java
index a23fe361..5c0d395a 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java
@@ -3,8 +3,6 @@
 import java.nio.ByteBuffer;
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.NetworkConfig;
-import javasabr.rlib.reusable.pool.Pool;
-import javasabr.rlib.reusable.pool.PoolFactory;
 import lombok.AccessLevel;
 import lombok.CustomLog;
 import lombok.ToString;
@@ -20,17 +18,10 @@
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
 public class DefaultBufferAllocator implements BufferAllocator {
 
-  final Pool<ByteBuffer> readBufferPool;
-  final Pool<ByteBuffer> pendingBufferPool;
-  final Pool<ByteBuffer> writeBufferPool;
-
   final NetworkConfig config;
 
   public DefaultBufferAllocator(NetworkConfig config) {
     this.config = config;
-    this.readBufferPool = PoolFactory.newLockBasePool(ByteBuffer.class);
-    this.pendingBufferPool = PoolFactory.newLockBasePool(ByteBuffer.class);
-    this.writeBufferPool = PoolFactory.newLockBasePool(ByteBuffer.class);
   }
 
   @Override
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java
index 26a404ad..04659f7f 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java
@@ -2,7 +2,6 @@
 
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.impl.DefaultReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.DefaultWritableNetworkPacket;
@@ -11,14 +10,16 @@
 /**
  * @author JavaSaBr
  */
-public class DefaultConnection extends
-    IdBasedPacketConnection<DefaultReadableNetworkPacket, DefaultWritableNetworkPacket> {
+public class DefaultConnection extends IdBasedPacketConnection<
+    DefaultReadableNetworkPacket,
+    DefaultWritableNetworkPacket,
+    DefaultConnection> {
 
   public DefaultConnection(
-      Network<? extends Connection<DefaultReadableNetworkPacket, DefaultWritableNetworkPacket>> network,
+      Network<DefaultConnection> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> packetRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
     super(network, channel, bufferAllocator, packetRegistry, 100, 2, 2);
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java
index 8d6667cc..78acf98d 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java
@@ -2,7 +2,6 @@
 
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.NetworkPacketReader;
 import javasabr.rlib.network.packet.NetworkPacketWriter;
@@ -21,8 +20,10 @@
 @Getter(AccessLevel.PROTECTED)
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class DefaultDataConnection<R extends ReadableNetworkPacket, W extends WritableNetworkPacket>
-    extends AbstractConnection<R, W> {
+public abstract class DefaultDataConnection<
+    R extends ReadableNetworkPacket<C>,
+    W extends WritableNetworkPacket<C>,
+    C extends DefaultDataConnection<R, W, C>> extends AbstractConnection<R, W, C> {
 
   final NetworkPacketReader packetReader;
   final NetworkPacketWriter packetWriter;
@@ -30,7 +31,7 @@ public abstract class DefaultDataConnection<R extends ReadableNetworkPacket, W e
   final int packetLengthHeaderSize;
 
   public DefaultDataConnection(
-      Network<? extends Connection<R, W>> network,
+      Network<C> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       int maxPacketsByRead,
@@ -43,7 +44,7 @@ public DefaultDataConnection(
 
   protected NetworkPacketReader createPacketReader() {
     return new DefaultNetworkPacketReader<>(
-        this,
+        (C) this,
         channel,
         bufferAllocator,
         this::updateLastActivity,
@@ -54,8 +55,8 @@ protected NetworkPacketReader createPacketReader() {
   }
 
   protected NetworkPacketWriter createPacketWriter() {
-    return new DefaultNetworkPacketWriter<W, Connection<R, W>>(
-        this,
+    return new DefaultNetworkPacketWriter<>(
+        (C) this,
         channel,
         bufferAllocator,
         this::updateLastActivity,
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSslConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSslConnection.java
index 2708e94a..8f7c9283 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSslConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSslConnection.java
@@ -2,7 +2,6 @@
 
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.NetworkPacketReader;
 import javasabr.rlib.network.packet.NetworkPacketWriter;
@@ -22,8 +21,10 @@
 @Getter(AccessLevel.PROTECTED)
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class DefaultDataSslConnection<R extends ReadableNetworkPacket, W extends WritableNetworkPacket>
-    extends AbstractSslConnection<R, W> {
+public abstract class DefaultDataSslConnection<
+    R extends ReadableNetworkPacket<C>,
+    W extends WritableNetworkPacket<C>,
+    C extends DefaultDataSslConnection<R, W, C>> extends AbstractSslConnection<R, W, C> {
 
   final NetworkPacketReader packetReader;
   final NetworkPacketWriter packetWriter;
@@ -31,7 +32,7 @@ public abstract class DefaultDataSslConnection<R extends ReadableNetworkPacket,
   final int packetLengthHeaderSize;
 
   public DefaultDataSslConnection(
-      Network<? extends Connection<R, W>> network,
+      Network<C> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       SSLContext sslContext,
@@ -46,7 +47,7 @@ public DefaultDataSslConnection(
 
   protected NetworkPacketReader createPacketReader() {
     return new DefaultSslNetworkPacketReader<>(
-        this,
+        (C) this,
         channel,
         bufferAllocator,
         this::updateLastActivity,
@@ -59,8 +60,8 @@ protected NetworkPacketReader createPacketReader() {
   }
 
   protected NetworkPacketWriter createPacketWriter() {
-    return new DefaultSslNetworkPacketWriter<W, Connection<R, W>>(
-        this,
+    return new DefaultSslNetworkPacketWriter<>(
+        (C) this,
         channel,
         bufferAllocator,
         this::updateLastActivity,
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java
index d71d528a..a1b09c61 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java
@@ -2,7 +2,6 @@
 
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.IdBasedReadableNetworkPacket;
 import javasabr.rlib.network.packet.IdBasedWritableNetworkPacket;
@@ -22,21 +21,23 @@
 @Getter(AccessLevel.PROTECTED)
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class IdBasedPacketConnection<R extends IdBasedReadableNetworkPacket<R>, W extends IdBasedWritableNetworkPacket>
-    extends AbstractConnection<R, W> {
+public class IdBasedPacketConnection<
+    R extends IdBasedReadableNetworkPacket<R, C>,
+    W extends IdBasedWritableNetworkPacket<C>,
+    C extends IdBasedPacketConnection<R, W, C>> extends AbstractConnection<R, W, C> {
 
   final NetworkPacketReader packetReader;
   final NetworkPacketWriter packetWriter;
-  final ReadableNetworkPacketRegistry<R> packetRegistry;
+  final ReadableNetworkPacketRegistry<R, C> packetRegistry;
 
   final int packetLengthHeaderSize;
   final int packetIdHeaderSize;
 
   public IdBasedPacketConnection(
-      Network<? extends Connection<R, W>> network,
+      Network<C> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
-      ReadableNetworkPacketRegistry<R> packetRegistry,
+      ReadableNetworkPacketRegistry<R, C> packetRegistry,
       int maxPacketsByRead,
       int packetLengthHeaderSize,
       int packetIdHeaderSize) {
@@ -50,7 +51,7 @@ public IdBasedPacketConnection(
 
   protected NetworkPacketReader createPacketReader() {
     return new IdBasedPacketReader<>(
-        this,
+        (C) this,
         channel,
         bufferAllocator,
         this::updateLastActivity,
@@ -63,11 +64,11 @@ protected NetworkPacketReader createPacketReader() {
 
   protected NetworkPacketWriter createPacketWriter() {
     return new IdBasedNetworkPacketWriter<>(
-        this,
+        (C) this,
         channel,
         bufferAllocator,
         this::updateLastActivity,
-        this::nextPacketToWrite,
+        () -> nextPacketToWrite(),
         this::serializedPacket,
         this::handleSentPacket,
         packetLengthHeaderSize,
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java
index 9589f06e..5a598582 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java
@@ -1,13 +1,18 @@
 package javasabr.rlib.network.impl;
 
 import javasabr.rlib.network.Connection;
+import javasabr.rlib.network.packet.ReadableNetworkPacket;
+import javasabr.rlib.network.packet.WritableNetworkPacket;
 
 /**
  * The interface to implement a packet id based async connection.
  *
  * @author JavaSaBr
  */
-public interface PackedIdBasedConnection extends Connection {
+public interface PackedIdBasedConnection<
+    R extends ReadableNetworkPacket<C>,
+    W extends WritableNetworkPacket<C>,
+    C extends Connection<R, W, C>> extends Connection<R, W, C> {
 
   /**
    * Get length of packet's header with packet's data length.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java
index 52d61ea9..27faff18 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java
@@ -2,7 +2,6 @@
 
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.impl.StringReadablePacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
@@ -10,17 +9,20 @@
 /**
  * @author JavaSaBr
  */
-public class StringDataConnection extends DefaultDataConnection<StringReadablePacket, StringWritableNetworkPacket> {
+public class StringDataConnection extends DefaultDataConnection<
+    StringReadablePacket<StringDataConnection>,
+    StringWritableNetworkPacket<StringDataConnection>,
+    StringDataConnection> {
 
   public StringDataConnection(
-      Network<? extends Connection<StringReadablePacket, StringWritableNetworkPacket>> network,
+      Network<StringDataConnection> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator) {
     super(network, channel, bufferAllocator, 100, 2);
   }
 
   @Override
-  protected StringReadablePacket createReadablePacket() {
-    return new StringReadablePacket();
+  protected StringReadablePacket<StringDataConnection> createReadablePacket() {
+    return new StringReadablePacket<>();
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
index c97363da..b61488e0 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
@@ -2,7 +2,6 @@
 
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.impl.StringReadablePacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
@@ -11,11 +10,13 @@
 /**
  * @author JavaSaBr
  */
-public class StringDataSslConnection extends
-    DefaultDataSslConnection<StringReadablePacket, StringWritableNetworkPacket> {
+public class StringDataSslConnection extends DefaultDataSslConnection<
+    StringReadablePacket<StringDataSslConnection>,
+    StringWritableNetworkPacket<StringDataSslConnection>,
+    StringDataSslConnection> {
 
   public StringDataSslConnection(
-      Network<? extends Connection<StringReadablePacket, StringWritableNetworkPacket>> network,
+      Network<StringDataSslConnection> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       SSLContext sslContext,
@@ -24,7 +25,7 @@ public StringDataSslConnection(
   }
 
   @Override
-  protected StringReadablePacket createReadablePacket() {
-    return new StringReadablePacket();
+  protected StringReadablePacket<StringDataSslConnection> createReadablePacket() {
+    return new StringReadablePacket<>();
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedNetworkPacket.java
index cf32dfd3..ae0210aa 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedNetworkPacket.java
@@ -1,11 +1,12 @@
 package javasabr.rlib.network.packet;
 
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.annotation.NetworkPacketDescription;
 
 /**
  * @author JavaSaBr
  */
-public interface IdBasedNetworkPacket extends NetworkPacket {
+public interface IdBasedNetworkPacket<C extends Connection> extends NetworkPacket<C> {
 
   /**
    * Get id of this packet.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadableNetworkPacket.java
index 9f3fa344..6a82364a 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadableNetworkPacket.java
@@ -6,8 +6,9 @@
 /**
  * @author JavaSaBr
  */
-public interface IdBasedReadableNetworkPacket<S extends IdBasedReadableNetworkPacket<S>>
-    extends ReadableNetworkPacket, IdBasedNetworkPacket {
+public interface IdBasedReadableNetworkPacket<
+    S extends IdBasedReadableNetworkPacket<S, C>,
+    C extends Connection> extends ReadableNetworkPacket<C>, IdBasedNetworkPacket<C> {
 
   /**
    * Create a new instance of this type.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritableNetworkPacket.java
index d157e6eb..93f6ece6 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritableNetworkPacket.java
@@ -1,7 +1,10 @@
 package javasabr.rlib.network.packet;
 
+import javasabr.rlib.network.Connection;
+
 /**
  * @author JavaSaBr
  */
-public interface IdBasedWritableNetworkPacket extends WritableNetworkPacket, IdBasedNetworkPacket {
+public interface IdBasedWritableNetworkPacket<C extends Connection>
+    extends WritableNetworkPacket<C>, IdBasedNetworkPacket<C> {
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/NetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/NetworkPacket.java
index 5ee76d47..7110f4c3 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/NetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/NetworkPacket.java
@@ -1,11 +1,13 @@
 package javasabr.rlib.network.packet;
 
+import javasabr.rlib.network.Connection;
+
 /**
  * The interface to implement a network packet.
  *
  * @author JavaSaBr
  */
-public interface NetworkPacket {
+public interface NetworkPacket<C extends Connection> {
 
   /**
    * @return the packet's name.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadableNetworkPacket.java
index 9438e58a..e0d45fd1 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadableNetworkPacket.java
@@ -1,13 +1,14 @@
 package javasabr.rlib.network.packet;
 
 import java.nio.ByteBuffer;
+import javasabr.rlib.network.Connection;
 
 /**
  * The interface to implement a readable network packet.
  *
  * @author JavaSaBr
  */
-public interface ReadableNetworkPacket extends NetworkPacket {
+public interface ReadableNetworkPacket<C extends Connection> extends NetworkPacket<C> {
 
   /**
    * Read packet's data from byte buffer.
@@ -16,5 +17,5 @@ public interface ReadableNetworkPacket extends NetworkPacket {
    * @param remainingDataLength the expected remaining data length.
    * @return true if reading was success.
    */
-  boolean read(ByteBuffer buffer, int remainingDataLength);
+  boolean read(C connection, ByteBuffer buffer, int remainingDataLength);
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java
index bfbc96ba..b9209685 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java
@@ -1,5 +1,6 @@
 package javasabr.rlib.network.packet;
 
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.reusable.Reusable;
 import javasabr.rlib.reusable.pool.Pool;
 
@@ -8,7 +9,7 @@
  *
  * @author JavaSaBr
  */
-public interface ReusableWritablePacket extends WritableNetworkPacket, Reusable {
+public interface ReusableWritablePacket<C extends Connection> extends WritableNetworkPacket<C>, Reusable {
 
   /**
    * Handle completion of packet sending.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
index 91b997b6..157b0887 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
@@ -1,26 +1,26 @@
 package javasabr.rlib.network.packet;
 
 import java.nio.ByteBuffer;
-
+import javasabr.rlib.network.Connection;
 
 /**
  * Interface to implement a writable packet.
  *
  * @author JavaSaBr
  */
-public interface WritableNetworkPacket extends NetworkPacket {
+public interface WritableNetworkPacket<C extends Connection> extends NetworkPacket<C> {
 
   /**
    * Write this packet to the buffer.
    *
    * @return true if writing was successful.
    */
-  boolean write(ByteBuffer buffer);
+  boolean write(C connection, ByteBuffer buffer);
 
   /**
    * @return expected data length of this packet or -1.
    */
-  default int expectedLength() {
+  default int expectedLength(C connection) {
     return -1;
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadableNetworkPacket.java
index 0c57eeef..29d026a8 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadableNetworkPacket.java
@@ -1,10 +1,11 @@
 package javasabr.rlib.network.packet.impl;
 
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.IdBasedReadableNetworkPacket;
 
 /**
  * @author JavaSaBr
  */
-public abstract class AbstractIdBasedReadableNetworkPacket<S extends AbstractIdBasedReadableNetworkPacket<S>>
-    extends AbstractReadableNetworkPacket implements IdBasedReadableNetworkPacket<S> {
+public abstract class AbstractIdBasedReadableNetworkPacket<S extends AbstractIdBasedReadableNetworkPacket<S, C>, C extends Connection>
+    extends AbstractReadableNetworkPacket<C> implements IdBasedReadableNetworkPacket<S, C> {
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacket.java
index d42f0d3c..50246670 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacket.java
@@ -3,6 +3,7 @@
 import static javasabr.rlib.network.util.NetworkUtils.hexDump;
 
 import java.nio.ByteBuffer;
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.NetworkPacket;
 import lombok.CustomLog;
 
@@ -12,12 +13,12 @@
  * @author JavaSaBr
  */
 @CustomLog
-public abstract class AbstractNetworkPacket implements NetworkPacket {
+public abstract class AbstractNetworkPacket<C extends Connection> implements NetworkPacket<C> {
 
   /**
    * Handles packet data exception.
    */
-  protected void handleException(ByteBuffer buffer, Exception exception) {
+  protected void handleException(C connection, ByteBuffer buffer, Exception exception) {
     log.warning(exception);
     if (!log.warningEnabled()) {
       return;
@@ -33,7 +34,8 @@ protected void handleException(ByteBuffer buffer, Exception exception) {
       hexDump = hexDump(buffer.array(), buffer.position(), buffer.limit());
     }
 
-    log.warning(name(), buffer, hexDump, "[%s] -> buffer:[%s]\n[%s]"::formatted);
+    log.warning(connection.remoteAddress(), name(), buffer, hexDump,
+        "[%s] Hexdump for:[%s] -> buffer:[%s]\n[%s]"::formatted);
   }
 
   @Override
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
index 567822a8..18cfa6ad 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
@@ -27,8 +27,9 @@
 @CustomLog
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractNetworkPacketReader<R extends ReadableNetworkPacket, C extends Connection<R, ?>>
-    implements NetworkPacketReader {
+public abstract class AbstractNetworkPacketReader<
+    R extends ReadableNetworkPacket<C>,
+    C extends Connection<R, ?, C>> implements NetworkPacketReader {
 
   final CompletionHandler<Integer, ByteBuffer> readChannelHandler = new CompletionHandler<>() {
 
@@ -287,7 +288,7 @@ else if (packetFullLength > tempBigBuffer.capacity()) {
   }
 
   protected void readAndHandlePacket(ByteBuffer bufferToRead, int remainingDataLength, R packetInstance) {
-    if (packetInstance.read(bufferToRead, remainingDataLength)) {
+    if (packetInstance.read(connection, bufferToRead, remainingDataLength)) {
       packetHandler.accept(packetInstance);
     } else {
       log.error(remoteAddress(), packetInstance,
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
index d2660ea7..699e0ba9 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
@@ -31,18 +31,19 @@
 @RequiredArgsConstructor
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractNetworkPacketWriter<W extends WritableNetworkPacket, C extends Connection<?, W>>
-    implements NetworkPacketWriter {
+public abstract class AbstractNetworkPacketWriter<
+    W extends WritableNetworkPacket<C>,
+    C extends Connection<?, W, C>> implements NetworkPacketWriter {
 
-  final CompletionHandler<Integer, @Nullable WritableNetworkPacket> writeHandler = new CompletionHandler<>() {
+  final CompletionHandler<Integer, @Nullable WritableNetworkPacket<C>> writeHandler = new CompletionHandler<>() {
 
     @Override
-    public void completed(Integer result, @Nullable WritableNetworkPacket packet) {
+    public void completed(Integer result, @Nullable WritableNetworkPacket<C> packet) {
       handleSuccessfulWritingData(result, packet);
     }
 
     @Override
-    public void failed(Throwable exc, @Nullable WritableNetworkPacket packet) {
+    public void failed(Throwable exc, @Nullable WritableNetworkPacket<C> packet) {
       handleFailedWritingData(exc, packet);
     }
   };
@@ -64,18 +65,18 @@ public void failed(Throwable exc, @Nullable WritableNetworkPacket packet) {
   volatile ByteBuffer writingBuffer = EMPTY_BUFFER;
 
   final Runnable updateActivityFunction;
-  final Supplier<@Nullable WritableNetworkPacket> writablePacketProvider;
-  final ObjBoolConsumer<WritableNetworkPacket> sentPacketHandler;
-  final Consumer<WritableNetworkPacket> serializedToChannelPacketHandler;
+  final Supplier<@Nullable WritableNetworkPacket<C>> writablePacketProvider;
+  final ObjBoolConsumer<WritableNetworkPacket<C>> sentPacketHandler;
+  final Consumer<WritableNetworkPacket<C>> serializedToChannelPacketHandler;
 
   public AbstractNetworkPacketWriter(
       C connection,
       AsynchronousSocketChannel socketChannel,
       BufferAllocator bufferAllocator,
       Runnable updateActivityFunction,
-      Supplier<@Nullable WritableNetworkPacket> packetProvider,
-      Consumer<WritableNetworkPacket> serializedToChannelPacketHandler,
-      ObjBoolConsumer<WritableNetworkPacket> sentPacketHandler) {
+      Supplier<@Nullable WritableNetworkPacket<C>> packetProvider,
+      Consumer<WritableNetworkPacket<C>> serializedToChannelPacketHandler,
+      ObjBoolConsumer<WritableNetworkPacket<C>> sentPacketHandler) {
     this.connection = connection;
     this.socketChannel = socketChannel;
     this.bufferAllocator = bufferAllocator;
@@ -125,7 +126,9 @@ protected boolean tryToSendNextPacketImpl() {
     return false;
   }
 
-  protected boolean writeBuffer(ByteBuffer resultBuffer, @Nullable WritableNetworkPacket nextPacket) {
+  protected boolean writeBuffer(
+      ByteBuffer resultBuffer,
+      @Nullable WritableNetworkPacket<C> nextPacket) {
     if (resultBuffer.limit() == 0) {
       return false;
     }
@@ -141,15 +144,15 @@ protected boolean writeBuffer(ByteBuffer resultBuffer, @Nullable WritableNetwork
    * @param packet the network packet.
    * @return the final byte buffer with data.
    */
-  protected ByteBuffer serialize(WritableNetworkPacket packet) {
+  protected ByteBuffer serialize(WritableNetworkPacket<C> packet) {
 
     if (packet instanceof WritablePacketWrapper) {
-      packet = ((WritablePacketWrapper<?, ?>) packet).getPacket();
+      packet = ((WritablePacketWrapper<?, ?, C>) packet).getPacket();
     }
 
     W resultPacket = (W) packet;
 
-    int expectedLength = packet.expectedLength();
+    int expectedLength = packet.expectedLength(connection);
     int totalSize = expectedLength == -1 ? -1 : totalSize(packet, expectedLength);
 
     // if the packet is too big to use a write buffer
@@ -185,7 +188,7 @@ protected ByteBuffer serialize(WritableNetworkPacket packet) {
    *
    * @return the total size or -1.
    */
-  protected abstract int totalSize(WritableNetworkPacket packet, int expectedLength);
+  protected abstract int totalSize(WritableNetworkPacket<C> packet, int expectedLength);
 
   /**
    * Serializes the packet to the buffers.
@@ -251,7 +254,7 @@ protected boolean doSerialize(
       int totalSize,
       ByteBuffer firstBuffer,
       ByteBuffer secondBuffer) {
-    return packet.write(firstBuffer);
+    return packet.write(connection, firstBuffer);
   }
 
   /**
@@ -339,7 +342,7 @@ protected ByteBuffer writeHeader(ByteBuffer buffer, int value, int headerSize) {
    * @param wroteBytes the count of wrote bytes.
    * @param packet the sent packet.
    */
-  protected void handleSuccessfulWritingData(Integer wroteBytes, @Nullable WritableNetworkPacket packet) {
+  protected void handleSuccessfulWritingData(Integer wroteBytes, @Nullable WritableNetworkPacket<C> packet) {
     updateActivityFunction.run();
 
     if (wroteBytes == -1) {
@@ -376,7 +379,7 @@ protected void handleSuccessfulWritingData(Integer wroteBytes, @Nullable Writabl
    * @param exception the exception.
    * @param packet the packet.
    */
-  protected void handleFailedWritingData(Throwable exception, @Nullable WritableNetworkPacket packet) {
+  protected void handleFailedWritingData(Throwable exception, @Nullable WritableNetworkPacket<C> packet) {
     log.error(new RuntimeException("Failed writing packet:" + packet, exception));
     if (exception instanceof IOException) {
       connection.close();
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
index bb310683..9e2cd026 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
@@ -16,27 +16,27 @@
  */
 @CustomLog
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public abstract class AbstractReadableNetworkPacket
-    extends AbstractNetworkPacket implements ReadableNetworkPacket {
+public abstract class AbstractReadableNetworkPacket<C extends Connection>
+    extends AbstractNetworkPacket<C> implements ReadableNetworkPacket<C> {
 
   @Override
-  public boolean read(ByteBuffer buffer, int remainingDataLength) {
+  public boolean read(C connection, ByteBuffer buffer, int remainingDataLength) {
     int oldLimit = buffer.limit();
     int oldPosition = buffer.position();
     try {
       buffer.limit(oldPosition + remainingDataLength);
-      readImpl(buffer);
+      readImpl(connection, buffer);
       return true;
     } catch (Exception e) {
       buffer.position(oldPosition);
-      handleException(buffer, e);
+      handleException(connection, buffer, e);
       return false;
     } finally {
       buffer.limit(oldLimit);
     }
   }
 
-  protected void readImpl(ByteBuffer buffer) {}
+  protected void readImpl(C connection, ByteBuffer buffer) {}
 
   /**
    * Reads 1 byte from the buffer.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
index 30c057a2..71a37ad5 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import javasabr.rlib.common.util.ClassUtils;
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.ReusableWritablePacket;
 import javasabr.rlib.reusable.pool.Pool;
 import javasabr.rlib.reusable.pool.PoolFactory;
@@ -23,8 +24,8 @@
  */
 @CustomLog
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractReusableWritableNetworkPacket extends AbstractWritableNetworkPacket
-    implements ReusableWritablePacket {
+public abstract class AbstractReusableWritableNetworkPacket<C extends Connection>
+    extends AbstractWritableNetworkPacket<C> implements ReusableWritablePacket<C> {
 
   protected static final ThreadLocal<Map<Class<? super ReusableWritablePacket>, Pool<ReusableWritablePacket>>>
       LOCAL_POOLS = ThreadLocal.withInitial(HashMap::new);
@@ -45,7 +46,7 @@ public AbstractReusableWritableNetworkPacket() {
   }
 
   @Override
-  public boolean write(ByteBuffer buffer) {
+  public boolean write(C connection, ByteBuffer buffer) {
 
     if (counter.get() < 1) {
       log.warning(this, arg ->
@@ -55,7 +56,7 @@ public boolean write(ByteBuffer buffer) {
 
     notifyStartedWriting();
     try {
-      super.write(buffer);
+      super.write(connection, buffer);
     } finally {
       notifyFinishedWriting();
     }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
index fdaeb2db..347b6c58 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
@@ -28,8 +28,9 @@
 @CustomLog
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractSslNetworkPacketReader<R extends ReadableNetworkPacket, C extends Connection<R, ?>>
-    extends AbstractNetworkPacketReader<R, C> {
+public abstract class AbstractSslNetworkPacketReader<
+    R extends ReadableNetworkPacket<C>,
+    C extends Connection<R, ?, C>> extends AbstractNetworkPacketReader<R, C> {
 
   private static final ByteBuffer[] EMPTY_BUFFERS = {
       NetworkUtils.EMPTY_BUFFER
@@ -38,7 +39,7 @@ public abstract class AbstractSslNetworkPacketReader<R extends ReadableNetworkPa
   private static final int SKIP_READ_PACKETS = -1;
 
   final SSLEngine sslEngine;
-  final Consumer<WritableNetworkPacket> packetWriter;
+  final Consumer<WritableNetworkPacket<C>> packetWriter;
 
   @Getter(value = AccessLevel.PROTECTED)
   volatile ByteBuffer sslNetworkBuffer;
@@ -54,7 +55,7 @@ protected AbstractSslNetworkPacketReader(
       Runnable updateActivityFunction,
       Consumer<? super R> readPacketHandler,
       SSLEngine sslEngine,
-      Consumer<WritableNetworkPacket> packetWriter,
+      Consumer<WritableNetworkPacket<C>> packetWriter,
       int maxPacketsByRead) {
     super(connection, channel, bufferAllocator, updateActivityFunction, readPacketHandler, maxPacketsByRead);
     this.sslEngine = sslEngine;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketWriter.java
index bbd649e3..d9d0aa78 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketWriter.java
@@ -27,15 +27,16 @@
 @CustomLog
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractSslNetworkPacketWriter<W extends WritableNetworkPacket, C extends Connection<?, W>>
-    extends AbstractNetworkPacketWriter<W, C> {
+public abstract class AbstractSslNetworkPacketWriter<
+    W extends WritableNetworkPacket<C>,
+    C extends Connection<?, W, C>> extends AbstractNetworkPacketWriter<W, C> {
 
   private static final ByteBuffer[] EMPTY_BUFFERS = {
       NetworkUtils.EMPTY_BUFFER
   };
 
   final SSLEngine sslEngine;
-  final Consumer<WritableNetworkPacket> queueAtFirst;
+  final Consumer<WritableNetworkPacket<C>> queueAtFirst;
 
   @Getter(AccessLevel.PROTECTED)
   @Nullable
@@ -49,11 +50,11 @@ public AbstractSslNetworkPacketWriter(
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       Runnable updateActivityFunction,
-      Supplier<WritableNetworkPacket> packetProvider,
-      Consumer<WritableNetworkPacket> serializedToChannelPacketHandler,
-      ObjBoolConsumer<WritableNetworkPacket> sentPacketHandler,
+      Supplier<WritableNetworkPacket<C>> packetProvider,
+      Consumer<WritableNetworkPacket<C>> serializedToChannelPacketHandler,
+      ObjBoolConsumer<WritableNetworkPacket<C>> sentPacketHandler,
       SSLEngine sslEngine,
-      Consumer<WritableNetworkPacket> queueAtFirst) {
+      Consumer<WritableNetworkPacket<C>> queueAtFirst) {
     super(
         connection,
         channel,
@@ -94,7 +95,7 @@ protected boolean tryToSendNextPacketImpl() {
   }
 
   @Override
-  protected ByteBuffer serialize(WritableNetworkPacket packet) {
+  protected ByteBuffer serialize(WritableNetworkPacket<C> packet) {
     if (packet instanceof SslWrapRequestPacket) {
       return EMPTY_BUFFER;
     }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
index fe3df43a..f3f47233 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
@@ -2,6 +2,7 @@
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.WritableNetworkPacket;
 import lombok.CustomLog;
 
@@ -11,16 +12,16 @@
  * @author JavaSaBr
  */
 @CustomLog
-public abstract class AbstractWritableNetworkPacket extends AbstractNetworkPacket
-    implements WritableNetworkPacket {
+public abstract class AbstractWritableNetworkPacket<C extends Connection>
+    extends AbstractNetworkPacket<C> implements WritableNetworkPacket<C> {
 
   @Override
-  public boolean write(ByteBuffer buffer) {
+  public boolean write(C connection, ByteBuffer buffer) {
     try {
-      writeImpl(buffer);
+      writeImpl(connection, buffer);
       return true;
     } catch (Exception e) {
-      handleException(buffer, e);
+      handleException(connection, buffer, e);
       return false;
     }
   }
@@ -28,7 +29,7 @@ public boolean write(ByteBuffer buffer) {
   /**
    * The process of writing this packet to the buffer.
    */
-  protected void writeImpl(ByteBuffer buffer) {}
+  protected void writeImpl(C connection, ByteBuffer buffer) {}
 
   /**
    * Write 1 byte to the buffer.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
index 5eb079e5..e0855e77 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
@@ -15,8 +15,9 @@
  * @author JavaSaBR
  */
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class DefaultNetworkPacketReader<R extends ReadableNetworkPacket, C extends Connection<R, ?>>
-    extends AbstractNetworkPacketReader<R, C> {
+public class DefaultNetworkPacketReader<
+    R extends ReadableNetworkPacket<C>,
+    C extends Connection<R, ?, C>> extends AbstractNetworkPacketReader<R, C> {
 
   final IntFunction<R> readablePacketFactory;
   final int packetLengthHeaderSize;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketWriter.java
index fe6a1e99..7f8d7a13 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketWriter.java
@@ -16,8 +16,9 @@
  * @author JavaSaBr
  */
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class DefaultNetworkPacketWriter<W extends WritableNetworkPacket, C extends Connection<?, W>>
-    extends AbstractNetworkPacketWriter<W, C> {
+public class DefaultNetworkPacketWriter<
+    W extends WritableNetworkPacket<C>,
+    C extends Connection<?, W, C>> extends AbstractNetworkPacketWriter<W, C> {
 
   final int packetLengthHeaderSize;
 
@@ -26,9 +27,9 @@ public DefaultNetworkPacketWriter(
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       Runnable updateActivityFunction,
-      Supplier<@Nullable WritableNetworkPacket> packetProvider,
-      Consumer<WritableNetworkPacket> serializedToChannelPacketHandler,
-      ObjBoolConsumer<WritableNetworkPacket> sentPacketHandler,
+      Supplier<@Nullable WritableNetworkPacket<C>> packetProvider,
+      Consumer<WritableNetworkPacket<C>> serializedToChannelPacketHandler,
+      ObjBoolConsumer<WritableNetworkPacket<C>> sentPacketHandler,
       int packetLengthHeaderSize) {
     super(
         connection,
@@ -42,7 +43,7 @@ public DefaultNetworkPacketWriter(
   }
 
   @Override
-  protected int totalSize(WritableNetworkPacket packet, int expectedLength) {
+  protected int totalSize(WritableNetworkPacket<C> packet, int expectedLength) {
     return expectedLength + packetLengthHeaderSize;
   }
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadableNetworkPacket.java
index 71115e89..3f2be3f1 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadableNetworkPacket.java
@@ -1,9 +1,11 @@
 package javasabr.rlib.network.packet.impl;
 
+import javasabr.rlib.network.impl.DefaultConnection;
+
 /**
  * @author JavaSaBr
  */
 public class DefaultReadableNetworkPacket extends
-    AbstractIdBasedReadableNetworkPacket<DefaultReadableNetworkPacket> {
+    AbstractIdBasedReadableNetworkPacket<DefaultReadableNetworkPacket, DefaultConnection> {
 
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
index 0f46f607..84f73027 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
@@ -17,8 +17,9 @@
  * @author JavaSaBR
  */
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class DefaultSslNetworkPacketReader<R extends ReadableNetworkPacket, C extends Connection<R, ?>> extends
-    AbstractSslNetworkPacketReader<R, C> {
+public class DefaultSslNetworkPacketReader<
+    R extends ReadableNetworkPacket<C>,
+    C extends Connection<R, ?, C>> extends AbstractSslNetworkPacketReader<R, C> {
 
   final IntFunction<R> packetResolver;
   final int packetLengthHeaderSize;
@@ -31,7 +32,7 @@ public DefaultSslNetworkPacketReader(
       Consumer<R> packetHandler,
       IntFunction<R> packetResolver,
       SSLEngine sslEngine,
-      Consumer<WritableNetworkPacket> packetWriter,
+      Consumer<WritableNetworkPacket<C>> packetWriter,
       int packetLengthHeaderSize,
       int maxPacketsByRead) {
     super(
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketWriter.java
index 52438cbe..9d0e91e4 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketWriter.java
@@ -17,8 +17,9 @@
  * @author JavaSaBr
  */
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class DefaultSslNetworkPacketWriter<W extends WritableNetworkPacket, C extends Connection<?, W>> extends
-    AbstractSslNetworkPacketWriter<W, C> {
+public class DefaultSslNetworkPacketWriter<
+    W extends WritableNetworkPacket<C>,
+    C extends Connection<?, W, C>> extends AbstractSslNetworkPacketWriter<W, C> {
 
   final int packetLengthHeaderSize;
 
@@ -27,11 +28,11 @@ public DefaultSslNetworkPacketWriter(
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       Runnable updateActivityFunction,
-      Supplier<@Nullable WritableNetworkPacket> nextWritePacketSupplier,
-      Consumer<WritableNetworkPacket> serializedToChannelPacketHandler,
-      ObjBoolConsumer<WritableNetworkPacket> sentPacketHandler,
+      Supplier<@Nullable WritableNetworkPacket<C>> nextWritePacketSupplier,
+      Consumer<WritableNetworkPacket<C>> serializedToChannelPacketHandler,
+      ObjBoolConsumer<WritableNetworkPacket<C>> sentPacketHandler,
       SSLEngine sslEngine,
-      Consumer<WritableNetworkPacket> queueAtFirst,
+      Consumer<WritableNetworkPacket<C>> queueAtFirst,
       int packetLengthHeaderSize) {
     super(
         connection,
@@ -47,7 +48,7 @@ public DefaultSslNetworkPacketWriter(
   }
 
   @Override
-  protected int totalSize(WritableNetworkPacket packet, int expectedLength) {
+  protected int totalSize(WritableNetworkPacket<C> packet, int expectedLength) {
     return expectedLength + packetLengthHeaderSize;
   }
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritableNetworkPacket.java
index c134ac95..3de5f102 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritableNetworkPacket.java
@@ -1,9 +1,11 @@
 package javasabr.rlib.network.packet.impl;
 
+import javasabr.rlib.network.impl.DefaultConnection;
 import javasabr.rlib.network.packet.IdBasedWritableNetworkPacket;
 
 /**
  * @author JavaSaBr
  */
-public class DefaultWritableNetworkPacket extends AbstractWritableNetworkPacket implements
-    IdBasedWritableNetworkPacket {}
+public class DefaultWritableNetworkPacket
+    extends AbstractWritableNetworkPacket<DefaultConnection>
+    implements IdBasedWritableNetworkPacket<DefaultConnection> {}
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
index 7ee8f037..9add0046 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
@@ -20,8 +20,9 @@
  * @author JavaSaBr
  */
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class IdBasedNetworkPacketWriter<W extends IdBasedWritableNetworkPacket, C extends Connection<?, W>>
-    extends DefaultNetworkPacketWriter<W, C> {
+public class IdBasedNetworkPacketWriter<
+    W extends IdBasedWritableNetworkPacket<C>,
+    C extends Connection<?, W, C>> extends DefaultNetworkPacketWriter<W, C> {
 
   final int packetIdHeaderSize;
 
@@ -30,9 +31,9 @@ public IdBasedNetworkPacketWriter(
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
       Runnable updateActivityFunction,
-      Supplier<@Nullable WritableNetworkPacket> packetProvider,
-      Consumer<WritableNetworkPacket> serializedToChannelPacketHandler,
-      ObjBoolConsumer<WritableNetworkPacket> sentPacketHandler,
+      Supplier<@Nullable WritableNetworkPacket<C>> packetProvider,
+      Consumer<WritableNetworkPacket<C>> serializedToChannelPacketHandler,
+      ObjBoolConsumer<WritableNetworkPacket<C>> sentPacketHandler,
       int packetLengthHeaderSize,
       int packetIdHeaderSize) {
     super(
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java
index 061b1f04..128d7217 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java
@@ -15,10 +15,11 @@
  * @author JavaSaBr
  */
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class IdBasedPacketReader<R extends IdBasedReadableNetworkPacket<R>, C extends Connection<R, ?>> extends
-    AbstractNetworkPacketReader<R, C> {
+public class IdBasedPacketReader<
+    R extends IdBasedReadableNetworkPacket<R, C>,
+    C extends Connection<R, ?, C>> extends AbstractNetworkPacketReader<R, C> {
 
-  final ReadableNetworkPacketRegistry<R> packetRegistry;
+  final ReadableNetworkPacketRegistry<R, C> packetRegistry;
   final int packetLengthHeaderSize;
   final int packetIdHeaderSize;
 
@@ -31,7 +32,7 @@ public IdBasedPacketReader(
       int packetLengthHeaderSize,
       int maxPacketsByRead,
       int packetIdHeaderSize,
-      ReadableNetworkPacketRegistry<R> packetRegistry) {
+      ReadableNetworkPacketRegistry<R, C> packetRegistry) {
     super(connection, channel, bufferAllocator, updateActivityFunction, packetHandler, maxPacketsByRead);
     this.packetLengthHeaderSize = packetLengthHeaderSize;
     this.packetIdHeaderSize = packetIdHeaderSize;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestPacket.java
index 4d12d963..de209772 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestPacket.java
@@ -1,19 +1,20 @@
 package javasabr.rlib.network.packet.impl;
 
 import java.nio.ByteBuffer;
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.MarkerNetworkPacket;
 
-public class SslWrapRequestPacket extends AbstractWritableNetworkPacket
+public class SslWrapRequestPacket<C extends Connection> extends AbstractWritableNetworkPacket<C>
     implements MarkerNetworkPacket {
 
-  private static final SslWrapRequestPacket INSTANCE = new SslWrapRequestPacket();
+  private static final SslWrapRequestPacket<?> INSTANCE = new SslWrapRequestPacket<>();
 
-  public static SslWrapRequestPacket getInstance() {
-    return INSTANCE;
+  public static <C extends Connection> SslWrapRequestPacket<C> getInstance() {
+    return (SslWrapRequestPacket<C>) INSTANCE;
   }
 
   @Override
-  public boolean write(ByteBuffer buffer) {
+  public boolean write(C connection, ByteBuffer buffer) {
     return true;
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java
index a896ef20..b7cc3255 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java
@@ -1,6 +1,7 @@
 package javasabr.rlib.network.packet.impl;
 
 import java.nio.ByteBuffer;
+import javasabr.rlib.network.Connection;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.experimental.Accessors;
@@ -13,7 +14,7 @@
 @Getter
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class StringReadablePacket extends AbstractReadableNetworkPacket {
+public class StringReadablePacket<C extends Connection> extends AbstractReadableNetworkPacket<C> {
 
   public static final int MAX_LENGTH = 100_000;
 
@@ -21,7 +22,7 @@ public class StringReadablePacket extends AbstractReadableNetworkPacket {
   volatile String data;
 
   @Override
-  protected void readImpl(ByteBuffer buffer) {
+  protected void readImpl(C connection, ByteBuffer buffer) {
     this.data = readString(buffer, MAX_LENGTH);
   }
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritableNetworkPacket.java
index 0c7a4542..87f87200 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritableNetworkPacket.java
@@ -1,6 +1,7 @@
 package javasabr.rlib.network.packet.impl;
 
 import java.nio.ByteBuffer;
+import javasabr.rlib.network.Connection;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -14,18 +15,18 @@
 @RequiredArgsConstructor
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-public class StringWritableNetworkPacket extends AbstractWritableNetworkPacket {
+public class StringWritableNetworkPacket<C extends Connection> extends AbstractWritableNetworkPacket<C> {
 
   String data;
 
   @Override
-  protected void writeImpl(ByteBuffer buffer) {
-    super.writeImpl(buffer);
+  protected void writeImpl(C connection, ByteBuffer buffer) {
+    super.writeImpl(connection, buffer);
     writeString(buffer, data);
   }
 
   @Override
-  public int expectedLength() {
+  public int expectedLength(C connection) {
     return 4 + data.length() * 2;
   }
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java
index 668e1ba1..e2a24c73 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java
@@ -1,32 +1,30 @@
 package javasabr.rlib.network.packet.impl;
 
 import java.nio.ByteBuffer;
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.WritableNetworkPacket;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 /**
  * The writable packet wrapper with additional attachment.
- *
- * @param <A> the attachment type.
- * @param <W> the Writable packet.
  */
 @Getter
 @RequiredArgsConstructor
-public class WritablePacketWrapper<A, W extends WritableNetworkPacket>
-    implements WritableNetworkPacket {
+public class WritablePacketWrapper<A, W extends WritableNetworkPacket<C>, C extends Connection>
+    implements WritableNetworkPacket<C> {
 
   private final A attachment;
   private final W packet;
 
   @Override
-  public boolean write(ByteBuffer buffer) {
-    return packet.write(buffer);
+  public boolean write(C connection, ByteBuffer buffer) {
+    return packet.write(connection, buffer);
   }
 
   @Override
-  public int expectedLength() {
-    return packet.expectedLength();
+  public int expectedLength(C connection) {
+    return packet.expectedLength(connection);
   }
 
   @Override
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadableNetworkPacketRegistry.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadableNetworkPacketRegistry.java
index 3a0cf08a..34bf1416 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadableNetworkPacketRegistry.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadableNetworkPacketRegistry.java
@@ -4,6 +4,7 @@
 import javasabr.rlib.classpath.ClassPathScannerFactory;
 import javasabr.rlib.collections.array.Array;
 import javasabr.rlib.collections.array.ArrayCollectors;
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.annotation.NetworkPacketDescription;
 import javasabr.rlib.network.packet.IdBasedReadableNetworkPacket;
 import javasabr.rlib.network.packet.registry.impl.IdBasedReadableNetworkPacketRegistry;
@@ -13,26 +14,26 @@
  *
  * @author JavaSaBr
  */
-public interface ReadableNetworkPacketRegistry<R extends IdBasedReadableNetworkPacket<R>> {
+public interface ReadableNetworkPacketRegistry<R extends IdBasedReadableNetworkPacket<R, C>, C extends Connection> {
 
   /**
    * Creates a new empty readable packet registry.
    */
-  static ReadableNetworkPacketRegistry<?> empty() {
+  static ReadableNetworkPacketRegistry<?, ?> empty() {
     return new IdBasedReadableNetworkPacketRegistry<>(IdBasedReadableNetworkPacket.class);
   }
 
   /**
    * Create a new empty readable packet registry.
    */
-  static <T extends IdBasedReadableNetworkPacket<T>> ReadableNetworkPacketRegistry<T> empty(Class<T> type) {
+  static <T extends IdBasedReadableNetworkPacket<T, C>, C extends Connection> ReadableNetworkPacketRegistry<T, C> empty(Class<T> type) {
     return new IdBasedReadableNetworkPacketRegistry<>(type);
   }
 
   /**
    * Creates a new class path scanning based readable packet registry.
    */
-  static ReadableNetworkPacketRegistry<?> classPathBased() {
+  static ReadableNetworkPacketRegistry<?, ?> classPathBased() {
 
     var scanner = ClassPathScannerFactory.newDefaultScanner();
     scanner.useSystemClassPath(true);
@@ -44,7 +45,7 @@ static ReadableNetworkPacketRegistry<?> classPathBased() {
   /**
    * Creates a new class path scanning based readable packet registry by scanning the main class.
    */
-  static ReadableNetworkPacketRegistry<?> classPathBased(Class<?> mainClass) {
+  static ReadableNetworkPacketRegistry<?, ?> classPathBased(Class<?> mainClass) {
 
     var scanner = ClassPathScannerFactory.newManifestScanner(mainClass);
     scanner.useSystemClassPath(false);
@@ -56,8 +57,7 @@ static ReadableNetworkPacketRegistry<?> classPathBased(Class<?> mainClass) {
   /**
    * Creates a new class path scanning based readable packet registry.
    */
-  static ReadableNetworkPacketRegistry<?> of(ClassPathScanner scanner) {
-
+  static ReadableNetworkPacketRegistry<?, ?> of(ClassPathScanner scanner) {
     var result = scanner
         .findImplementations(IdBasedReadableNetworkPacket.class)
         .stream()
@@ -71,7 +71,7 @@ static ReadableNetworkPacketRegistry<?> of(ClassPathScanner scanner) {
    * Creates a new readable packet registry.
    */
   @SafeVarargs
-  static <T extends IdBasedReadableNetworkPacket<T>> ReadableNetworkPacketRegistry<T> of(
+  static <T extends IdBasedReadableNetworkPacket<T, C>, C extends Connection> ReadableNetworkPacketRegistry<T, C> of(
       Class<T> type,
       Class<? extends T>... classes) {
     return new IdBasedReadableNetworkPacketRegistry<>(type)
@@ -81,7 +81,7 @@ static <T extends IdBasedReadableNetworkPacket<T>> ReadableNetworkPacketRegistry
   /**
    * Creates a new readable packet registry.
    */
-  static <T extends IdBasedReadableNetworkPacket<T>> ReadableNetworkPacketRegistry<T> of(
+  static <T extends IdBasedReadableNetworkPacket<T, C>, C extends Connection> ReadableNetworkPacketRegistry<T, C> of(
       Class<T> type,
       Array<Class<? extends T>> classes) {
     return new IdBasedReadableNetworkPacketRegistry<>(type)
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java
index 815911c2..8a0e26e7 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java
@@ -7,6 +7,7 @@
 import javasabr.rlib.common.util.ArrayUtils;
 import javasabr.rlib.common.util.ClassUtils;
 import javasabr.rlib.common.util.ObjectUtils;
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.annotation.NetworkPacketDescription;
 import javasabr.rlib.network.packet.IdBasedReadableNetworkPacket;
 import javasabr.rlib.network.packet.registry.ReadableNetworkPacketRegistry;
@@ -27,8 +28,8 @@
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
-public class IdBasedReadableNetworkPacketRegistry<R extends IdBasedReadableNetworkPacket<R>>
-    implements ReadableNetworkPacketRegistry<R> {
+public class IdBasedReadableNetworkPacketRegistry<R extends IdBasedReadableNetworkPacket<R, C>, C extends Connection>
+    implements ReadableNetworkPacketRegistry<R, C> {
 
   @Getter(AccessLevel.PROTECTED)
   final Class<? extends R> type;
@@ -46,7 +47,7 @@ public IdBasedReadableNetworkPacketRegistry(Class<? extends R> type) {
    *
    * @throws IllegalArgumentException if found a class without description annotation or if found duplication by id.
    */
-  public IdBasedReadableNetworkPacketRegistry<R> register(Array<Class<? extends R>> classes) {
+  public IdBasedReadableNetworkPacketRegistry<R, C> register(Array<Class<? extends R>> classes) {
     return register(classes.toArray(), classes.size());
   }
 
@@ -57,7 +58,7 @@ public IdBasedReadableNetworkPacketRegistry<R> register(Array<Class<? extends R>
    * id.
    */
   @SafeVarargs
-  public final IdBasedReadableNetworkPacketRegistry<R> register(Class<? extends R>... classes) {
+  public final IdBasedReadableNetworkPacketRegistry<R, C> register(Class<? extends R>... classes) {
     return register(classes, classes.length);
   }
 
@@ -66,7 +67,7 @@ public final IdBasedReadableNetworkPacketRegistry<R> register(Class<? extends R>
    *
    * @throws IllegalArgumentException if found a class without description annotation or if found duplication by id.
    */
-  public IdBasedReadableNetworkPacketRegistry<R> register(Class<? extends R>[] classes, int length) {
+  public IdBasedReadableNetworkPacketRegistry<R, C> register(Class<? extends R>[] classes, int length) {
 
     Optional<Class<? extends R>> incorrectClass = Arrays
         .stream(classes, 0, length)
@@ -114,7 +115,7 @@ public IdBasedReadableNetworkPacketRegistry<R> register(Class<? extends R>[] cla
    * @throws IllegalArgumentException if this class doesn't have {@link NetworkPacketDescription}, wrong id or some class is
    * already presented with the same id.
    */
-  public IdBasedReadableNetworkPacketRegistry<R> register(Class<? extends R> cs) {
+  public IdBasedReadableNetworkPacketRegistry<R, C> register(Class<? extends R> cs) {
     return register(cs, () -> ClassUtils.newInstance(cs));
   }
 
@@ -125,7 +126,7 @@ public IdBasedReadableNetworkPacketRegistry<R> register(Class<? extends R> cs) {
    * @throws IllegalArgumentException if this class doesn't have {@link NetworkPacketDescription}, wrong id or some class is
    * already presented with the same id.
    */
-  public <P extends R> IdBasedReadableNetworkPacketRegistry<R> register(Class<P> cs, Supplier<P> factory) {
+  public <P extends R> IdBasedReadableNetworkPacketRegistry<R, C> register(Class<P> cs, Supplier<P> factory) {
 
     var description = cs.getAnnotation(NetworkPacketDescription.class);
     if (description == null) {
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java
index 1fa6aa30..42be32fb 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java
@@ -11,7 +11,7 @@
  *
  * @author JavaSaBr
  */
-public interface ServerNetwork<C extends Connection<?, ?>> extends Network<C> {
+public interface ServerNetwork<C extends Connection<?, ?, C>> extends Network<C> {
 
   /**
    * Start a server using any available address.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
index 46e6e2a2..ff0f9ff6 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
@@ -40,10 +40,10 @@
  */
 @CustomLog
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
-public class DefaultServerNetwork<C extends UnsafeConnection<?, ?>>
+public class DefaultServerNetwork<C extends UnsafeConnection<?, ?, C>>
     extends AbstractNetwork<C> implements ServerNetwork<C> {
 
-  private interface ServerCompletionHandler<C extends UnsafeConnection<?, ?>> extends
+  private interface ServerCompletionHandler<C extends UnsafeConnection<?, ?, C>> extends
       CompletionHandler<AsynchronousSocketChannel, DefaultServerNetwork<C>> {}
 
   private final ServerCompletionHandler<C> acceptHandler = new ServerCompletionHandler<>() {
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java
index 9fc8f5b4..ee9407fd 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java
@@ -1,24 +1,67 @@
 package javasabr.rlib.network;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
 import javasabr.rlib.network.client.ClientNetwork;
 import javasabr.rlib.network.impl.DefaultBufferAllocator;
 import javasabr.rlib.network.impl.DefaultConnection;
 import javasabr.rlib.network.impl.StringDataConnection;
 import javasabr.rlib.network.impl.StringDataSslConnection;
+import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javasabr.rlib.network.packet.impl.DefaultReadableNetworkPacket;
 import javasabr.rlib.network.packet.registry.ReadableNetworkPacketRegistry;
 import javasabr.rlib.network.server.ServerNetwork;
 import javax.net.ssl.SSLContext;
 import lombok.AllArgsConstructor;
+import reactor.core.publisher.Flux;
 
 /**
  * @author JavaSaBr
  */
 public class BaseNetworkTest {
+  public static final Connection MOCK_CONNECTION = new Connection() {
+    @Override
+    public String remoteAddress() {
+      return "";
+    }
+
+    @Override
+    public long lastActivity() {
+      return 0;
+    }
+
+    @Override
+    public void close() {}
+
+    @Override
+    public boolean closed() {
+      return false;
+    }
+
+    @Override
+    public void send(WritableNetworkPacket packet) {}
+
+    @Override
+    public CompletableFuture<Boolean> sendWithFeedback(WritableNetworkPacket packet) {
+      return CompletableFuture.completedFuture(false);
+    }
+
+    @Override
+    public Flux<ReceivedPacketEvent> receivedEvents() {
+      return Flux.empty();
+    }
+
+    @Override
+    public Flux receivedPackets() {
+      return Flux.empty();
+    }
+
+    @Override
+    public void onReceive(BiConsumer consumer) {}
+  };
 
   @AllArgsConstructor
-  public static class TestNetwork<C extends Connection<?, ?>> implements AutoCloseable {
+  public static class TestNetwork<C extends Connection<?, ?, C>> implements AutoCloseable {
 
     public final ServerNetworkConfig serverNetworkConfig;
     public final NetworkConfig clientNetworkConfig;
@@ -146,8 +189,8 @@ protected TestNetwork<StringDataSslConnection> buildStringSSLNetwork(
   }
 
   protected TestNetwork<DefaultConnection> buildDefaultNetwork(
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> serverPacketRegistry,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> clientPacketRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> serverPacketRegistry,
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> clientPacketRegistry) {
     return buildDefaultNetwork(
         ServerNetworkConfig.DEFAULT_SERVER,
         new DefaultBufferAllocator(ServerNetworkConfig.DEFAULT_SERVER),
@@ -159,9 +202,9 @@ protected TestNetwork<DefaultConnection> buildDefaultNetwork(
 
   protected TestNetwork<DefaultConnection> buildDefaultNetwork(
       BufferAllocator serverBufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> serverPacketRegistry,
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> serverPacketRegistry,
       BufferAllocator clientBufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> clientPacketRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> clientPacketRegistry) {
     return buildDefaultNetwork(
         ServerNetworkConfig.DEFAULT_SERVER,
         serverBufferAllocator,
@@ -174,10 +217,10 @@ protected TestNetwork<DefaultConnection> buildDefaultNetwork(
   protected TestNetwork<DefaultConnection> buildDefaultNetwork(
       ServerNetworkConfig serverNetworkConfig,
       BufferAllocator serverBufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> serverPacketRegistry,
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> serverPacketRegistry,
       NetworkConfig clientNetworkConfig,
       BufferAllocator clientBufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> clientPacketRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> clientPacketRegistry) {
 
     var asyncClientToServer = new CompletableFuture<DefaultConnection>();
     var asyncServerToClient = new CompletableFuture<DefaultConnection>();
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java
index 43d86534..6fdbe9cf 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java
@@ -49,8 +49,8 @@ class RequestEchoMessage extends DefaultWritableNetworkPacket {
       private final String message;
 
       @Override
-      protected void writeImpl(ByteBuffer buffer) {
-        super.writeImpl(buffer);
+      protected void writeImpl(DefaultConnection connection, ByteBuffer buffer) {
+        super.writeImpl(connection, buffer);
         writeString(buffer, message);
       }
     }
@@ -67,7 +67,7 @@ class ResponseEchoMessage extends DefaultReadableNetworkPacket {
       private volatile String message;
 
       @Override
-      protected void readImpl(ByteBuffer buffer) {
+      protected void readImpl(DefaultConnection connection, ByteBuffer buffer) {
         message = readString(buffer, Integer.MAX_VALUE);
       }
 
@@ -85,8 +85,8 @@ class ResponseServerTime extends DefaultReadableNetworkPacket {
       private volatile LocalDateTime localDateTime;
 
       @Override
-      protected void readImpl(ByteBuffer buffer) {
-        super.readImpl(buffer);
+      protected void readImpl(DefaultConnection connection, ByteBuffer buffer) {
+        super.readImpl(connection, buffer);
         localDateTime = LocalDateTime.ofEpochSecond(readLong(buffer), 0, ZoneOffset.ofTotalSeconds(readInt(buffer)));
       }
 
@@ -106,8 +106,8 @@ class RequestEchoMessage extends DefaultReadableNetworkPacket {
       private volatile String message;
 
       @Override
-      protected void readImpl(ByteBuffer buffer) {
-        super.readImpl(buffer);
+      protected void readImpl(DefaultConnection connection, ByteBuffer buffer) {
+        super.readImpl(connection, buffer);
         message = readString(buffer, Integer.MAX_VALUE);
       }
 
@@ -133,8 +133,8 @@ class ResponseEchoMessage extends DefaultWritableNetworkPacket {
       private final String message;
 
       @Override
-      protected void writeImpl(ByteBuffer buffer) {
-        super.writeImpl(buffer);
+      protected void writeImpl(DefaultConnection connection, ByteBuffer buffer) {
+        super.writeImpl(connection, buffer);
         writeString(buffer, "Echo: " + message);
       }
     }
@@ -143,8 +143,8 @@ protected void writeImpl(ByteBuffer buffer) {
     class ResponseServerTime extends DefaultWritableNetworkPacket {
 
       @Override
-      protected void writeImpl(ByteBuffer buffer) {
-        super.writeImpl(buffer);
+      protected void writeImpl(DefaultConnection connection, ByteBuffer buffer) {
+        super.writeImpl(connection, buffer);
         var dateTime = ZonedDateTime.now();
         writeLong(buffer, dateTime.toEpochSecond());
         writeInt(buffer, dateTime.getOffset().getTotalSeconds());
@@ -159,11 +159,11 @@ void echoNetworkTest() {
     //LoggerManager.enable(DefaultNetworkTest.class, LoggerLevel.INFO);
     //LoggerManager.enable(AbstractNetworkPacketReader.class, LoggerLevel.DEBUG);
 
-    ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> serverPackets = ReadableNetworkPacketRegistry.of(
+    ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> serverPackets = ReadableNetworkPacketRegistry.of(
         DefaultReadableNetworkPacket.class,
         ServerPackets.RequestEchoMessage.class,
         ServerPackets.RequestServerTime.class);
-    ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket> clientPackets = ReadableNetworkPacketRegistry.of(
+    ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> clientPackets = ReadableNetworkPacketRegistry.of(
         DefaultReadableNetworkPacket.class,
         ClientPackets.ResponseEchoMessage.class,
         ClientPackets.ResponseServerTime.class);
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadableNetworkPacketRegistryTest.java b/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadableNetworkPacketRegistryTest.java
index c30249ee..0ce72a83 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadableNetworkPacketRegistryTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadableNetworkPacketRegistryTest.java
@@ -30,7 +30,7 @@ public static class Impl2 extends DefaultReadableNetworkPacket {}
   public static class Impl3 extends DefaultReadableNetworkPacket {}
 
   @NoArgsConstructor
-  private static class PrivateBase extends AbstractIdBasedReadableNetworkPacket<PrivateBase> {}
+  private static class PrivateBase extends AbstractIdBasedReadableNetworkPacket<PrivateBase, DefaultConnection> {}
 
   @NoArgsConstructor
   @NetworkPacketDescription(id = 1)
@@ -41,7 +41,7 @@ private static class PrivateImpl1 extends PrivateBase {}
   private static class PrivateImpl2 extends PrivateBase {}
 
   @NoArgsConstructor
-  public static class PublicBase extends AbstractIdBasedReadableNetworkPacket<PublicBase> {}
+  public static class PublicBase extends AbstractIdBasedReadableNetworkPacket<PublicBase, DefaultConnection> {}
 
   @NoArgsConstructor
   @NetworkPacketDescription(id = 1)
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java b/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java
index 37b3219a..2c0d3790 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java
@@ -16,7 +16,9 @@ class NetworkPacketTest {
   @Builder
   @ToString
   @EqualsAndHashCode(exclude = {"byteArrayField", "bytesField1", "bytesField2"})
-  private static class TestReadablePacket extends AbstractReadableNetworkPacket {
+  private static class TestReadablePacket
+      extends AbstractReadableNetworkPacket<Connection> {
+
     private int byteField;
     private int byteUnsignedField;
     private int shortField;
@@ -32,8 +34,8 @@ private static class TestReadablePacket extends AbstractReadableNetworkPacket {
     private String stringField;
 
     @Override
-    protected void readImpl(ByteBuffer buffer) {
-      super.readImpl(buffer);
+    protected void readImpl(Connection connection, ByteBuffer buffer) {
+      super.readImpl(connection, buffer);
       byteField = readByte(buffer);
       byteUnsignedField = readByteUnsigned(buffer);
       shortField = readShort(buffer);
@@ -55,7 +57,9 @@ protected void readImpl(ByteBuffer buffer) {
   }
 
   @Builder
-  private static class TestWritablePacket extends AbstractWritableNetworkPacket {
+  private static class TestWritablePacket
+      extends AbstractWritableNetworkPacket<Connection> {
+
     private int byteField;
     private int byteUnsignedField;
     private int shortField;
@@ -71,8 +75,8 @@ private static class TestWritablePacket extends AbstractWritableNetworkPacket {
     private String stringField;
 
     @Override
-    protected void writeImpl(ByteBuffer buffer) {
-      super.writeImpl(buffer);
+    protected void writeImpl(Connection connection, ByteBuffer buffer) {
+      super.writeImpl(connection, buffer);
       writeByte(buffer, byteField);
       writeByte(buffer, byteUnsignedField);
       writeShort(buffer, shortField);
@@ -122,7 +126,7 @@ void shouldWritePacketCorrectly() {
                        105, 0, 110, 0, 103};
 
     // when:
-    packet.write(buffer);
+    packet.write(BaseNetworkTest.MOCK_CONNECTION, buffer);
     buffer.flip();
 
     // then:
@@ -162,7 +166,7 @@ void shouldReadPacketCorrectly() {
         .build();
 
     // when:
-    packet.read(ByteBuffer.wrap(data), data.length);
+    packet.read(BaseNetworkTest.MOCK_CONNECTION, ByteBuffer.wrap(data), data.length);
 
     // then:
     Assertions.assertEquals(expected, packet);
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
index 9378b0d5..a9fee1ba 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
@@ -58,7 +58,7 @@ void echoNetworkTest() {
         .subscribe(event -> {
           String message = event.packet().data();
           log.info(message, "Received from client:[%s]"::formatted);
-          event.connection().send(new StringWritableNetworkPacket("Echo: " + message));
+          event.connection().send(new StringWritableNetworkPacket<>("Echo: " + message));
         });
 
     ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
@@ -68,7 +68,7 @@ void echoNetworkTest() {
         .doOnNext(connection -> IntStream
             .range(10, 200)
             .forEach(length -> {
-              var packet = new StringWritableNetworkPacket(StringUtils.generate(length));
+              var packet = new StringWritableNetworkPacket<StringDataConnection>(StringUtils.generate(length));
               int delay = ThreadLocalRandom
                   .current()
                   .nextInt(50);
@@ -127,7 +127,7 @@ public ByteBuffer takeBuffer(int bufferSize) {
           .mapToObj(value -> StringUtils.generate(random.nextInt(0, bufferSize)))
           .peek(message -> {
             log.info(message.length(), "Send [%s] symbols to server"::formatted);
-            clientToServer.send(new StringWritableNetworkPacket(message));
+            clientToServer.send(new StringWritableNetworkPacket<>(message));
           })
           .toList();
 
@@ -177,7 +177,7 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
             return StringUtils.generate(length);
           })
           .peek(message -> {
-            var packet = new StringWritableNetworkPacket(message);
+            var packet = new StringWritableNetworkPacket<StringDataConnection>(message);
             int delay = ThreadLocalRandom
                 .current()
                 .nextInt(15);
@@ -189,7 +189,7 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
           })
           .toList();
 
-      List<? extends StringReadablePacket> receivedPackets =
+      List<? extends StringReadablePacket<StringDataConnection>> receivedPackets =
           ObjectUtils.notNull(pendingPacketsOnServer.blockFirst(Duration.ofSeconds(5)));
 
       log.info(receivedPackets.size(), "Received [%s] packets from client"::formatted);
@@ -235,7 +235,7 @@ void shouldSendBiggerPacketThanWriteBuffer() {
             return StringUtils.generate(length);
           })
           .peek(message -> {
-            var packet = new StringWritableNetworkPacket(message);
+            var packet = new StringWritableNetworkPacket<StringDataConnection>(message);
             int delay = ThreadLocalRandom
                 .current()
                 .nextInt(15);
@@ -247,7 +247,7 @@ void shouldSendBiggerPacketThanWriteBuffer() {
           })
           .toList();
 
-      List<? extends StringReadablePacket> receivedPackets =
+      List<? extends StringReadablePacket<StringDataConnection>> receivedPackets =
           ObjectUtils.notNull(pendingPacketsOnServer.blockFirst(Duration.ofSeconds(5)));
 
       log.info(receivedPackets.size(), "Received [%s] packets from client"::formatted);
@@ -409,7 +409,7 @@ void shouldGetAllPacketWithFeedback() {
       List<CompletableFuture<Boolean>> asyncResults = IntStream
           .range(0, packetCount)
           .mapToObj(value -> StringUtils.generate(random.nextInt(0, bufferSize)))
-          .map(message -> clientToServer.sendWithFeedback(new StringWritableNetworkPacket(message)))
+          .map(message -> clientToServer.sendWithFeedback(new StringWritableNetworkPacket<>(message)))
           .toList();
 
       CompletableFuture
@@ -432,7 +432,7 @@ void shouldGetAllPacketWithFeedback() {
     }
   }
 
-  private static StringWritableNetworkPacket newMessage(int minMessageLength, int maxMessageLength) {
-    return new StringWritableNetworkPacket(StringUtils.generate(minMessageLength, maxMessageLength));
+  private static StringWritableNetworkPacket<StringDataConnection> newMessage(int minMessageLength, int maxMessageLength) {
+    return new StringWritableNetworkPacket<>(StringUtils.generate(minMessageLength, maxMessageLength));
   }
 }
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
index da87ee0e..d07ab7e0 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
@@ -106,11 +106,10 @@ void serverSslNetworkTest() {
     SSLSocketFactory sslSocketFactory = clientSslContext.getSocketFactory();
     SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(serverAddress.getHostName(), serverAddress.getPort());
 
-    StringWritableNetworkPacket writableNetworkPacket = new StringWritableNetworkPacket("Hello SSL");
-
+    var writableNetworkPacket = new StringWritableNetworkPacket<StringDataSslConnection>("Hello SSL");
     var buffer = ByteBuffer.allocate(1024);
     buffer.position(2);
-    writableNetworkPacket.write(buffer);
+    writableNetworkPacket.write(null, buffer);
     buffer.putShort(0, (short) buffer.position());
     buffer.flip();
 
@@ -128,8 +127,8 @@ void serverSslNetworkTest() {
         .flip();
     short packetLength = buffer.getShort();
 
-    StringReadablePacket response = new StringReadablePacket();
-    response.read(buffer, packetLength - 2);
+    StringReadablePacket<StringDataSslConnection> response = new StringReadablePacket<>();
+    response.read(null, buffer, packetLength - 2);
 
     log.info(response.data(), "Response:[%s]"::formatted);
 
@@ -159,7 +158,7 @@ void clientSslNetworkTest() {
 
     clientNetwork
         .connectReactive(new InetSocketAddress("localhost", serverPort))
-        .doOnNext(connection -> connection.send(new StringWritableNetworkPacket("Hello SSL")))
+        .doOnNext(connection -> connection.send(new StringWritableNetworkPacket<>("Hello SSL")))
         .doOnError(Throwable::printStackTrace)
         .flatMapMany(Connection::receivedEvents)
         .subscribe(event -> {
@@ -180,18 +179,17 @@ void clientSslNetworkTest() {
 
     var dataLength = buffer.getShort();
 
-    var receivedPacket = new StringReadablePacket();
-    receivedPacket.read(buffer, dataLength);
+    var receivedPacket = new StringReadablePacket<StringDataSslConnection>();
+    receivedPacket.read(null, buffer, dataLength);
 
     Assertions.assertEquals("Hello SSL", receivedPacket.data());
 
     log.info(receivedPacket.data(), "Received from client:[%s]"::formatted);
 
-    StringWritableNetworkPacket writableNetworkPacket = new StringWritableNetworkPacket("Echo: Hello SSL");
-
+    var writableNetworkPacket = new StringWritableNetworkPacket<StringDataSslConnection>("Echo: Hello SSL");
     buffer.clear();
     buffer.position(2);
-    writableNetworkPacket.write(buffer);
+    writableNetworkPacket.write(null, buffer);
     buffer.putShort(0, (short) buffer.position());
     buffer.flip();
 
@@ -235,7 +233,7 @@ void echoNetworkTest() {
         .subscribe(event -> {
           var message = event.packet().data();
           log.info(message, "Received from client:[%s]"::formatted);
-          event.connection().send(new StringWritableNetworkPacket("Echo: " + message));
+          event.connection().send(new StringWritableNetworkPacket<>("Echo: " + message));
         });
 
     SSLContext clientSslContext = NetworkUtils.createAllTrustedClientSslContext();
@@ -307,10 +305,10 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
             var length = value % 3 == 0 ? bufferSize : random.nextInt(0, bufferSize / 2 - 1);
             return StringUtils.generate(length);
           })
-          .peek(message -> clientToServer.send(new StringWritableNetworkPacket(message)))
+          .peek(message -> clientToServer.send(new StringWritableNetworkPacket<>(message)))
           .toList();
 
-      List<? extends StringReadablePacket> receivedPackets =
+      List<? extends StringReadablePacket<StringDataSslConnection>> receivedPackets =
           ObjectUtils.notNull(pendingPacketsOnServer.blockFirst(Duration.ofSeconds(5000)));
 
       Assertions.assertEquals(packetCount, receivedPackets.size(), "Didn't receive all packets");
@@ -327,7 +325,7 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
     }
   }
 
-  private static StringWritableNetworkPacket newMessage(int minMessageLength, int maxMessageLength) {
-    return new StringWritableNetworkPacket(StringUtils.generate(minMessageLength, maxMessageLength));
+  private static StringWritableNetworkPacket<StringDataSslConnection> newMessage(int minMessageLength, int maxMessageLength) {
+    return new StringWritableNetworkPacket<>(StringUtils.generate(minMessageLength, maxMessageLength));
   }
 }

From 420942698436882b51be89afa9405b9235df48ca Mon Sep 17 00:00:00 2001
From: javasabr <javasabr@gmail.com>
Date: Wed, 8 Oct 2025 20:44:40 +0200
Subject: [PATCH 3/6] continue experiments with generics in network

---
 build.gradle                                  |  2 +-
 .../javasabr/rlib/network/Connection.java     | 33 +++++++---
 .../java/javasabr/rlib/network/Network.java   |  2 +-
 .../javasabr/rlib/network/NetworkFactory.java | 14 ++--
 .../rlib/network/UnsafeConnection.java        |  8 +--
 .../rlib/network/client/ClientNetwork.java    |  2 +-
 .../client/impl/DefaultClientNetwork.java     |  2 +-
 .../rlib/network/impl/AbstractConnection.java | 38 +++++------
 .../rlib/network/impl/AbstractNetwork.java    |  2 +-
 .../network/impl/AbstractSslConnection.java   |  7 +-
 .../rlib/network/impl/DefaultConnection.java  | 10 +--
 .../network/impl/DefaultDataConnection.java   |  8 +--
 .../impl/DefaultDataSslConnection.java        |  8 +--
 .../network/impl/IdBasedPacketConnection.java | 14 ++--
 .../network/impl/PackedIdBasedConnection.java |  7 +-
 .../network/impl/StringDataConnection.java    | 12 ++--
 .../network/impl/StringDataSslConnection.java | 11 ++--
 .../network/packet/IdBasedNetworkPacket.java  |  2 +-
 .../packet/IdBasedReadableNetworkPacket.java  |  7 +-
 .../packet/IdBasedWritableNetworkPacket.java  |  2 +-
 .../rlib/network/packet/NetworkPacket.java    |  2 +-
 .../network/packet/ReadableNetworkPacket.java |  2 +-
 .../packet/ReusableWritablePacket.java        |  4 +-
 .../network/packet/WritableNetworkPacket.java |  2 +-
 .../AbstractIdBasedReadableNetworkPacket.java |  4 +-
 .../packet/impl/AbstractNetworkPacket.java    |  2 +-
 .../impl/AbstractNetworkPacketReader.java     |  2 +-
 .../impl/AbstractNetworkPacketWriter.java     |  6 +-
 .../impl/AbstractReadableNetworkPacket.java   |  3 +-
 ...AbstractReusableWritableNetworkPacket.java | 26 ++++----
 .../impl/AbstractSslNetworkPacketReader.java  |  6 +-
 .../impl/AbstractSslNetworkPacketWriter.java  |  4 +-
 .../impl/AbstractWritableNetworkPacket.java   |  2 +-
 .../impl/DefaultNetworkPacketReader.java      |  2 +-
 .../impl/DefaultNetworkPacketWriter.java      |  2 +-
 .../impl/DefaultReadableNetworkPacket.java    |  6 +-
 .../impl/DefaultSslNetworkPacketReader.java   |  2 +-
 .../impl/DefaultSslNetworkPacketWriter.java   |  2 +-
 .../impl/DefaultWritableNetworkPacket.java    |  7 +-
 ...r.java => IdBasedNetworkPacketReader.java} | 10 +--
 .../impl/IdBasedNetworkPacketWriter.java      |  2 +-
 .../impl/SslWrapRequestNetworkPacket.java     | 20 ++++++
 .../packet/impl/SslWrapRequestPacket.java     | 20 ------
 ....java => StringReadableNetworkPacket.java} |  2 +-
 .../impl/StringWritableNetworkPacket.java     |  2 +-
 .../packet/impl/WritablePacketWrapper.java    |  4 +-
 .../ReadableNetworkPacketRegistry.java        | 65 +++++++++++++------
 .../IdBasedReadableNetworkPacketRegistry.java |  5 +-
 .../rlib/network/server/ServerNetwork.java    |  2 +-
 .../server/impl/DefaultServerNetwork.java     |  4 +-
 .../rlib/network/BaseNetworkTest.java         | 37 +++++++----
 .../rlib/network/DefaultNetworkTest.java      | 29 +++++----
 ...asedReadableNetworkPacketRegistryTest.java |  4 +-
 .../rlib/network/NetworkPacketTest.java       |  9 +--
 .../rlib/network/StringNetworkTest.java       | 19 +++---
 .../rlib/network/StringSslNetworkTest.java    | 30 ++++-----
 56 files changed, 276 insertions(+), 265 deletions(-)
 rename rlib-network/src/main/java/javasabr/rlib/network/packet/impl/{IdBasedPacketReader.java => IdBasedNetworkPacketReader.java} (88%)
 create mode 100644 rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestNetworkPacket.java
 delete mode 100644 rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestPacket.java
 rename rlib-network/src/main/java/javasabr/rlib/network/packet/impl/{StringReadablePacket.java => StringReadableNetworkPacket.java} (88%)

diff --git a/build.gradle b/build.gradle
index 37693f60..33804a0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-rootProject.version = "10.0.alpha2"
+rootProject.version = "10.0.alpha3"
 group = 'javasabr.rlib'
 
 allprojects {
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/Connection.java b/rlib-network/src/main/java/javasabr/rlib/network/Connection.java
index 79bfbc06..52b3040b 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/Connection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/Connection.java
@@ -11,10 +11,7 @@
  *
  * @author JavaSaBr
  */
-public interface Connection<
-    R extends ReadableNetworkPacket<C>,
-    W extends WritableNetworkPacket<C>,
-    C extends Connection<R, W, C>> {
+public interface Connection<C extends Connection<C>> {
 
   record ReceivedPacketEvent<C, R>(C connection, R packet) {
     @Override
@@ -46,27 +43,45 @@ public String toString() {
   /**
    * Send a packet to connection's owner.
    */
-  void send(W packet);
+  void send(WritableNetworkPacket<C> packet);
 
   /**
    * Send a packet to connection's owner with async feedback of this sending.
    *
    * @return the async result with true if the packet was sent or false if sending was failed.
    */
-  CompletableFuture<Boolean> sendWithFeedback(W packet);
+  CompletableFuture<Boolean> sendWithFeedback(WritableNetworkPacket<C> packet);
 
   /**
    * Register a consumer to handle received packets.
    */
-  void onReceive(BiConsumer<C, ? super R> consumer);
+  void onReceive(BiConsumer<C, ? super ReadableNetworkPacket<C>> consumer);
 
   /**
    * Get a stream of received packet events.
    */
-  Flux<ReceivedPacketEvent<C, ? extends R>> receivedEvents();
+  Flux<ReceivedPacketEvent<C, ? extends ReadableNetworkPacket<C>>> receivedEvents();
+
+  /**
+   * Get a stream of received packet events with expected packet type.
+   */
+  default <R extends ReadableNetworkPacket<C>> Flux<ReceivedPacketEvent<C, R>> receivedEvents(Class<R> packetType) {
+    return receivedEvents()
+        .filter(event -> packetType.isInstance(event.packet()))
+        .map(event -> (ReceivedPacketEvent<C, R>) event);
+  }
 
   /**
    * Get a stream of received packets.
    */
-  Flux<? extends R> receivedPackets();
+  Flux<? extends ReadableNetworkPacket<C>> receivedPackets();
+
+  /**
+   * Get a stream of received packets with expected type.
+   */
+  default <R extends ReadableNetworkPacket<C>> Flux<R> receivedPackets(Class<R> packetType) {
+    return receivedPackets()
+        .filter(packetType::isInstance)
+        .map(networkPacket -> (R) networkPacket);
+  }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/Network.java b/rlib-network/src/main/java/javasabr/rlib/network/Network.java
index 9422c8f2..c4e9bac0 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/Network.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/Network.java
@@ -5,7 +5,7 @@
  *
  * @author JavaSaBr
  */
-public interface Network<C extends Connection<?, ?, C>> {
+public interface Network<C extends Connection<C>> {
 
   /**
    * Shutdown this network.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java b/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java
index dcf5680d..187ec72b 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java
@@ -23,13 +23,13 @@
 @UtilityClass
 public final class NetworkFactory {
 
-  public static <C extends UnsafeConnection<?, ?, C>> ClientNetwork<C> clientNetwork(
+  public static <C extends UnsafeConnection<C>> ClientNetwork<C> clientNetwork(
       NetworkConfig networkConfig,
       BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection) {
     return new DefaultClientNetwork<>(networkConfig, channelToConnection);
   }
 
-  public static <C extends UnsafeConnection<?, ?, C>> ServerNetwork<C> serverNetwork(
+  public static <C extends UnsafeConnection<C>> ServerNetwork<C> serverNetwork(
       ServerNetworkConfig networkConfig,
       BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection) {
     return new DefaultServerNetwork<>(networkConfig, channelToConnection);
@@ -65,7 +65,7 @@ public static ClientNetwork<StringDataConnection> stringDataClientNetwork(
    * Create id based packet default asynchronous client network.
    */
   public static ClientNetwork<DefaultConnection> defaultClientNetwork(
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> packetRegistry) {
     return defaultClientNetwork(
         NetworkConfig.DEFAULT_CLIENT,
         new DefaultBufferAllocator(NetworkConfig.DEFAULT_CLIENT),
@@ -78,8 +78,8 @@ public static ClientNetwork<DefaultConnection> defaultClientNetwork(
   public static ClientNetwork<DefaultConnection> defaultClientNetwork(
       NetworkConfig networkConfig,
       BufferAllocator bufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
-    return clientNetwork(
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> packetRegistry) {
+    return NetworkFactory.clientNetwork(
         networkConfig,
         (network, channel) -> new DefaultConnection(network, channel, bufferAllocator, packetRegistry));
   }
@@ -139,7 +139,7 @@ public static ServerNetwork<StringDataSslConnection> stringDataSslServerNetwork(
    * Create id based packet default asynchronous server network.
    */
   public static ServerNetwork<DefaultConnection> defaultServerNetwork(
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> packetRegistry) {
     return defaultServerNetwork(
         ServerNetworkConfig.DEFAULT_SERVER,
         new DefaultBufferAllocator(ServerNetworkConfig.DEFAULT_SERVER),
@@ -152,7 +152,7 @@ public static ServerNetwork<DefaultConnection> defaultServerNetwork(
   public static ServerNetwork<DefaultConnection> defaultServerNetwork(
       ServerNetworkConfig networkConfig,
       BufferAllocator bufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> packetRegistry) {
     return serverNetwork(
         networkConfig,
         (network, channel) -> new DefaultConnection(network, channel, bufferAllocator, packetRegistry));
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
index 80ff54b9..38feae6e 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
@@ -1,12 +1,6 @@
 package javasabr.rlib.network;
 
-import javasabr.rlib.network.packet.ReadableNetworkPacket;
-import javasabr.rlib.network.packet.WritableNetworkPacket;
-
-public interface UnsafeConnection<
-    R extends ReadableNetworkPacket<C>,
-    W extends WritableNetworkPacket<C>,
-    C extends Connection<R, W, C>> extends Connection<R, W, C> {
+public interface UnsafeConnection<C extends UnsafeConnection<C>> extends Connection<C> {
 
   void onConnected();
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java
index c2384004..586c43ef 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java
@@ -13,7 +13,7 @@
  *
  * @author JavaSaBr
  */
-public interface ClientNetwork<C extends Connection<?, ?, C>> extends Network<C> {
+public interface ClientNetwork<C extends Connection<C>> extends Network<C> {
 
   /**
    * Connect to a server by the address.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
index 71c210c6..5f0ddc69 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
@@ -33,7 +33,7 @@
 @CustomLog
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class DefaultClientNetwork<C extends Connection<?, ?, C>> extends AbstractNetwork<C>
+public class DefaultClientNetwork<C extends Connection<C>> extends AbstractNetwork<C>
     implements ClientNetwork<C> {
 
   final AtomicBoolean connecting;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
index 931cc74a..4ac15f48 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
@@ -39,16 +39,12 @@
 @CustomLog
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractConnection<
-    R extends ReadableNetworkPacket<C>,
-    W extends WritableNetworkPacket<C>,
-    C extends AbstractConnection<R, W, C>> implements UnsafeConnection<R, W, C> {
+public abstract class AbstractConnection<C extends AbstractConnection<C>> implements UnsafeConnection<C> {
 
-  private static class WritablePacketWithFeedback<
-      W extends WritableNetworkPacket<C>,
-      C extends Connection> extends WritablePacketWrapper<CompletableFuture<Boolean>, W, C> {
+  private static class WritablePacketWithFeedback<C extends Connection<C>>
+      extends WritablePacketWrapper<CompletableFuture<Boolean>, C> {
 
-    public WritablePacketWithFeedback(CompletableFuture<Boolean> attachment, W packet) {
+    public WritablePacketWithFeedback(CompletableFuture<Boolean> attachment, WritableNetworkPacket<C> packet) {
       super(attachment, packet);
     }
   }
@@ -65,7 +61,7 @@ public WritablePacketWithFeedback(CompletableFuture<Boolean> attachment, W packe
   final AtomicBoolean isWriting;
   final AtomicBoolean closed;
 
-  final MutableArray<BiConsumer<C, ? super R>> subscribers;
+  final MutableArray<BiConsumer<C, ? super ReadableNetworkPacket<C>>> subscribers;
 
   final int maxPacketsByRead;
 
@@ -97,25 +93,25 @@ public void onConnected() {}
   protected abstract NetworkPacketWriter packetWriter();
 
   @Override
-  public void onReceive(BiConsumer<C, ? super R> consumer) {
+  public void onReceive(BiConsumer<C, ? super ReadableNetworkPacket<C>> consumer) {
     subscribers.add(consumer);
     packetReader().startRead();
   }
 
   @Override
-  public Flux<ReceivedPacketEvent<C, ? extends R>> receivedEvents() {
+  public Flux<ReceivedPacketEvent<C, ? extends ReadableNetworkPacket<C>>> receivedEvents() {
     return Flux.create(this::registerFluxOnReceivedEvents);
   }
 
   @Override
-  public Flux<? extends R> receivedPackets() {
+  public Flux<? extends ReadableNetworkPacket<C>> receivedPackets() {
     return Flux.create(this::registerFluxOnReceivedPackets);
   }
 
   protected void registerFluxOnReceivedEvents(
-      FluxSink<ReceivedPacketEvent<C, ? extends R>> sink) {
+      FluxSink<ReceivedPacketEvent<C, ? extends ReadableNetworkPacket<C>>> sink) {
 
-    BiConsumer<C, R> listener =
+    BiConsumer<C, ReadableNetworkPacket<C>> listener =
       (connection, packet) -> sink.next(new ReceivedPacketEvent<>(connection,
         packet));
 
@@ -124,8 +120,8 @@ protected void registerFluxOnReceivedEvents(
     sink.onDispose(() -> subscribers.remove(listener));
   }
 
-  protected void registerFluxOnReceivedPackets(FluxSink<? super R> sink) {
-    BiConsumer<C, R> listener = (connection, packet) -> sink.next(packet);
+  protected void registerFluxOnReceivedPackets(FluxSink<? super ReadableNetworkPacket<C>> sink) {
+    BiConsumer<C, ReadableNetworkPacket<C>> listener = (connection, packet) -> sink.next(packet);
     onReceive(listener);
     sink.onDispose(() -> subscribers.remove(listener));
   }
@@ -173,7 +169,7 @@ public boolean closed() {
 
   protected void serializedPacket(WritableNetworkPacket<?> packet) {}
 
-  protected void handleReceivedPacket(R packet) {
+  protected void handleReceivedPacket(ReadableNetworkPacket<C> packet) {
     log.debug(packet, remoteAddress, "Handle received packet:[%s] from:[%s]"::formatted);
     subscribers
         .iterations()
@@ -181,15 +177,15 @@ protected void handleReceivedPacket(R packet) {
   }
 
   protected void handleSentPacket(WritableNetworkPacket<?> packet, boolean result) {
-    if (packet instanceof WritablePacketWithFeedback) {
-      ((WritablePacketWithFeedback<?, ?>) packet)
+    if (packet instanceof WritablePacketWithFeedback<?> withFeedback) {
+      withFeedback
           .getAttachment()
           .complete(result);
     }
   }
 
   @Override
-  public final void send(W packet) {
+  public final void send(WritableNetworkPacket<C> packet) {
     sendImpl(packet);
   }
 
@@ -219,7 +215,7 @@ protected void queueAtFirst(WritableNetworkPacket<C> packet) {
   }
 
   @Override
-  public CompletableFuture<Boolean> sendWithFeedback(W packet) {
+  public CompletableFuture<Boolean> sendWithFeedback(WritableNetworkPacket<C> packet) {
 
     var asyncResult = new CompletableFuture<Boolean>();
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
index 4e6e179b..fcb3c990 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
@@ -18,7 +18,7 @@
 @CustomLog
 @RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
-public abstract class AbstractNetwork<C extends Connection<?, ?, C>> implements Network<C> {
+public abstract class AbstractNetwork<C extends Connection<C>> implements Network<C> {
   NetworkConfig config;
   BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection;
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSslConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSslConnection.java
index 5fef9d9d..9ae853d7 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSslConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSslConnection.java
@@ -3,7 +3,6 @@
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.Network;
-import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -12,10 +11,8 @@
 import lombok.experimental.FieldDefaults;
 
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractSslConnection<
-    R extends ReadableNetworkPacket<C>,
-    W extends WritableNetworkPacket<C>,
-    C extends AbstractSslConnection<R, W, C>> extends AbstractConnection<R, W, C> {
+public abstract class AbstractSslConnection<C extends AbstractSslConnection<C>>
+    extends AbstractConnection<C> {
 
   final SSLEngine sslEngine;
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java
index 04659f7f..c229f80c 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java
@@ -3,23 +3,19 @@
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.Network;
-import javasabr.rlib.network.packet.impl.DefaultReadableNetworkPacket;
-import javasabr.rlib.network.packet.impl.DefaultWritableNetworkPacket;
+import javasabr.rlib.network.packet.IdBasedReadableNetworkPacket;
 import javasabr.rlib.network.packet.registry.ReadableNetworkPacketRegistry;
 
 /**
  * @author JavaSaBr
  */
-public class DefaultConnection extends IdBasedPacketConnection<
-    DefaultReadableNetworkPacket,
-    DefaultWritableNetworkPacket,
-    DefaultConnection> {
+public class DefaultConnection extends IdBasedPacketConnection<DefaultConnection> {
 
   public DefaultConnection(
       Network<DefaultConnection> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> packetRegistry) {
+      ReadableNetworkPacketRegistry<? extends IdBasedReadableNetworkPacket<DefaultConnection>, DefaultConnection> packetRegistry) {
     super(network, channel, bufferAllocator, packetRegistry, 100, 2, 2);
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java
index 78acf98d..e15bd66d 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java
@@ -6,7 +6,6 @@
 import javasabr.rlib.network.packet.NetworkPacketReader;
 import javasabr.rlib.network.packet.NetworkPacketWriter;
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
-import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javasabr.rlib.network.packet.impl.DefaultNetworkPacketReader;
 import javasabr.rlib.network.packet.impl.DefaultNetworkPacketWriter;
 import lombok.AccessLevel;
@@ -20,10 +19,7 @@
 @Getter(AccessLevel.PROTECTED)
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class DefaultDataConnection<
-    R extends ReadableNetworkPacket<C>,
-    W extends WritableNetworkPacket<C>,
-    C extends DefaultDataConnection<R, W, C>> extends AbstractConnection<R, W, C> {
+public abstract class DefaultDataConnection<C extends DefaultDataConnection<C>> extends AbstractConnection<C> {
 
   final NetworkPacketReader packetReader;
   final NetworkPacketWriter packetWriter;
@@ -66,5 +62,5 @@ protected NetworkPacketWriter createPacketWriter() {
         packetLengthHeaderSize);
   }
 
-  protected abstract R createReadablePacket();
+  protected abstract ReadableNetworkPacket<C> createReadablePacket();
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSslConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSslConnection.java
index 8f7c9283..30ac62be 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSslConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSslConnection.java
@@ -6,7 +6,6 @@
 import javasabr.rlib.network.packet.NetworkPacketReader;
 import javasabr.rlib.network.packet.NetworkPacketWriter;
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
-import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javasabr.rlib.network.packet.impl.DefaultSslNetworkPacketReader;
 import javasabr.rlib.network.packet.impl.DefaultSslNetworkPacketWriter;
 import javax.net.ssl.SSLContext;
@@ -21,10 +20,7 @@
 @Getter(AccessLevel.PROTECTED)
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class DefaultDataSslConnection<
-    R extends ReadableNetworkPacket<C>,
-    W extends WritableNetworkPacket<C>,
-    C extends DefaultDataSslConnection<R, W, C>> extends AbstractSslConnection<R, W, C> {
+public abstract class DefaultDataSslConnection<C extends DefaultDataSslConnection<C>> extends AbstractSslConnection<C> {
 
   final NetworkPacketReader packetReader;
   final NetworkPacketWriter packetWriter;
@@ -73,5 +69,5 @@ protected NetworkPacketWriter createPacketWriter() {
         packetLengthHeaderSize);
   }
 
-  protected abstract R createReadablePacket();
+  protected abstract ReadableNetworkPacket<C> createReadablePacket();
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java
index a1b09c61..31ec2de4 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java
@@ -4,10 +4,9 @@
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.IdBasedReadableNetworkPacket;
-import javasabr.rlib.network.packet.IdBasedWritableNetworkPacket;
 import javasabr.rlib.network.packet.NetworkPacketReader;
 import javasabr.rlib.network.packet.NetworkPacketWriter;
-import javasabr.rlib.network.packet.impl.IdBasedPacketReader;
+import javasabr.rlib.network.packet.impl.IdBasedNetworkPacketReader;
 import javasabr.rlib.network.packet.impl.IdBasedNetworkPacketWriter;
 import javasabr.rlib.network.packet.registry.ReadableNetworkPacketRegistry;
 import lombok.AccessLevel;
@@ -21,14 +20,11 @@
 @Getter(AccessLevel.PROTECTED)
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class IdBasedPacketConnection<
-    R extends IdBasedReadableNetworkPacket<R, C>,
-    W extends IdBasedWritableNetworkPacket<C>,
-    C extends IdBasedPacketConnection<R, W, C>> extends AbstractConnection<R, W, C> {
+public class IdBasedPacketConnection<C extends IdBasedPacketConnection<C>> extends AbstractConnection<C> {
 
   final NetworkPacketReader packetReader;
   final NetworkPacketWriter packetWriter;
-  final ReadableNetworkPacketRegistry<R, C> packetRegistry;
+  final ReadableNetworkPacketRegistry<? extends IdBasedReadableNetworkPacket<C>, C> packetRegistry;
 
   final int packetLengthHeaderSize;
   final int packetIdHeaderSize;
@@ -37,7 +33,7 @@ public IdBasedPacketConnection(
       Network<C> network,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
-      ReadableNetworkPacketRegistry<R, C> packetRegistry,
+      ReadableNetworkPacketRegistry<? extends IdBasedReadableNetworkPacket<C>, C> packetRegistry,
       int maxPacketsByRead,
       int packetLengthHeaderSize,
       int packetIdHeaderSize) {
@@ -50,7 +46,7 @@ public IdBasedPacketConnection(
   }
 
   protected NetworkPacketReader createPacketReader() {
-    return new IdBasedPacketReader<>(
+    return new IdBasedNetworkPacketReader<>(
         (C) this,
         channel,
         bufferAllocator,
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java
index 5a598582..d172d847 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java
@@ -1,18 +1,13 @@
 package javasabr.rlib.network.impl;
 
 import javasabr.rlib.network.Connection;
-import javasabr.rlib.network.packet.ReadableNetworkPacket;
-import javasabr.rlib.network.packet.WritableNetworkPacket;
 
 /**
  * The interface to implement a packet id based async connection.
  *
  * @author JavaSaBr
  */
-public interface PackedIdBasedConnection<
-    R extends ReadableNetworkPacket<C>,
-    W extends WritableNetworkPacket<C>,
-    C extends Connection<R, W, C>> extends Connection<R, W, C> {
+public interface PackedIdBasedConnection<C extends Connection<C>> extends Connection<C> {
 
   /**
    * Get length of packet's header with packet's data length.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java
index 27faff18..b7a3addd 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java
@@ -3,16 +3,12 @@
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.Network;
-import javasabr.rlib.network.packet.impl.StringReadablePacket;
-import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
+import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 
 /**
  * @author JavaSaBr
  */
-public class StringDataConnection extends DefaultDataConnection<
-    StringReadablePacket<StringDataConnection>,
-    StringWritableNetworkPacket<StringDataConnection>,
-    StringDataConnection> {
+public class StringDataConnection extends DefaultDataConnection<StringDataConnection> {
 
   public StringDataConnection(
       Network<StringDataConnection> network,
@@ -22,7 +18,7 @@ public StringDataConnection(
   }
 
   @Override
-  protected StringReadablePacket<StringDataConnection> createReadablePacket() {
-    return new StringReadablePacket<>();
+  protected StringReadableNetworkPacket<StringDataConnection> createReadablePacket() {
+    return new StringReadableNetworkPacket<>();
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
index b61488e0..82a38e6d 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
@@ -3,17 +3,14 @@
 import java.nio.channels.AsynchronousSocketChannel;
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.Network;
-import javasabr.rlib.network.packet.impl.StringReadablePacket;
+import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
 import javax.net.ssl.SSLContext;
 
 /**
  * @author JavaSaBr
  */
-public class StringDataSslConnection extends DefaultDataSslConnection<
-    StringReadablePacket<StringDataSslConnection>,
-    StringWritableNetworkPacket<StringDataSslConnection>,
-    StringDataSslConnection> {
+public class StringDataSslConnection extends DefaultDataSslConnection<StringDataSslConnection> {
 
   public StringDataSslConnection(
       Network<StringDataSslConnection> network,
@@ -25,7 +22,7 @@ public StringDataSslConnection(
   }
 
   @Override
-  protected StringReadablePacket<StringDataSslConnection> createReadablePacket() {
-    return new StringReadablePacket<>();
+  protected StringReadableNetworkPacket<StringDataSslConnection> createReadablePacket() {
+    return new StringReadableNetworkPacket<>();
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedNetworkPacket.java
index ae0210aa..9f75c928 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedNetworkPacket.java
@@ -6,7 +6,7 @@
 /**
  * @author JavaSaBr
  */
-public interface IdBasedNetworkPacket<C extends Connection> extends NetworkPacket<C> {
+public interface IdBasedNetworkPacket<C extends Connection<C>> extends NetworkPacket<C> {
 
   /**
    * Get id of this packet.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadableNetworkPacket.java
index 6a82364a..9664624d 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadableNetworkPacket.java
@@ -6,14 +6,13 @@
 /**
  * @author JavaSaBr
  */
-public interface IdBasedReadableNetworkPacket<
-    S extends IdBasedReadableNetworkPacket<S, C>,
-    C extends Connection> extends ReadableNetworkPacket<C>, IdBasedNetworkPacket<C> {
+public interface IdBasedReadableNetworkPacket<C extends Connection<C>>
+    extends ReadableNetworkPacket<C>, IdBasedNetworkPacket<C> {
 
   /**
    * Create a new instance of this type.
    */
-  default S newInstance() {
+  default IdBasedReadableNetworkPacket<C> newInstance() {
     return ClassUtils.newInstance(getClass());
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritableNetworkPacket.java
index 93f6ece6..d06c6bee 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritableNetworkPacket.java
@@ -5,6 +5,6 @@
 /**
  * @author JavaSaBr
  */
-public interface IdBasedWritableNetworkPacket<C extends Connection>
+public interface IdBasedWritableNetworkPacket<C extends Connection<C>>
     extends WritableNetworkPacket<C>, IdBasedNetworkPacket<C> {
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/NetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/NetworkPacket.java
index 7110f4c3..037500e7 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/NetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/NetworkPacket.java
@@ -7,7 +7,7 @@
  *
  * @author JavaSaBr
  */
-public interface NetworkPacket<C extends Connection> {
+public interface NetworkPacket<C extends Connection<C>> {
 
   /**
    * @return the packet's name.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadableNetworkPacket.java
index e0d45fd1..72407a02 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadableNetworkPacket.java
@@ -8,7 +8,7 @@
  *
  * @author JavaSaBr
  */
-public interface ReadableNetworkPacket<C extends Connection> extends NetworkPacket<C> {
+public interface ReadableNetworkPacket<C extends Connection<C>> extends NetworkPacket<C> {
 
   /**
    * Read packet's data from byte buffer.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java
index b9209685..ccbd5262 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java
@@ -9,7 +9,7 @@
  *
  * @author JavaSaBr
  */
-public interface ReusableWritablePacket<C extends Connection> extends WritableNetworkPacket<C>, Reusable {
+public interface ReusableWritablePacket<C extends Connection<C>> extends WritableNetworkPacket<C>, Reusable {
 
   /**
    * Handle completion of packet sending.
@@ -50,7 +50,7 @@ public interface ReusableWritablePacket<C extends Connection> extends WritableNe
    *
    * @param pool the pool to store used packet.
    */
-  void setPool(Pool<ReusableWritablePacket> pool);
+  void setPool(Pool<ReusableWritablePacket<C>> pool);
 
   default void notifyAddedToSend() {
     increaseSends();
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
index 157b0887..c5c076cd 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
@@ -8,7 +8,7 @@
  *
  * @author JavaSaBr
  */
-public interface WritableNetworkPacket<C extends Connection> extends NetworkPacket<C> {
+public interface WritableNetworkPacket<C extends Connection<C>> extends NetworkPacket<C> {
 
   /**
    * Write this packet to the buffer.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadableNetworkPacket.java
index 29d026a8..4e9a53d1 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadableNetworkPacket.java
@@ -6,6 +6,6 @@
 /**
  * @author JavaSaBr
  */
-public abstract class AbstractIdBasedReadableNetworkPacket<S extends AbstractIdBasedReadableNetworkPacket<S, C>, C extends Connection>
-    extends AbstractReadableNetworkPacket<C> implements IdBasedReadableNetworkPacket<S, C> {
+public abstract class AbstractIdBasedReadableNetworkPacket<C extends Connection<C>>
+    extends AbstractReadableNetworkPacket<C> implements IdBasedReadableNetworkPacket<C> {
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacket.java
index 50246670..c0f4f97c 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacket.java
@@ -13,7 +13,7 @@
  * @author JavaSaBr
  */
 @CustomLog
-public abstract class AbstractNetworkPacket<C extends Connection> implements NetworkPacket<C> {
+public abstract class AbstractNetworkPacket<C extends Connection<C>> implements NetworkPacket<C> {
 
   /**
    * Handles packet data exception.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
index 18cfa6ad..d589a284 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
@@ -29,7 +29,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public abstract class AbstractNetworkPacketReader<
     R extends ReadableNetworkPacket<C>,
-    C extends Connection<R, ?, C>> implements NetworkPacketReader {
+    C extends Connection<C>> implements NetworkPacketReader {
 
   final CompletionHandler<Integer, ByteBuffer> readChannelHandler = new CompletionHandler<>() {
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
index 699e0ba9..6c9f153c 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
@@ -33,7 +33,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public abstract class AbstractNetworkPacketWriter<
     W extends WritableNetworkPacket<C>,
-    C extends Connection<?, W, C>> implements NetworkPacketWriter {
+    C extends Connection<C>> implements NetworkPacketWriter {
 
   final CompletionHandler<Integer, @Nullable WritableNetworkPacket<C>> writeHandler = new CompletionHandler<>() {
 
@@ -146,8 +146,8 @@ protected boolean writeBuffer(
    */
   protected ByteBuffer serialize(WritableNetworkPacket<C> packet) {
 
-    if (packet instanceof WritablePacketWrapper) {
-      packet = ((WritablePacketWrapper<?, ?, C>) packet).getPacket();
+    if (packet instanceof WritablePacketWrapper<?, C> wrapper) {
+      packet = wrapper.getPacket();
     }
 
     W resultPacket = (W) packet;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
index 9e2cd026..c1fd1f84 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadableNetworkPacket.java
@@ -2,7 +2,6 @@
 
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
-import javasabr.rlib.common.util.ClassUtils;
 import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import lombok.AccessLevel;
@@ -16,7 +15,7 @@
  */
 @CustomLog
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public abstract class AbstractReadableNetworkPacket<C extends Connection>
+public abstract class AbstractReadableNetworkPacket<C extends Connection<C>>
     extends AbstractNetworkPacket<C> implements ReadableNetworkPacket<C> {
 
   @Override
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
index 71a37ad5..9c55dc62 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
@@ -9,6 +9,7 @@
 import javasabr.rlib.common.util.ClassUtils;
 import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.ReusableWritablePacket;
+import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javasabr.rlib.reusable.pool.Pool;
 import javasabr.rlib.reusable.pool.PoolFactory;
 import lombok.AccessLevel;
@@ -24,7 +25,7 @@
  */
 @CustomLog
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public abstract class AbstractReusableWritableNetworkPacket<C extends Connection>
+public abstract class AbstractReusableWritableNetworkPacket<C extends Connection<C>>
     extends AbstractWritableNetworkPacket<C> implements ReusableWritablePacket<C> {
 
   protected static final ThreadLocal<Map<Class<? super ReusableWritablePacket>, Pool<ReusableWritablePacket>>>
@@ -36,7 +37,7 @@ public abstract class AbstractReusableWritableNetworkPacket<C extends Connection
    * The pool to store this packet after using.
    */
   @Nullable
-  volatile Pool<ReusableWritablePacket> pool;
+  volatile Pool<ReusableWritablePacket<C>> pool;
   volatile int barrier;
 
   int barrierSink;
@@ -124,11 +125,10 @@ public void forceComplete() {
    *
    * @return thread local pool.
    */
-  protected Pool<ReusableWritablePacket> threadLocalPool() {
-    Class<ReusableWritablePacket> packetClass = ClassUtils.unsafeNNCast(getClass());
-    return LOCAL_POOLS
-        .get()
-        .computeIfAbsent(packetClass, PoolFactory::newLockBasePool);
+  protected Pool<ReusableWritablePacket<C>> threadLocalPool() {
+    Pool<ReusableWritablePacket> resultPool = LOCAL_POOLS.get()
+        .computeIfAbsent(ClassUtils.unsafeNNCast(getClass()), PoolFactory::newLockBasePool);
+    return ClassUtils.unsafeCast(resultPool);
   }
 
   /**
@@ -136,9 +136,9 @@ protected Pool<ReusableWritablePacket> threadLocalPool() {
    *
    * @return the pool to store used packet.
    */
-  protected Pool<ReusableWritablePacket> getPool() {
+  protected Pool<ReusableWritablePacket<C>> getPool() {
 
-    Pool<ReusableWritablePacket> local = this.pool;
+    Pool<ReusableWritablePacket<C>> local = this.pool;
     if (local != null) {
       return local;
     }
@@ -167,17 +167,17 @@ protected void completeImpl() {
    * @param <T> the result packet's type.
    * @return the new instance.
    */
-  public <T extends ReusableWritablePacket> T newInstance() {
+  public <T extends ReusableWritablePacket<C>> T newInstance() {
 
-    Pool<ReusableWritablePacket> pool = getPool();
-    ReusableWritablePacket result = pool.take(getClass(), ClassUtils::newInstance);
+    Pool<ReusableWritablePacket<C>> pool = getPool();
+    ReusableWritablePacket<C> result = pool.take(getClass(), ClassUtils::newInstance);
     result.setPool(pool);
 
     return notNull(ClassUtils.unsafeCast(result));
   }
 
   @Override
-  public final void setPool(Pool<ReusableWritablePacket> pool) {
+  public final void setPool(Pool<ReusableWritablePacket<C>> pool) {
     this.pool = pool;
   }
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
index 347b6c58..3cebfea5 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
@@ -30,7 +30,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public abstract class AbstractSslNetworkPacketReader<
     R extends ReadableNetworkPacket<C>,
-    C extends Connection<R, ?, C>> extends AbstractNetworkPacketReader<R, C> {
+    C extends Connection<C>> extends AbstractNetworkPacketReader<R, C> {
 
   private static final ByteBuffer[] EMPTY_BUFFERS = {
       NetworkUtils.EMPTY_BUFFER
@@ -158,7 +158,7 @@ protected int doHandshake(ByteBuffer networkBuffer, int receivedBytes) {
         }
         case NEED_WRAP: {
           log.debug(remoteAddress, "[%s] Send command to wrap data"::formatted);
-          packetWriter.accept(SslWrapRequestPacket.getInstance());
+          packetWriter.accept(SslWrapRequestNetworkPacket.getInstance());
           NetworkUtils.cleanNetworkBuffer(networkBuffer);
           return SKIP_READ_PACKETS;
         }
@@ -180,7 +180,7 @@ protected int doHandshake(ByteBuffer networkBuffer, int receivedBytes) {
     if (!networkBuffer.hasRemaining()) {
       // if buffer is empty and status is FINISHED then we can notify writer
       if (handshakeStatus == HandshakeStatus.FINISHED) {
-        packetWriter.accept(SslWrapRequestPacket.getInstance());
+        packetWriter.accept(SslWrapRequestNetworkPacket.getInstance());
       }
       NetworkUtils.cleanNetworkBuffer(networkBuffer);
       return SKIP_READ_PACKETS;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketWriter.java
index d9d0aa78..b759aea6 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketWriter.java
@@ -29,7 +29,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public abstract class AbstractSslNetworkPacketWriter<
     W extends WritableNetworkPacket<C>,
-    C extends Connection<?, W, C>> extends AbstractNetworkPacketWriter<W, C> {
+    C extends Connection<C>> extends AbstractNetworkPacketWriter<W, C> {
 
   private static final ByteBuffer[] EMPTY_BUFFERS = {
       NetworkUtils.EMPTY_BUFFER
@@ -96,7 +96,7 @@ protected boolean tryToSendNextPacketImpl() {
 
   @Override
   protected ByteBuffer serialize(WritableNetworkPacket<C> packet) {
-    if (packet instanceof SslWrapRequestPacket) {
+    if (packet instanceof SslWrapRequestNetworkPacket) {
       return EMPTY_BUFFER;
     }
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
index f3f47233..f1b0452b 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritableNetworkPacket.java
@@ -12,7 +12,7 @@
  * @author JavaSaBr
  */
 @CustomLog
-public abstract class AbstractWritableNetworkPacket<C extends Connection>
+public abstract class AbstractWritableNetworkPacket<C extends Connection<C>>
     extends AbstractNetworkPacket<C> implements WritableNetworkPacket<C> {
 
   @Override
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
index e0855e77..16858dbd 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
@@ -17,7 +17,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public class DefaultNetworkPacketReader<
     R extends ReadableNetworkPacket<C>,
-    C extends Connection<R, ?, C>> extends AbstractNetworkPacketReader<R, C> {
+    C extends Connection<C>> extends AbstractNetworkPacketReader<R, C> {
 
   final IntFunction<R> readablePacketFactory;
   final int packetLengthHeaderSize;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketWriter.java
index 7f8d7a13..9234df50 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketWriter.java
@@ -18,7 +18,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public class DefaultNetworkPacketWriter<
     W extends WritableNetworkPacket<C>,
-    C extends Connection<?, W, C>> extends AbstractNetworkPacketWriter<W, C> {
+    C extends Connection<C>> extends AbstractNetworkPacketWriter<W, C> {
 
   final int packetLengthHeaderSize;
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadableNetworkPacket.java
index 3f2be3f1..ba88583e 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadableNetworkPacket.java
@@ -1,11 +1,9 @@
 package javasabr.rlib.network.packet.impl;
 
-import javasabr.rlib.network.impl.DefaultConnection;
+import javasabr.rlib.network.Connection;
 
 /**
  * @author JavaSaBr
  */
-public class DefaultReadableNetworkPacket extends
-    AbstractIdBasedReadableNetworkPacket<DefaultReadableNetworkPacket, DefaultConnection> {
-
+public class DefaultReadableNetworkPacket<C extends Connection<C>> extends AbstractIdBasedReadableNetworkPacket<C> {
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
index 84f73027..34b6a877 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
@@ -19,7 +19,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public class DefaultSslNetworkPacketReader<
     R extends ReadableNetworkPacket<C>,
-    C extends Connection<R, ?, C>> extends AbstractSslNetworkPacketReader<R, C> {
+    C extends Connection<C>> extends AbstractSslNetworkPacketReader<R, C> {
 
   final IntFunction<R> packetResolver;
   final int packetLengthHeaderSize;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketWriter.java
index 9d0e91e4..44f93818 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketWriter.java
@@ -19,7 +19,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public class DefaultSslNetworkPacketWriter<
     W extends WritableNetworkPacket<C>,
-    C extends Connection<?, W, C>> extends AbstractSslNetworkPacketWriter<W, C> {
+    C extends Connection<C>> extends AbstractSslNetworkPacketWriter<W, C> {
 
   final int packetLengthHeaderSize;
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritableNetworkPacket.java
index 3de5f102..fc2b2071 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritableNetworkPacket.java
@@ -1,11 +1,10 @@
 package javasabr.rlib.network.packet.impl;
 
-import javasabr.rlib.network.impl.DefaultConnection;
+import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.IdBasedWritableNetworkPacket;
 
 /**
  * @author JavaSaBr
  */
-public class DefaultWritableNetworkPacket
-    extends AbstractWritableNetworkPacket<DefaultConnection>
-    implements IdBasedWritableNetworkPacket<DefaultConnection> {}
+public class DefaultWritableNetworkPacket<C extends Connection<C>> extends AbstractWritableNetworkPacket<C>
+    implements IdBasedWritableNetworkPacket<C> {}
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketReader.java
similarity index 88%
rename from rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java
rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketReader.java
index 128d7217..4b3eabdd 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketReader.java
@@ -15,15 +15,15 @@
  * @author JavaSaBr
  */
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class IdBasedPacketReader<
-    R extends IdBasedReadableNetworkPacket<R, C>,
-    C extends Connection<R, ?, C>> extends AbstractNetworkPacketReader<R, C> {
+public class IdBasedNetworkPacketReader<
+    R extends IdBasedReadableNetworkPacket<C>,
+    C extends Connection<C>> extends AbstractNetworkPacketReader<R, C> {
 
   final ReadableNetworkPacketRegistry<R, C> packetRegistry;
   final int packetLengthHeaderSize;
   final int packetIdHeaderSize;
 
-  public IdBasedPacketReader(
+  public IdBasedNetworkPacketReader(
       C connection,
       AsynchronousSocketChannel channel,
       BufferAllocator bufferAllocator,
@@ -56,7 +56,7 @@ protected R createPacketFor(
       int startPacketPosition,
       int packetFullLength,
       int packetDataLength) {
-    return packetRegistry
+    return (R) packetRegistry
         .resolvePrototypeById(readHeader(buffer, packetIdHeaderSize))
         .newInstance();
   }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
index 9add0046..2c381a39 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
@@ -22,7 +22,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public class IdBasedNetworkPacketWriter<
     W extends IdBasedWritableNetworkPacket<C>,
-    C extends Connection<?, W, C>> extends DefaultNetworkPacketWriter<W, C> {
+    C extends Connection<C>> extends DefaultNetworkPacketWriter<W, C> {
 
   final int packetIdHeaderSize;
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestNetworkPacket.java
new file mode 100644
index 00000000..8781301d
--- /dev/null
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestNetworkPacket.java
@@ -0,0 +1,20 @@
+package javasabr.rlib.network.packet.impl;
+
+import java.nio.ByteBuffer;
+import javasabr.rlib.network.Connection;
+import javasabr.rlib.network.packet.MarkerNetworkPacket;
+
+public class SslWrapRequestNetworkPacket<C extends Connection<C>>
+    extends AbstractWritableNetworkPacket<C> implements MarkerNetworkPacket {
+
+  private static final SslWrapRequestNetworkPacket<?> INSTANCE = new SslWrapRequestNetworkPacket<>();
+
+  public static <C extends Connection<C>> SslWrapRequestNetworkPacket<C> getInstance() {
+    return (SslWrapRequestNetworkPacket<C>) INSTANCE;
+  }
+
+  @Override
+  public boolean write(C connection, ByteBuffer buffer) {
+    return true;
+  }
+}
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestPacket.java
deleted file mode 100644
index de209772..00000000
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SslWrapRequestPacket.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package javasabr.rlib.network.packet.impl;
-
-import java.nio.ByteBuffer;
-import javasabr.rlib.network.Connection;
-import javasabr.rlib.network.packet.MarkerNetworkPacket;
-
-public class SslWrapRequestPacket<C extends Connection> extends AbstractWritableNetworkPacket<C>
-    implements MarkerNetworkPacket {
-
-  private static final SslWrapRequestPacket<?> INSTANCE = new SslWrapRequestPacket<>();
-
-  public static <C extends Connection> SslWrapRequestPacket<C> getInstance() {
-    return (SslWrapRequestPacket<C>) INSTANCE;
-  }
-
-  @Override
-  public boolean write(C connection, ByteBuffer buffer) {
-    return true;
-  }
-}
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadableNetworkPacket.java
similarity index 88%
rename from rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java
rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadableNetworkPacket.java
index b7cc3255..4cbbbd6e 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadableNetworkPacket.java
@@ -14,7 +14,7 @@
 @Getter
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
-public class StringReadablePacket<C extends Connection> extends AbstractReadableNetworkPacket<C> {
+public class StringReadableNetworkPacket<C extends Connection<C>> extends AbstractReadableNetworkPacket<C> {
 
   public static final int MAX_LENGTH = 100_000;
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritableNetworkPacket.java
index 87f87200..14331c63 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritableNetworkPacket.java
@@ -15,7 +15,7 @@
 @RequiredArgsConstructor
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-public class StringWritableNetworkPacket<C extends Connection> extends AbstractWritableNetworkPacket<C> {
+public class StringWritableNetworkPacket<C extends Connection<C>> extends AbstractWritableNetworkPacket<C> {
 
   String data;
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java
index e2a24c73..5440eb52 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java
@@ -11,11 +11,11 @@
  */
 @Getter
 @RequiredArgsConstructor
-public class WritablePacketWrapper<A, W extends WritableNetworkPacket<C>, C extends Connection>
+public class WritablePacketWrapper<A, C extends Connection<C>>
     implements WritableNetworkPacket<C> {
 
   private final A attachment;
-  private final W packet;
+  private final WritableNetworkPacket<C> packet;
 
   @Override
   public boolean write(C connection, ByteBuffer buffer) {
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadableNetworkPacketRegistry.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadableNetworkPacketRegistry.java
index 34bf1416..ddffaf70 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadableNetworkPacketRegistry.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadableNetworkPacketRegistry.java
@@ -4,6 +4,7 @@
 import javasabr.rlib.classpath.ClassPathScannerFactory;
 import javasabr.rlib.collections.array.Array;
 import javasabr.rlib.collections.array.ArrayCollectors;
+import javasabr.rlib.common.util.ClassUtils;
 import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.annotation.NetworkPacketDescription;
 import javasabr.rlib.network.packet.IdBasedReadableNetworkPacket;
@@ -14,7 +15,7 @@
  *
  * @author JavaSaBr
  */
-public interface ReadableNetworkPacketRegistry<R extends IdBasedReadableNetworkPacket<R, C>, C extends Connection> {
+public interface ReadableNetworkPacketRegistry<R extends IdBasedReadableNetworkPacket<C>, C extends Connection<C>> {
 
   /**
    * Creates a new empty readable packet registry.
@@ -26,44 +27,53 @@ public interface ReadableNetworkPacketRegistry<R extends IdBasedReadableNetworkP
   /**
    * Create a new empty readable packet registry.
    */
-  static <T extends IdBasedReadableNetworkPacket<T, C>, C extends Connection> ReadableNetworkPacketRegistry<T, C> empty(Class<T> type) {
+  static <
+      R extends IdBasedReadableNetworkPacket<C>,
+      C extends Connection<C>> ReadableNetworkPacketRegistry<R, C> empty(Class<R> type) {
     return new IdBasedReadableNetworkPacketRegistry<>(type);
   }
 
   /**
    * Creates a new class path scanning based readable packet registry.
    */
-  static ReadableNetworkPacketRegistry<?, ?> classPathBased() {
-
+  static <
+      R extends IdBasedReadableNetworkPacket<C>,
+      C extends Connection<C>> ReadableNetworkPacketRegistry<R, C> classPathBased(Class<R> baseType) {
     var scanner = ClassPathScannerFactory.newDefaultScanner();
     scanner.useSystemClassPath(true);
     scanner.scan();
-
-    return of(scanner);
+    return scannerBased(baseType, scanner);
   }
 
   /**
    * Creates a new class path scanning based readable packet registry by scanning the main class.
    */
-  static ReadableNetworkPacketRegistry<?, ?> classPathBased(Class<?> mainClass) {
-
+  static <
+      R extends IdBasedReadableNetworkPacket<C>,
+      C extends Connection<C>> ReadableNetworkPacketRegistry<R, C> classPathBased(
+          Class<R> baseType,
+          Class<?> mainClass) {
     var scanner = ClassPathScannerFactory.newManifestScanner(mainClass);
     scanner.useSystemClassPath(false);
     scanner.scan();
-
-    return of(scanner);
+    return scannerBased(baseType, scanner);
   }
 
   /**
    * Creates a new class path scanning based readable packet registry.
    */
-  static ReadableNetworkPacketRegistry<?, ?> of(ClassPathScanner scanner) {
-    var result = scanner
+  static <
+      R extends IdBasedReadableNetworkPacket<C>,
+      C extends Connection<C>> ReadableNetworkPacketRegistry<R, C> scannerBased(
+          Class<R> baseType,
+          ClassPathScanner scanner) {
+    Array<Class<? extends R>> result = scanner
         .findImplementations(IdBasedReadableNetworkPacket.class)
         .stream()
         .filter(type -> type.getAnnotation(NetworkPacketDescription.class) != null)
-        .collect(ArrayCollectors.<Class<? extends IdBasedReadableNetworkPacket>>toArray(Class.class));
-    return new IdBasedReadableNetworkPacketRegistry<>(IdBasedReadableNetworkPacket.class)
+        .map(ClassUtils::<Class<R>>unsafeNNCast)
+        .collect(ArrayCollectors.toArray(Class.class));
+    return new IdBasedReadableNetworkPacketRegistry<>(baseType)
         .register(result);
   }
 
@@ -71,19 +81,34 @@ static <T extends IdBasedReadableNetworkPacket<T, C>, C extends Connection> Read
    * Creates a new readable packet registry.
    */
   @SafeVarargs
-  static <T extends IdBasedReadableNetworkPacket<T, C>, C extends Connection> ReadableNetworkPacketRegistry<T, C> of(
-      Class<T> type,
-      Class<? extends T>... classes) {
+  static <
+      R extends IdBasedReadableNetworkPacket<C>,
+      C extends Connection<C>> ReadableNetworkPacketRegistry<R, C> of(
+      Class<R> type,
+      Class<? extends R>... classes) {
     return new IdBasedReadableNetworkPacketRegistry<>(type)
         .register(classes, classes.length);
   }
 
+  @SafeVarargs
+  static <
+      R extends IdBasedReadableNetworkPacket<C>,
+      C extends Connection<C>> ReadableNetworkPacketRegistry<R, C> of(
+      Class<?> type,
+      Class<C> connectionType,
+      Class<? extends R>... classes) {
+    return new IdBasedReadableNetworkPacketRegistry<>(ClassUtils.<Class<R>>unsafeCast(type))
+        .register(classes, classes.length);
+  }
+
   /**
    * Creates a new readable packet registry.
    */
-  static <T extends IdBasedReadableNetworkPacket<T, C>, C extends Connection> ReadableNetworkPacketRegistry<T, C> of(
-      Class<T> type,
-      Array<Class<? extends T>> classes) {
+  static <
+      R extends IdBasedReadableNetworkPacket<C>,
+      C extends Connection<C>> ReadableNetworkPacketRegistry<R, C> of(
+      Class<R> type,
+      Array<Class<? extends R>> classes) {
     return new IdBasedReadableNetworkPacketRegistry<>(type)
         .register(classes);
   }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java
index 8a0e26e7..ea22f92f 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java
@@ -28,8 +28,9 @@
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED)
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
-public class IdBasedReadableNetworkPacketRegistry<R extends IdBasedReadableNetworkPacket<R, C>, C extends Connection>
-    implements ReadableNetworkPacketRegistry<R, C> {
+public class IdBasedReadableNetworkPacketRegistry<
+    R extends IdBasedReadableNetworkPacket<C>,
+    C extends Connection<C>> implements ReadableNetworkPacketRegistry<R, C> {
 
   @Getter(AccessLevel.PROTECTED)
   final Class<? extends R> type;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java
index 42be32fb..158e672e 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java
@@ -11,7 +11,7 @@
  *
  * @author JavaSaBr
  */
-public interface ServerNetwork<C extends Connection<?, ?, C>> extends Network<C> {
+public interface ServerNetwork<C extends Connection<C>> extends Network<C> {
 
   /**
    * Start a server using any available address.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
index ff0f9ff6..61f986ed 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
@@ -40,10 +40,10 @@
  */
 @CustomLog
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
-public class DefaultServerNetwork<C extends UnsafeConnection<?, ?, C>>
+public class DefaultServerNetwork<C extends UnsafeConnection<C>>
     extends AbstractNetwork<C> implements ServerNetwork<C> {
 
-  private interface ServerCompletionHandler<C extends UnsafeConnection<?, ?, C>> extends
+  private interface ServerCompletionHandler<C extends UnsafeConnection<C>> extends
       CompletionHandler<AsynchronousSocketChannel, DefaultServerNetwork<C>> {}
 
   private final ServerCompletionHandler<C> acceptHandler = new ServerCompletionHandler<>() {
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java
index ee9407fd..47e9bdf1 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java
@@ -2,13 +2,16 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
+import javasabr.rlib.common.util.ClassUtils;
 import javasabr.rlib.network.client.ClientNetwork;
 import javasabr.rlib.network.impl.DefaultBufferAllocator;
 import javasabr.rlib.network.impl.DefaultConnection;
 import javasabr.rlib.network.impl.StringDataConnection;
 import javasabr.rlib.network.impl.StringDataSslConnection;
+import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javasabr.rlib.network.packet.impl.DefaultReadableNetworkPacket;
+import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 import javasabr.rlib.network.packet.registry.ReadableNetworkPacketRegistry;
 import javasabr.rlib.network.server.ServerNetwork;
 import javax.net.ssl.SSLContext;
@@ -19,7 +22,11 @@
  * @author JavaSaBr
  */
 public class BaseNetworkTest {
-  public static final Connection MOCK_CONNECTION = new Connection() {
+
+  protected static final Class<StringReadableNetworkPacket<StringDataConnection>> RECEIVED_PACKET_TYPE =
+      ClassUtils.unsafeCast(StringReadableNetworkPacket.class);
+
+  public static class MockConnection implements Connection<MockConnection> {
     @Override
     public String remoteAddress() {
       return "";
@@ -38,6 +45,11 @@ public boolean closed() {
       return false;
     }
 
+    @Override
+    public Flux<ReceivedPacketEvent<MockConnection, ? extends ReadableNetworkPacket<MockConnection>>> receivedEvents() {
+      return Flux.empty();
+    }
+
     @Override
     public void send(WritableNetworkPacket packet) {}
 
@@ -46,11 +58,6 @@ public CompletableFuture<Boolean> sendWithFeedback(WritableNetworkPacket packet)
       return CompletableFuture.completedFuture(false);
     }
 
-    @Override
-    public Flux<ReceivedPacketEvent> receivedEvents() {
-      return Flux.empty();
-    }
-
     @Override
     public Flux receivedPackets() {
       return Flux.empty();
@@ -58,10 +65,12 @@ public Flux receivedPackets() {
 
     @Override
     public void onReceive(BiConsumer consumer) {}
-  };
+  }
+
+  public static final MockConnection MOCK_CONNECTION = new MockConnection();
 
   @AllArgsConstructor
-  public static class TestNetwork<C extends Connection<?, ?, C>> implements AutoCloseable {
+  public static class TestNetwork<C extends Connection<C>> implements AutoCloseable {
 
     public final ServerNetworkConfig serverNetworkConfig;
     public final NetworkConfig clientNetworkConfig;
@@ -189,8 +198,8 @@ protected TestNetwork<StringDataSslConnection> buildStringSSLNetwork(
   }
 
   protected TestNetwork<DefaultConnection> buildDefaultNetwork(
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> serverPacketRegistry,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> clientPacketRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> serverPacketRegistry,
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> clientPacketRegistry) {
     return buildDefaultNetwork(
         ServerNetworkConfig.DEFAULT_SERVER,
         new DefaultBufferAllocator(ServerNetworkConfig.DEFAULT_SERVER),
@@ -202,9 +211,9 @@ protected TestNetwork<DefaultConnection> buildDefaultNetwork(
 
   protected TestNetwork<DefaultConnection> buildDefaultNetwork(
       BufferAllocator serverBufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> serverPacketRegistry,
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> serverPacketRegistry,
       BufferAllocator clientBufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> clientPacketRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> clientPacketRegistry) {
     return buildDefaultNetwork(
         ServerNetworkConfig.DEFAULT_SERVER,
         serverBufferAllocator,
@@ -217,10 +226,10 @@ protected TestNetwork<DefaultConnection> buildDefaultNetwork(
   protected TestNetwork<DefaultConnection> buildDefaultNetwork(
       ServerNetworkConfig serverNetworkConfig,
       BufferAllocator serverBufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> serverPacketRegistry,
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> serverPacketRegistry,
       NetworkConfig clientNetworkConfig,
       BufferAllocator clientBufferAllocator,
-      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> clientPacketRegistry) {
+      ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket<DefaultConnection>, DefaultConnection> clientPacketRegistry) {
 
     var asyncClientToServer = new CompletableFuture<DefaultConnection>();
     var asyncServerToClient = new CompletableFuture<DefaultConnection>();
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java
index 6fdbe9cf..707d636e 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java
@@ -19,6 +19,7 @@
 import javasabr.rlib.network.impl.DefaultBufferAllocator;
 import javasabr.rlib.network.impl.DefaultConnection;
 import javasabr.rlib.network.packet.MarkerNetworkPacket;
+import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.DefaultReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.DefaultWritableNetworkPacket;
 import javasabr.rlib.network.packet.registry.ReadableNetworkPacketRegistry;
@@ -44,7 +45,7 @@ interface ClientPackets {
 
     @RequiredArgsConstructor
     @NetworkPacketDescription(id = 1)
-    class RequestEchoMessage extends DefaultWritableNetworkPacket {
+    class RequestEchoMessage extends DefaultWritableNetworkPacket<DefaultConnection> {
 
       private final String message;
 
@@ -56,11 +57,12 @@ protected void writeImpl(DefaultConnection connection, ByteBuffer buffer) {
     }
 
     @NetworkPacketDescription(id = 2)
-    class RequestServerTime extends DefaultWritableNetworkPacket implements MarkerNetworkPacket {}
+    class RequestServerTime extends DefaultWritableNetworkPacket<DefaultConnection>
+        implements MarkerNetworkPacket {}
 
     @RequiredArgsConstructor
     @NetworkPacketDescription(id = 3)
-    class ResponseEchoMessage extends DefaultReadableNetworkPacket {
+    class ResponseEchoMessage extends DefaultReadableNetworkPacket<DefaultConnection> {
 
       @Getter
       @Nullable
@@ -78,7 +80,7 @@ public String toString() {
     }
 
     @NetworkPacketDescription(id = 4)
-    class ResponseServerTime extends DefaultReadableNetworkPacket {
+    class ResponseServerTime extends DefaultReadableNetworkPacket<DefaultConnection> {
 
       @Getter
       @Nullable
@@ -101,7 +103,7 @@ public String toString() {
   interface ServerPackets {
 
     @NetworkPacketDescription(id = 1)
-    class RequestEchoMessage extends DefaultReadableNetworkPacket {
+    class RequestEchoMessage extends DefaultReadableNetworkPacket<DefaultConnection> {
 
       private volatile String message;
 
@@ -118,7 +120,8 @@ public String toString() {
     }
 
     @NetworkPacketDescription(id = 2)
-    class RequestServerTime extends DefaultReadableNetworkPacket implements MarkerNetworkPacket {
+    class RequestServerTime extends DefaultReadableNetworkPacket<DefaultConnection>
+        implements MarkerNetworkPacket {
 
       @Override
       public String toString() {
@@ -128,7 +131,7 @@ public String toString() {
 
     @RequiredArgsConstructor
     @NetworkPacketDescription(id = 3)
-    class ResponseEchoMessage extends DefaultWritableNetworkPacket {
+    class ResponseEchoMessage extends DefaultWritableNetworkPacket<DefaultConnection> {
 
       private final String message;
 
@@ -140,7 +143,7 @@ protected void writeImpl(DefaultConnection connection, ByteBuffer buffer) {
     }
 
     @NetworkPacketDescription(id = 4)
-    class ResponseServerTime extends DefaultWritableNetworkPacket {
+    class ResponseServerTime extends DefaultWritableNetworkPacket<DefaultConnection> {
 
       @Override
       protected void writeImpl(DefaultConnection connection, ByteBuffer buffer) {
@@ -159,12 +162,14 @@ void echoNetworkTest() {
     //LoggerManager.enable(DefaultNetworkTest.class, LoggerLevel.INFO);
     //LoggerManager.enable(AbstractNetworkPacketReader.class, LoggerLevel.DEBUG);
 
-    ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> serverPackets = ReadableNetworkPacketRegistry.of(
+    var serverPackets = ReadableNetworkPacketRegistry.of(
         DefaultReadableNetworkPacket.class,
+        DefaultConnection.class,
         ServerPackets.RequestEchoMessage.class,
         ServerPackets.RequestServerTime.class);
-    ReadableNetworkPacketRegistry<DefaultReadableNetworkPacket, DefaultConnection> clientPackets = ReadableNetworkPacketRegistry.of(
+    var clientPackets = ReadableNetworkPacketRegistry.of(
         DefaultReadableNetworkPacket.class,
+        DefaultConnection.class,
         ClientPackets.ResponseEchoMessage.class,
         ClientPackets.ResponseServerTime.class);
 
@@ -218,10 +223,12 @@ void shouldNotUseMappedBuffers() {
 
     var serverPacketRegistry = ReadableNetworkPacketRegistry.of(
         DefaultReadableNetworkPacket.class,
+        DefaultConnection.class,
         ServerPackets.RequestEchoMessage.class,
         ServerPackets.RequestServerTime.class);
     var clientPacketRegistry = ReadableNetworkPacketRegistry.of(
         DefaultReadableNetworkPacket.class,
+        DefaultConnection.class,
         ClientPackets.ResponseEchoMessage.class,
         ClientPackets.ResponseServerTime.class);
 
@@ -265,7 +272,7 @@ public ByteBuffer takeBuffer(int bufferSize) {
           .peek(message -> clientToServer.send(new ClientPackets.RequestEchoMessage(message)))
           .toList();
 
-      List<? extends DefaultReadableNetworkPacket> receivedPackets =
+      List<? extends ReadableNetworkPacket<DefaultConnection>> receivedPackets =
           ObjectUtils.notNull(pendingPacketsOnServer.blockFirst(Duration.ofSeconds(5)));
 
       Assertions.assertEquals(packetCount, receivedPackets.size(), "Didn't receive all packets");
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadableNetworkPacketRegistryTest.java b/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadableNetworkPacketRegistryTest.java
index 0ce72a83..0213d8cb 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadableNetworkPacketRegistryTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadableNetworkPacketRegistryTest.java
@@ -30,7 +30,7 @@ public static class Impl2 extends DefaultReadableNetworkPacket {}
   public static class Impl3 extends DefaultReadableNetworkPacket {}
 
   @NoArgsConstructor
-  private static class PrivateBase extends AbstractIdBasedReadableNetworkPacket<PrivateBase, DefaultConnection> {}
+  private static class PrivateBase extends AbstractIdBasedReadableNetworkPacket<DefaultConnection> {}
 
   @NoArgsConstructor
   @NetworkPacketDescription(id = 1)
@@ -41,7 +41,7 @@ private static class PrivateImpl1 extends PrivateBase {}
   private static class PrivateImpl2 extends PrivateBase {}
 
   @NoArgsConstructor
-  public static class PublicBase extends AbstractIdBasedReadableNetworkPacket<PublicBase, DefaultConnection> {}
+  public static class PublicBase extends AbstractIdBasedReadableNetworkPacket<DefaultConnection> {}
 
   @NoArgsConstructor
   @NetworkPacketDescription(id = 1)
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java b/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java
index 2c0d3790..413518b6 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/NetworkPacketTest.java
@@ -2,6 +2,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javasabr.rlib.network.BaseNetworkTest.MockConnection;
 import javasabr.rlib.network.packet.impl.AbstractReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.AbstractWritableNetworkPacket;
 import lombok.Builder;
@@ -17,7 +18,7 @@ class NetworkPacketTest {
   @ToString
   @EqualsAndHashCode(exclude = {"byteArrayField", "bytesField1", "bytesField2"})
   private static class TestReadablePacket
-      extends AbstractReadableNetworkPacket<Connection> {
+      extends AbstractReadableNetworkPacket<MockConnection> {
 
     private int byteField;
     private int byteUnsignedField;
@@ -34,7 +35,7 @@ private static class TestReadablePacket
     private String stringField;
 
     @Override
-    protected void readImpl(Connection connection, ByteBuffer buffer) {
+    protected void readImpl(MockConnection connection, ByteBuffer buffer) {
       super.readImpl(connection, buffer);
       byteField = readByte(buffer);
       byteUnsignedField = readByteUnsigned(buffer);
@@ -58,7 +59,7 @@ protected void readImpl(Connection connection, ByteBuffer buffer) {
 
   @Builder
   private static class TestWritablePacket
-      extends AbstractWritableNetworkPacket<Connection> {
+      extends AbstractWritableNetworkPacket<MockConnection> {
 
     private int byteField;
     private int byteUnsignedField;
@@ -75,7 +76,7 @@ private static class TestWritablePacket
     private String stringField;
 
     @Override
-    protected void writeImpl(Connection connection, ByteBuffer buffer) {
+    protected void writeImpl(MockConnection connection, ByteBuffer buffer) {
       super.writeImpl(connection, buffer);
       writeByte(buffer, byteField);
       writeByte(buffer, byteUnsignedField);
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
index a9fee1ba..e9ebfecd 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
@@ -21,7 +21,7 @@
 import javasabr.rlib.network.client.ClientNetwork;
 import javasabr.rlib.network.impl.DefaultBufferAllocator;
 import javasabr.rlib.network.impl.StringDataConnection;
-import javasabr.rlib.network.packet.impl.StringReadablePacket;
+import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
 import javasabr.rlib.network.server.ServerNetwork;
 import lombok.CustomLog;
@@ -38,6 +38,7 @@
 @CustomLog
 public class StringNetworkTest extends BaseNetworkTest {
 
+
   @Test
   @SneakyThrows
   void echoNetworkTest() {
@@ -54,7 +55,7 @@ void echoNetworkTest() {
 
     serverNetwork
         .accepted()
-        .flatMap(Connection::receivedEvents)
+        .flatMap(connection -> connection.receivedEvents(RECEIVED_PACKET_TYPE))
         .subscribe(event -> {
           String message = event.packet().data();
           log.info(message, "Received from client:[%s]"::formatted);
@@ -74,7 +75,7 @@ void echoNetworkTest() {
                   .nextInt(50);
               executor.schedule(() -> connection.send(packet), delay, TimeUnit.MILLISECONDS);
             }))
-        .flatMapMany(Connection::receivedEvents)
+        .flatMapMany(connection -> connection.receivedEvents(RECEIVED_PACKET_TYPE))
         .subscribe(event -> {
           log.info(event.packet().data(), "Received from server:[%s]"::formatted);
           counter.countDown();
@@ -119,7 +120,7 @@ public ByteBuffer takeBuffer(int bufferSize) {
       StringDataConnection serverToClient = testNetwork.serverToClient;
 
       var pendingPacketsOnServer = serverToClient
-          .receivedPackets()
+          .receivedPackets(RECEIVED_PACKET_TYPE)
           .buffer(packetCount);
 
       List<String> messages = IntStream
@@ -131,7 +132,7 @@ public ByteBuffer takeBuffer(int bufferSize) {
           })
           .toList();
 
-      List<? extends StringReadablePacket> receivedPackets = ObjectUtils
+      List<StringReadableNetworkPacket<StringDataConnection>> receivedPackets = ObjectUtils
           .notNull(pendingPacketsOnServer.blockFirst(Duration.ofSeconds(5)));
 
       log.info(receivedPackets.size(), "Received [%s] packets from client"::formatted);
@@ -165,7 +166,7 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
       StringDataConnection serverToClient = testNetwork.serverToClient;
 
       var pendingPacketsOnServer = serverToClient
-          .receivedPackets()
+          .receivedPackets(RECEIVED_PACKET_TYPE)
           .doOnNext(packet ->
               log.info(packet.data().length(), "Received [%s] symbols from client"::formatted))
           .buffer(packetCount);
@@ -189,7 +190,7 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
           })
           .toList();
 
-      List<? extends StringReadablePacket<StringDataConnection>> receivedPackets =
+      List<? extends StringReadableNetworkPacket<StringDataConnection>> receivedPackets =
           ObjectUtils.notNull(pendingPacketsOnServer.blockFirst(Duration.ofSeconds(5)));
 
       log.info(receivedPackets.size(), "Received [%s] packets from client"::formatted);
@@ -223,7 +224,7 @@ void shouldSendBiggerPacketThanWriteBuffer() {
       StringDataConnection serverToClient = testNetwork.serverToClient;
 
       var pendingPacketsOnServer = serverToClient
-          .receivedPackets()
+          .receivedPackets(RECEIVED_PACKET_TYPE)
           .doOnNext(packet ->
               log.info(packet.data().length(), "Received [%s] symbols from client"::formatted))
           .buffer(packetCount);
@@ -247,7 +248,7 @@ void shouldSendBiggerPacketThanWriteBuffer() {
           })
           .toList();
 
-      List<? extends StringReadablePacket<StringDataConnection>> receivedPackets =
+      List<? extends StringReadableNetworkPacket<StringDataConnection>> receivedPackets =
           ObjectUtils.notNull(pendingPacketsOnServer.blockFirst(Duration.ofSeconds(5)));
 
       log.info(receivedPackets.size(), "Received [%s] packets from client"::formatted);
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
index d07ab7e0..0330cbca 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
@@ -18,16 +18,12 @@
 import java.util.stream.IntStream;
 import javasabr.rlib.common.util.ObjectUtils;
 import javasabr.rlib.common.util.StringUtils;
-import javasabr.rlib.common.util.ThreadUtils;
 import javasabr.rlib.common.util.Utils;
-import javasabr.rlib.logger.api.LoggerLevel;
-import javasabr.rlib.logger.api.LoggerManager;
 import javasabr.rlib.network.client.ClientNetwork;
 import javasabr.rlib.network.impl.DefaultBufferAllocator;
 import javasabr.rlib.network.impl.StringDataSslConnection;
-import javasabr.rlib.network.packet.impl.AbstractSslNetworkPacketReader;
-import javasabr.rlib.network.packet.impl.AbstractSslNetworkPacketWriter;
-import javasabr.rlib.network.packet.impl.StringReadablePacket;
+import javasabr.rlib.network.packet.ReadableNetworkPacket;
+import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
 import javasabr.rlib.network.server.ServerNetwork;
 import javasabr.rlib.network.util.NetworkUtils;
@@ -97,9 +93,9 @@ void serverSslNetworkTest() {
         .accepted()
         .flatMap(Connection::receivedEvents)
         .subscribe(event -> {
-          var message = event.packet().data();
+          var message = ((StringReadableNetworkPacket<?>) event.packet()).data();
           log.info(message, "Received from client:[%s]"::formatted);
-          event.connection().send(new StringWritableNetworkPacket("Echo: " + message));
+          event.connection().send(new StringWritableNetworkPacket<>("Echo: " + message));
         });
 
     SSLContext clientSslContext = NetworkUtils.createAllTrustedClientSslContext();
@@ -127,7 +123,7 @@ void serverSslNetworkTest() {
         .flip();
     short packetLength = buffer.getShort();
 
-    StringReadablePacket<StringDataSslConnection> response = new StringReadablePacket<>();
+    StringReadableNetworkPacket<StringDataSslConnection> response = new StringReadableNetworkPacket<>();
     response.read(null, buffer, packetLength - 2);
 
     log.info(response.data(), "Response:[%s]"::formatted);
@@ -162,7 +158,8 @@ void clientSslNetworkTest() {
         .doOnError(Throwable::printStackTrace)
         .flatMapMany(Connection::receivedEvents)
         .subscribe(event -> {
-          log.info(event.packet().data(), "Received from server:[%s]"::formatted);
+          var message = ((StringReadableNetworkPacket<?>) event.packet()).data();
+          log.info(message, "Received from server:[%s]"::formatted);
           counter.countDown();
         });
 
@@ -179,7 +176,7 @@ void clientSslNetworkTest() {
 
     var dataLength = buffer.getShort();
 
-    var receivedPacket = new StringReadablePacket<StringDataSslConnection>();
+    var receivedPacket = new StringReadableNetworkPacket<StringDataSslConnection>();
     receivedPacket.read(null, buffer, dataLength);
 
     Assertions.assertEquals("Hello SSL", receivedPacket.data());
@@ -231,7 +228,7 @@ void echoNetworkTest() {
         .accepted()
         .flatMap(Connection::receivedEvents)
         .subscribe(event -> {
-          var message = event.packet().data();
+          var message = ((StringReadableNetworkPacket<?>) event.packet()).data();
           log.info(message, "Received from client:[%s]"::formatted);
           event.connection().send(new StringWritableNetworkPacket<>("Echo: " + message));
         });
@@ -260,7 +257,8 @@ void echoNetworkTest() {
         .doOnError(Throwable::printStackTrace)
         .flatMapMany(Connection::receivedEvents)
         .subscribe(event -> {
-          log.info(event.packet().data(), "Received from server:[%s]"::formatted);
+          var message = ((StringReadableNetworkPacket<?>) event.packet()).data();
+          log.info(message, "Received from server:[%s]"::formatted);
           counter.countDown();
         });
 
@@ -296,7 +294,7 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
 
       var pendingPacketsOnServer = serverToClient
           .receivedPackets()
-          .doOnNext(packet -> log.info("Received from client: " + packet.data()))
+          .doOnNext(packet -> log.info("Received from client: " + packet))
           .buffer(packetCount);
 
       var messages = IntStream
@@ -308,7 +306,7 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
           .peek(message -> clientToServer.send(new StringWritableNetworkPacket<>(message)))
           .toList();
 
-      List<? extends StringReadablePacket<StringDataSslConnection>> receivedPackets =
+      List<? extends ReadableNetworkPacket<StringDataSslConnection>> receivedPackets =
           ObjectUtils.notNull(pendingPacketsOnServer.blockFirst(Duration.ofSeconds(5000)));
 
       Assertions.assertEquals(packetCount, receivedPackets.size(), "Didn't receive all packets");
@@ -317,7 +315,7 @@ void shouldReceiveManyPacketsFromSmallToBigSize() {
           .stream()
           .filter(packet -> messages
               .stream()
-              .noneMatch(message -> message.equals(packet.data())))
+              .noneMatch(message -> message.equals(((StringReadableNetworkPacket<?>) packet).data())))
           .findFirst()
           .orElse(null);
 

From fc1e6d932be0cccdbfd0e4b9bdc2edf15526c543 Mon Sep 17 00:00:00 2001
From: javasabr <javasabr@gmail.com>
Date: Wed, 8 Oct 2025 20:53:12 +0200
Subject: [PATCH 4/6] continue experiments with generics in network

---
 .../java/javasabr/rlib/network/StringNetworkLoadTest.java    | 5 ++++-
 .../java/javasabr/rlib/network/StringSslNetworkLoadTest.java | 4 +++-
 .../test/java/javasabr/rlib/network/StringNetworkTest.java   | 1 -
 .../java/javasabr/rlib/network/StringSslNetworkTest.java     | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
index 64637178..dc565cd7 100644
--- a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
+++ b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
@@ -19,6 +19,8 @@
 import javasabr.rlib.network.client.ClientNetwork;
 import javasabr.rlib.network.impl.DefaultBufferAllocator;
 import javasabr.rlib.network.impl.StringDataConnection;
+import javasabr.rlib.network.impl.StringDataSslConnection;
+import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
 import javasabr.rlib.network.server.ServerNetwork;
 import lombok.CustomLog;
@@ -141,10 +143,11 @@ void testServerWithMultiplyClients() {
 
     serverNetwork.onAccept(accepted -> accepted
         .onReceive((connection, packet) -> {
+          StringReadableNetworkPacket<StringDataConnection> receivedPacket = (StringReadableNetworkPacket<StringDataConnection>) packet;
           statistics
               .receivedClientPackersPerSecond()
               .accumulate(1);
-          connection.send(new StringWritableNetworkPacket<>("Echo: " + packet.data()));
+          connection.send(new StringWritableNetworkPacket<>("Echo: " + receivedPacket.data()));
           statistics
               .sentEchoPackersPerSecond()
               .accumulate(1);
diff --git a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
index 5480fee3..2c03c155 100644
--- a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
+++ b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
@@ -23,6 +23,7 @@
 import javasabr.rlib.network.impl.StringDataSslConnection;
 import javasabr.rlib.network.packet.impl.AbstractSslNetworkPacketReader;
 import javasabr.rlib.network.packet.impl.AbstractSslNetworkPacketWriter;
+import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
 import javasabr.rlib.network.server.ServerNetwork;
 import javasabr.rlib.network.util.NetworkUtils;
@@ -153,10 +154,11 @@ void testServerWithMultiplyClients() {
 
     serverNetwork.onAccept(accepted -> accepted
         .onReceive((connection, packet) -> {
+          StringReadableNetworkPacket<StringDataSslConnection> receivedPacket = (StringReadableNetworkPacket<StringDataSslConnection>) packet;
           statistics
               .receivedClientPackersPerSecond()
               .accumulate(1);
-          connection.send(new StringWritableNetworkPacket<>("Echo: " + packet.data()));
+          connection.send(new StringWritableNetworkPacket<>("Echo: " + receivedPacket.data()));
           statistics
               .sentEchoPackersPerSecond()
               .accumulate(1);
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
index e9ebfecd..404043b7 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
@@ -38,7 +38,6 @@
 @CustomLog
 public class StringNetworkTest extends BaseNetworkTest {
 
-
   @Test
   @SneakyThrows
   void echoNetworkTest() {
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
index 0330cbca..b32ac629 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/StringSslNetworkTest.java
@@ -123,7 +123,7 @@ void serverSslNetworkTest() {
         .flip();
     short packetLength = buffer.getShort();
 
-    StringReadableNetworkPacket<StringDataSslConnection> response = new StringReadableNetworkPacket<>();
+    var response = new StringReadableNetworkPacket<StringDataSslConnection>();
     response.read(null, buffer, packetLength - 2);
 
     log.info(response.data(), "Response:[%s]"::formatted);

From 7146c61ed2f7ab6ac5e56eb690683bd1f77f0c03 Mon Sep 17 00:00:00 2001
From: javasabr <javasabr@gmail.com>
Date: Fri, 17 Oct 2025 18:06:00 +0200
Subject: [PATCH 5/6] improving network module

---
 .../rlib/network/StringNetworkLoadTest.java   |  2 +-
 .../network/StringSslNetworkLoadTest.java     |  2 +-
 .../java/javasabr/rlib/network/Network.java   |  6 ++
 .../javasabr/rlib/network/NetworkConfig.java  | 26 +++++--
 .../rlib/network/ServerNetworkConfig.java     | 23 ++++--
 .../rlib/network/UnsafeConnection.java        |  2 +
 .../client/impl/DefaultClientNetwork.java     | 10 ++-
 .../rlib/network/impl/AbstractConnection.java |  3 +-
 .../rlib/network/impl/AbstractNetwork.java    |  5 ++
 .../network/impl/DefaultBufferAllocator.java  |  8 +-
 .../network/impl/ReuseBufferAllocator.java    |  8 +-
 .../network/packet/WritableNetworkPacket.java |  6 +-
 .../impl/AbstractNetworkPacketReader.java     | 78 ++++++++++++++-----
 .../impl/AbstractNetworkPacketWriter.java     | 13 +++-
 .../impl/AbstractSslNetworkPacketReader.java  |  4 +-
 .../impl/DefaultNetworkPacketReader.java      |  4 +-
 .../impl/DefaultSslNetworkPacketReader.java   |  4 +-
 .../impl/IdBasedNetworkPacketReader.java      |  4 +-
 .../server/impl/DefaultServerNetwork.java     | 34 +++++++-
 .../rlib/network/StringNetworkTest.java       |  4 +-
 20 files changed, 189 insertions(+), 57 deletions(-)

diff --git a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
index dc565cd7..7e8af5af 100644
--- a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
+++ b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
@@ -122,7 +122,7 @@ void testServerWithMultiplyClients() {
 
     var serverConfig = SimpleServerNetworkConfig
         .builder()
-        .threadGroupSize(10)
+        .threadGroupMaxSize(10)
         .writeBufferSize(1024)
         .readBufferSize(1024)
         .pendingBufferSize(2048)
diff --git a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
index 2c03c155..889e8a2b 100644
--- a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
+++ b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
@@ -129,7 +129,7 @@ void testServerWithMultiplyClients() {
 
     var serverConfig = SimpleServerNetworkConfig
         .builder()
-        .threadGroupSize(10)
+        .threadGroupMaxSize(10)
         .writeBufferSize(1024)
         .readBufferSize(1024)
         .pendingBufferSize(2048)
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/Network.java b/rlib-network/src/main/java/javasabr/rlib/network/Network.java
index c4e9bac0..14030f12 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/Network.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/Network.java
@@ -1,5 +1,7 @@
 package javasabr.rlib.network;
 
+import java.util.concurrent.ScheduledExecutorService;
+
 /**
  * The interface to implement an asynchronous network.
  *
@@ -7,6 +9,10 @@
  */
 public interface Network<C extends Connection<C>> {
 
+  ScheduledExecutorService scheduledExecutor();
+
+  NetworkConfig config();
+
   /**
    * Shutdown this network.
    */
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java b/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java
index 7dbbd664..4a980879 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java
@@ -28,6 +28,8 @@ class SimpleNetworkConfig implements NetworkConfig {
     private int pendingBufferSize = 4096;
     @Builder.Default
     private int writeBufferSize = 2048;
+    @Builder.Default
+    private int retryDelayInMs = 1000;
   }
 
   NetworkConfig DEFAULT_CLIENT = new NetworkConfig() {
@@ -46,34 +48,46 @@ default String threadGroupName() {
   }
 
   /**
-   * Get size of buffer with used to collect received data from network.
+   * Get a group name of scheduling network threads.
+   */
+  default String scheduledThreadGroupName() {
+    return "ScheduledNetworkThread";
+  }
+
+  /**
+   * Get size of buffer with will be used to collect received data from network.
    */
   default int readBufferSize() {
     return 2048;
   }
 
   /**
-   * Get size of buffer with pending data. Pending buffer allows to construct a packet with bigger data than
+   * Gets size of buffer with pending reading data. Pending buffer allows to construct a packet with bigger data part than
    * {@link #readBufferSize()}. It should be at least 2x of {@link #readBufferSize()}
-   *
-   * @return the pending buffer's size.
    */
   default int pendingBufferSize() {
     return readBufferSize() * 2;
   }
 
   /**
-   * Get size of buffer which used to serialize packets to bytes.
+   * Gets a size of buffer which will be used for packet serialization.
    */
   default int writeBufferSize() {
     return 2048;
   }
 
+  /**
+   * Gets a timeout for retry read/write operation.
+   */
+  default int retryDelayInMs() {
+    return 1000;
+  }
+
   default ByteOrder byteOrder() {
     return ByteOrder.BIG_ENDIAN;
   }
 
-  default boolean isDirectByteBuffer() {
+  default boolean useDirectByteBuffer() {
     return false;
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/ServerNetworkConfig.java b/rlib-network/src/main/java/javasabr/rlib/network/ServerNetworkConfig.java
index 2a3711c0..36855877 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/ServerNetworkConfig.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/ServerNetworkConfig.java
@@ -32,7 +32,13 @@ class SimpleServerNetworkConfig implements ServerNetworkConfig {
     @Builder.Default
     private int writeBufferSize = 2048;
     @Builder.Default
-    private int threadGroupSize = 1;
+    private int retryDelayInMs = 1000;
+    @Builder.Default
+    private int threadGroupMinSize = 1;
+    @Builder.Default
+    private int threadGroupMaxSize = 1;
+    @Builder.Default
+    private int scheduledThreadGroupSize = 1;
     @Builder.Default
     private int threadPriority = Thread.NORM_PRIORITY;
   }
@@ -40,13 +46,13 @@ class SimpleServerNetworkConfig implements ServerNetworkConfig {
   ServerNetworkConfig DEFAULT_SERVER = new ServerNetworkConfig() {
 
     @Override
-    public int threadGroupMinSize() {
-      return 1;
+    public String threadGroupName() {
+      return "ServerNetworkThread";
     }
 
     @Override
-    public String threadGroupName() {
-      return "ServerNetworkThread";
+    public String scheduledThreadGroupName() {
+      return "ServerScheduledNetworkThread";
     }
   };
 
@@ -64,6 +70,13 @@ default int threadGroupMaxSize() {
     return threadGroupMinSize();
   }
 
+  /**
+   * Get a size of network scheduled thread executor.
+   */
+  default int scheduledThreadGroupSize() {
+    return 1;
+  }
+
   /**
    * Get a thread constructor which should be used to create network threads.
    */
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
index 38feae6e..2f8108ff 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java
@@ -2,5 +2,7 @@
 
 public interface UnsafeConnection<C extends UnsafeConnection<C>> extends Connection<C> {
 
+  Network<?> network();
+
   void onConnected();
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
index 5f0ddc69..a39d2b96 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java
@@ -6,9 +6,12 @@
 import java.nio.channels.CompletionHandler;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiFunction;
 import javasabr.rlib.common.util.AsyncUtils;
+import javasabr.rlib.common.util.GroupThreadFactory;
 import javasabr.rlib.common.util.ThreadUtils;
 import javasabr.rlib.common.util.Utils;
 import javasabr.rlib.network.Connection;
@@ -38,6 +41,9 @@ public class DefaultClientNetwork<C extends Connection<C>> extends AbstractNetwo
 
   final AtomicBoolean connecting;
 
+  @Getter
+  final ScheduledExecutorService scheduledExecutor;
+
   @Nullable
   @Getter(AccessLevel.PROTECTED)
   volatile CompletableFuture<C> pendingConnection;
@@ -51,6 +57,8 @@ public DefaultClientNetwork(
       BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection) {
     super(config, channelToConnection);
     this.connecting = new AtomicBoolean(false);
+    this.scheduledExecutor = Executors
+        .newSingleThreadScheduledExecutor(new GroupThreadFactory(config.scheduledThreadGroupName()));
     log.info(config, DefaultClientNetwork::buildConfigDescription);
   }
 
@@ -85,7 +93,7 @@ public CompletableFuture<C> connectAsync(InetSocketAddress serverAddress) {
       @Override
       public void completed(@Nullable Void result, DefaultClientNetwork<C> network) {
         SocketAddress remoteAddress = NetworkUtils.getRemoteAddress(channel);
-        log.info(remoteAddress, "Connected to server:[%s]"::formatted);
+        log.info(remoteAddress, "[%s] Connected to server."::formatted);
         asyncResult.complete(channelToConnection.apply(network, channel));
       }
 
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
index 4ac15f48..b5615cf5 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java
@@ -51,8 +51,9 @@ public WritablePacketWithFeedback(CompletableFuture<Boolean> attachment, Writabl
 
   @Getter
   final String remoteAddress;
-
+  @Getter
   final Network<C> network;
+
   final BufferAllocator bufferAllocator;
   final AsynchronousSocketChannel channel;
   final Deque<WritableNetworkPacket<C>> pendingPackets;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
index fcb3c990..183306c3 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java
@@ -7,7 +7,9 @@
 import javasabr.rlib.network.NetworkConfig;
 import lombok.AccessLevel;
 import lombok.CustomLog;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.experimental.Accessors;
 import lombok.experimental.FieldDefaults;
 
 /**
@@ -17,8 +19,11 @@
  */
 @CustomLog
 @RequiredArgsConstructor
+@Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
 public abstract class AbstractNetwork<C extends Connection<C>> implements Network<C> {
+
+  @Getter
   NetworkConfig config;
   BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection;
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java
index 5c0d395a..6efa6496 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java
@@ -28,7 +28,7 @@ public DefaultBufferAllocator(NetworkConfig config) {
   public ByteBuffer takeReadBuffer() {
     int bufferSize = config.readBufferSize();
     log.debug(bufferSize, "Allocate new read buffer with size:[%s]"::formatted);
-    return config.isDirectByteBuffer()
+    return config.useDirectByteBuffer()
            ? ByteBuffer.allocateDirect(bufferSize)
            : ByteBuffer
                .allocate(bufferSize)
@@ -40,7 +40,7 @@ public ByteBuffer takeReadBuffer() {
   public ByteBuffer takePendingBuffer() {
     int bufferSize = config.pendingBufferSize();
     log.debug(bufferSize, "Allocate new pending buffer with size:[%s]"::formatted);
-    return config.isDirectByteBuffer()
+    return config.useDirectByteBuffer()
            ? ByteBuffer.allocateDirect(bufferSize)
            : ByteBuffer
                .allocate(bufferSize)
@@ -52,7 +52,7 @@ public ByteBuffer takePendingBuffer() {
   public ByteBuffer takeWriteBuffer() {
     int bufferSize = config.writeBufferSize();
     log.debug(bufferSize, "Allocate new write buffer with size:[%s]"::formatted);
-    return config.isDirectByteBuffer()
+    return config.useDirectByteBuffer()
            ? ByteBuffer.allocateDirect(bufferSize)
            : ByteBuffer
                .allocate(bufferSize)
@@ -63,7 +63,7 @@ public ByteBuffer takeWriteBuffer() {
   @Override
   public ByteBuffer takeBuffer(int bufferSize) {
     log.debug(bufferSize, "Allocate new buffer with size:[%s]"::formatted);
-    return config.isDirectByteBuffer()
+    return config.useDirectByteBuffer()
            ? ByteBuffer.allocateDirect(bufferSize)
            : ByteBuffer
                .allocate(bufferSize)
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/ReuseBufferAllocator.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/ReuseBufferAllocator.java
index fa771afa..ad71c4b3 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/ReuseBufferAllocator.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/ReuseBufferAllocator.java
@@ -58,7 +58,7 @@ protected Function<NetworkConfig, ByteBuffer> pendingBufferFactory() {
     return config -> {
       var bufferSize = config.pendingBufferSize();
       log.debug(bufferSize, "Allocate new pending buffer with size:[%s]"::formatted);
-      return config.isDirectByteBuffer()
+      return config.useDirectByteBuffer()
              ? ByteBuffer.allocateDirect(bufferSize)
              : ByteBuffer
                  .allocate(bufferSize)
@@ -71,7 +71,7 @@ protected Function<NetworkConfig, ByteBuffer> readBufferFactory() {
     return config -> {
       var bufferSize = config.readBufferSize();
       log.debug(bufferSize, "Allocate new read buffer with size:[%s]"::formatted);
-      return config.isDirectByteBuffer()
+      return config.useDirectByteBuffer()
              ? ByteBuffer.allocateDirect(bufferSize)
              : ByteBuffer
                  .allocate(bufferSize)
@@ -84,7 +84,7 @@ protected Function<NetworkConfig, ByteBuffer> writeBufferFactory() {
     return config -> {
       var bufferSize = config.writeBufferSize();
       log.debug(bufferSize, "Allocate new write buffer with size:[%s]"::formatted);
-      return config.isDirectByteBuffer()
+      return config.useDirectByteBuffer()
              ? ByteBuffer.allocateDirect(bufferSize)
              : ByteBuffer
                  .allocate(bufferSize)
@@ -130,7 +130,7 @@ public ByteBuffer takeBuffer(int bufferSize) {
     }
 
     log.debug(bufferSize, "Allocate a new buffer with size:[%s]"::formatted);
-    return config.isDirectByteBuffer()
+    return config.useDirectByteBuffer()
            ? ByteBuffer.allocateDirect(bufferSize)
            : ByteBuffer
                .allocate(bufferSize)
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
index c5c076cd..1a9d149e 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/WritableNetworkPacket.java
@@ -10,6 +10,8 @@
  */
 public interface WritableNetworkPacket<C extends Connection<C>> extends NetworkPacket<C> {
 
+  int UNKNOWN_EXPECTED_BYTES = -1;
+
   /**
    * Write this packet to the buffer.
    *
@@ -18,9 +20,9 @@ public interface WritableNetworkPacket<C extends Connection<C>> extends NetworkP
   boolean write(C connection, ByteBuffer buffer);
 
   /**
-   * @return expected data length of this packet or -1.
+   * @return expected data length of this packet or {@code UNKNOWN_EXPECTED_BYTES}.
    */
   default int expectedLength(C connection) {
-    return -1;
+    return UNKNOWN_EXPECTED_BYTES;
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
index d589a284..3db70f45 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
@@ -6,11 +6,17 @@
 import java.nio.channels.AsynchronousCloseException;
 import java.nio.channels.AsynchronousSocketChannel;
 import java.nio.channels.CompletionHandler;
+import java.nio.channels.InterruptedByTimeoutException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import javasabr.rlib.common.util.BufferUtils;
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.Connection;
+import javasabr.rlib.network.Network;
+import javasabr.rlib.network.NetworkConfig;
+import javasabr.rlib.network.UnsafeConnection;
 import javasabr.rlib.network.packet.NetworkPacketReader;
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import lombok.AccessLevel;
@@ -29,7 +35,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public abstract class AbstractNetworkPacketReader<
     R extends ReadableNetworkPacket<C>,
-    C extends Connection<C>> implements NetworkPacketReader {
+    C extends UnsafeConnection<C>> implements NetworkPacketReader {
 
   final CompletionHandler<Integer, ByteBuffer> readChannelHandler = new CompletionHandler<>() {
 
@@ -94,12 +100,34 @@ protected String remoteAddress() {
 
   @Override
   public void startRead() {
-    if (!reading.compareAndSet(false, true)) {
+    if (connection.closed()) {
+      log.warning(connection.remoteAddress(), "[%s] Connection is already closed"::formatted);
+      return;
+    } else if (!reading.compareAndSet(false, true)) {
+      log.debug(connection.remoteAddress(), "[%s] Connection is already waiting for new data from channel"::formatted);
       return;
     }
+    startReadImpl();
+  }
+
+  protected void startReadImpl() {
     log.debug(remoteAddress(), "[%s] Start waiting for new data from channel..."::formatted);
     ByteBuffer buffer = bufferToReadFromChannel();
-    socketChannel.read(buffer, buffer, readChannelHandler);
+    try {
+      socketChannel.read(buffer, buffer, readChannelHandler);
+    } catch (RuntimeException ex) {
+      log.error(ex);
+      reading.compareAndSet(true, false);
+      retryReadLater();
+    }
+  }
+
+  protected void retryReadLater() {
+    Network<?> network = connection.network();
+    NetworkConfig config = network.config();
+    network
+        .scheduledExecutor()
+        .schedule(this::startRead, config.retryDelayInMs(), TimeUnit.MILLISECONDS);
   }
 
   /**
@@ -363,22 +391,27 @@ protected void freeTempBigBuffers() {
    */
   protected void handleReceivedData(int receivedBytes, ByteBuffer readingBuffer) {
     updateActivityFunction.run();
-
     if (receivedBytes == -1) {
-      connection.close();
-      return;
-    }
-
-    log.debug(remoteAddress(), receivedBytes, "[%s] Received [%s] bytes from channel"::formatted);
-    readingBuffer.flip();
-    try {
-      readPackets(readingBuffer);
-    } catch (Exception e) {
-      log.error(e);
-    }
-
-    if (reading.compareAndSet(true, false)) {
-      startRead();
+      log.debug(remoteAddress(), "[%s] Received empty bytes from channel"::formatted);
+      if (connection.closed()) {
+        reading.compareAndSet(true, false);
+        return;
+      } else if (!socketChannel.isOpen()) {
+        connection.close();
+        return;
+      }
+      if (reading.compareAndSet(false, true)) {
+        retryReadLater();
+      }
+    } else {
+      log.debug(remoteAddress(), receivedBytes, "[%s] Received [%s] bytes from channel"::formatted);
+      readingBuffer.flip();
+      try {
+        readPackets(readingBuffer);
+      } catch (Exception e) {
+        log.error(e);
+      }
+      startReadImpl();
     }
   }
 
@@ -389,6 +422,12 @@ protected void handleReceivedData(int receivedBytes, ByteBuffer readingBuffer) {
    * @param readingBuffer the currently reading buffer.
    */
   protected void handleFailedReceiving(Throwable exception, ByteBuffer readingBuffer) {
+    if (exception instanceof InterruptedByTimeoutException) {
+      if (reading.compareAndSet(true, false)) {
+        startRead();
+      }
+      return;
+    }
     if (exception instanceof AsynchronousCloseException) {
       log.info(remoteAddress(), "[%s] Connection was closed"::formatted);
     } else {
@@ -435,11 +474,10 @@ protected abstract R createPacketFor(
 
   @Override
   public void close() {
-
     bufferAllocator
         .putReadBuffer(readBuffer)
         .putPendingBuffer(pendingBuffer);
-
     freeTempBigBuffers();
+    reading.compareAndSet(true, false);
   }
 }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
index 6c9f153c..214568ae 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketWriter.java
@@ -349,6 +349,9 @@ protected void handleSuccessfulWritingData(Integer wroteBytes, @Nullable Writabl
       if (packet != null) {
         sentPacketHandler.accept(packet, false);
       }
+      if (writing.compareAndSet(true, false)) {
+        clearTempBuffers();
+      }
       connection.close();
       return;
     }
@@ -357,7 +360,14 @@ protected void handleSuccessfulWritingData(Integer wroteBytes, @Nullable Writabl
     if (writingBuffer.remaining() > 0) {
       log.debug(remoteAddress(), writingBuffer,
           "[%s] Buffer was not consumed fully, try to write else [%s] bytes to channel"::formatted);
-      socketChannel.write(writingBuffer, packet, writeHandler);
+      try {
+        socketChannel.write(writingBuffer, packet, writeHandler);
+      } catch (RuntimeException ex) {
+        log.error(ex);
+        if (writing.compareAndSet(true, false)) {
+          clearTempBuffers();
+        }
+      }
       return;
     } else {
       log.debug(remoteAddress(), wroteBytes, "[%s] Finished writing [%s] bytes"::formatted);
@@ -400,6 +410,7 @@ public void close() {
         .putWriteBuffer(secondWriteBuffer);
     clearTempBuffers();
     writingBuffer = EMPTY_BUFFER;
+    writing.compareAndSet(true, false);
   }
 
   protected void clearTempBuffers() {
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
index 3cebfea5..89b3ec68 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSslNetworkPacketReader.java
@@ -7,7 +7,7 @@
 import java.util.function.Consumer;
 import javasabr.rlib.common.util.BufferUtils;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
+import javasabr.rlib.network.UnsafeConnection;
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javasabr.rlib.network.util.NetworkUtils;
@@ -30,7 +30,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public abstract class AbstractSslNetworkPacketReader<
     R extends ReadableNetworkPacket<C>,
-    C extends Connection<C>> extends AbstractNetworkPacketReader<R, C> {
+    C extends UnsafeConnection<C>> extends AbstractNetworkPacketReader<R, C> {
 
   private static final ByteBuffer[] EMPTY_BUFFERS = {
       NetworkUtils.EMPTY_BUFFER
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
index 16858dbd..4fd8b975 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultNetworkPacketReader.java
@@ -5,7 +5,7 @@
 import java.util.function.Consumer;
 import java.util.function.IntFunction;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
+import javasabr.rlib.network.UnsafeConnection;
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
@@ -17,7 +17,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public class DefaultNetworkPacketReader<
     R extends ReadableNetworkPacket<C>,
-    C extends Connection<C>> extends AbstractNetworkPacketReader<R, C> {
+    C extends UnsafeConnection<C>> extends AbstractNetworkPacketReader<R, C> {
 
   final IntFunction<R> readablePacketFactory;
   final int packetLengthHeaderSize;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
index 34b6a877..f7c15fd7 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSslNetworkPacketReader.java
@@ -5,7 +5,7 @@
 import java.util.function.Consumer;
 import java.util.function.IntFunction;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
+import javasabr.rlib.network.UnsafeConnection;
 import javasabr.rlib.network.packet.ReadableNetworkPacket;
 import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javax.net.ssl.SSLEngine;
@@ -19,7 +19,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public class DefaultSslNetworkPacketReader<
     R extends ReadableNetworkPacket<C>,
-    C extends Connection<C>> extends AbstractSslNetworkPacketReader<R, C> {
+    C extends UnsafeConnection<C>> extends AbstractSslNetworkPacketReader<R, C> {
 
   final IntFunction<R> packetResolver;
   final int packetLengthHeaderSize;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketReader.java
index 4b3eabdd..e1bee478 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketReader.java
@@ -4,7 +4,7 @@
 import java.nio.channels.AsynchronousSocketChannel;
 import java.util.function.Consumer;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
+import javasabr.rlib.network.UnsafeConnection;
 import javasabr.rlib.network.packet.IdBasedReadableNetworkPacket;
 import javasabr.rlib.network.packet.registry.ReadableNetworkPacketRegistry;
 import lombok.AccessLevel;
@@ -17,7 +17,7 @@
 @FieldDefaults(level = AccessLevel.PROTECTED)
 public class IdBasedNetworkPacketReader<
     R extends IdBasedReadableNetworkPacket<C>,
-    C extends Connection<C>> extends AbstractNetworkPacketReader<R, C> {
+    C extends UnsafeConnection<C>> extends AbstractNetworkPacketReader<R, C> {
 
   final ReadableNetworkPacketRegistry<R, C> packetRegistry;
   final int packetLengthHeaderSize;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
index 61f986ed..3a2ef320 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java
@@ -11,6 +11,8 @@
 import java.nio.channels.CompletionHandler;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -29,6 +31,8 @@
 import javasabr.rlib.network.util.NetworkUtils;
 import lombok.AccessLevel;
 import lombok.CustomLog;
+import lombok.Getter;
+import lombok.experimental.Accessors;
 import lombok.experimental.FieldDefaults;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
@@ -39,6 +43,7 @@
  * @author JavaSaBr
  */
 @CustomLog
+@Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
 public class DefaultServerNetwork<C extends UnsafeConnection<C>>
     extends AbstractNetwork<C> implements ServerNetwork<C> {
@@ -70,6 +75,9 @@ public void failed(Throwable exc, DefaultServerNetwork<C> network) {
     }
   };
 
+  @Getter
+  ScheduledExecutorService scheduledExecutor;
+
   AsynchronousChannelGroup group;
   AsynchronousServerSocketChannel channel;
   MutableArray<Consumer<? super C>> subscribers;
@@ -79,6 +87,7 @@ public DefaultServerNetwork(
       BiFunction<Network<C>, AsynchronousSocketChannel, C> channelToConnection) {
     super(config, channelToConnection);
     this.group = Utils.uncheckedGet(buildExecutor(config), AsynchronousChannelGroup::withThreadPool);
+    this.scheduledExecutor = buildScheduledExecutor(config);
     this.channel = Utils.uncheckedGet(group, AsynchronousServerSocketChannel::open);
     this.subscribers = ArrayFactory.copyOnModifyArray(Consumer.class);
     log.info(config, DefaultServerNetwork::buildConfigDescription);
@@ -183,9 +192,32 @@ protected ExecutorService buildExecutor(ServerNetworkConfig config) {
     return executorService;
   }
 
+  protected ScheduledExecutorService buildScheduledExecutor(ServerNetworkConfig config) {
+
+    var threadFactory = new GroupThreadFactory(
+        config.scheduledThreadGroupName(),
+        config.threadConstructor(),
+        config.threadPriority(),
+        false);
+
+    ScheduledExecutorService executorService;
+    if (config.threadGroupMinSize() < config.threadGroupMaxSize()) {
+      executorService = new ScheduledThreadPoolExecutor(
+          config.scheduledThreadGroupSize(),
+          threadFactory,
+          new ThreadPoolExecutor.CallerRunsPolicy());
+    } else {
+      executorService = Executors.newScheduledThreadPool(config.threadGroupMinSize(), threadFactory);
+    }
+
+    // activate the executor
+    executorService.submit(() -> {});
+    return executorService;
+  }
+
   private static String buildConfigDescription(ServerNetworkConfig conf) {
     return "Server network configuration: {\n" + "  minThreads: " + conf.threadGroupMinSize() + ",\n" + "  maxThreads: "
-        + conf.threadGroupMaxSize() + ",\n" + "  priority: " + conf.threadPriority() + ",\n" + "  groupName: \""
+        + conf.threadGroupMaxSize() + ",\n" + "  priority: " + conf.threadPriority() + ",\n" + "  threadGroupName: \""
         + conf.threadGroupName() + "\",\n" + "  readBufferSize: " + conf.readBufferSize() + ",\n"
         + "  pendingBufferSize: " + conf.pendingBufferSize() + ",\n" + "  writeBufferSize: " + conf.writeBufferSize()
         + "\n" + "}";
diff --git a/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
index 404043b7..8de053a2 100644
--- a/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
+++ b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java
@@ -273,7 +273,7 @@ void testServerWithMultiplyClients() {
 
     var serverConfig = SimpleServerNetworkConfig
         .builder()
-        .threadGroupSize(10)
+        .threadGroupMaxSize(10)
         .build();
 
     var serverAllocator = new DefaultBufferAllocator(serverConfig);
@@ -335,7 +335,7 @@ void testServerWithMultiplyClientsUsingOldApi() {
 
     var serverNetwork = NetworkFactory.stringDataServerNetwork(SimpleServerNetworkConfig
         .builder()
-        .threadGroupSize(10)
+        .threadGroupMaxSize(10)
         .build());
 
     InetSocketAddress serverAddress = serverNetwork.start();

From a450c823ea732daf4f014ab305813cc02acd391e Mon Sep 17 00:00:00 2001
From: javasabr <javasabr@gmail.com>
Date: Fri, 17 Oct 2025 20:36:20 +0200
Subject: [PATCH 6/6] improving network module

---
 README.md                                     |  2 +-
 .../rlib/network/StringNetworkLoadTest.java   |  1 -
 .../network/StringSslNetworkLoadTest.java     |  3 --
 .../rlib/network/BufferAllocator.java         |  1 -
 .../javasabr/rlib/network/NetworkConfig.java  |  7 +++
 .../network/impl/StringDataSslConnection.java |  1 -
 .../impl/AbstractNetworkPacketReader.java     | 52 +++++++++++++------
 ...AbstractReusableWritableNetworkPacket.java |  1 -
 .../impl/IdBasedNetworkPacketWriter.java      |  3 --
 9 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index d32316d0..b338bf1c 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ repositories {
 }
 
 ext {
-   rlibVersion = "10.0.alpha"
+   rlibVersion = "10.0.alpha3"
 }
 
 dependencies {
diff --git a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
index 7e8af5af..44a14e15 100644
--- a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
+++ b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringNetworkLoadTest.java
@@ -19,7 +19,6 @@
 import javasabr.rlib.network.client.ClientNetwork;
 import javasabr.rlib.network.impl.DefaultBufferAllocator;
 import javasabr.rlib.network.impl.StringDataConnection;
-import javasabr.rlib.network.impl.StringDataSslConnection;
 import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
 import javasabr.rlib.network.server.ServerNetwork;
diff --git a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
index 889e8a2b..91a8120d 100644
--- a/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
+++ b/rlib-network/src/loadTest/java/javasabr/rlib/network/StringSslNetworkLoadTest.java
@@ -19,10 +19,7 @@
 import javasabr.rlib.network.ServerNetworkConfig.SimpleServerNetworkConfig;
 import javasabr.rlib.network.client.ClientNetwork;
 import javasabr.rlib.network.impl.DefaultBufferAllocator;
-import javasabr.rlib.network.impl.StringDataConnection;
 import javasabr.rlib.network.impl.StringDataSslConnection;
-import javasabr.rlib.network.packet.impl.AbstractSslNetworkPacketReader;
-import javasabr.rlib.network.packet.impl.AbstractSslNetworkPacketWriter;
 import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
 import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
 import javasabr.rlib.network.server.ServerNetwork;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/BufferAllocator.java b/rlib-network/src/main/java/javasabr/rlib/network/BufferAllocator.java
index 0bcbfc99..d713c3f1 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/BufferAllocator.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/BufferAllocator.java
@@ -1,7 +1,6 @@
 package javasabr.rlib.network;
 
 import java.nio.ByteBuffer;
-import org.jspecify.annotations.Nullable;
 
 /**
  * The interface to implement a buffer allocator for network things.
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java b/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java
index 4a980879..ace95432 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java
@@ -83,6 +83,13 @@ default int retryDelayInMs() {
     return 1000;
   }
 
+  /**
+   * Gets a max allowed empty reads from socket channel before closing a connection.
+   */
+  default int maxEmptyReadsBeforeClose() {
+    return 3;
+  }
+
   default ByteOrder byteOrder() {
     return ByteOrder.BIG_ENDIAN;
   }
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
index 82a38e6d..a5de0afd 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSslConnection.java
@@ -4,7 +4,6 @@
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.packet.impl.StringReadableNetworkPacket;
-import javasabr.rlib.network.packet.impl.StringWritableNetworkPacket;
 import javax.net.ssl.SSLContext;
 
 /**
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
index 3db70f45..aae4fd2d 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractNetworkPacketReader.java
@@ -5,15 +5,15 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousCloseException;
 import java.nio.channels.AsynchronousSocketChannel;
+import java.nio.channels.ClosedChannelException;
 import java.nio.channels.CompletionHandler;
 import java.nio.channels.InterruptedByTimeoutException;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import javasabr.rlib.common.util.BufferUtils;
 import javasabr.rlib.network.BufferAllocator;
-import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.Network;
 import javasabr.rlib.network.NetworkConfig;
 import javasabr.rlib.network.UnsafeConnection;
@@ -55,6 +55,7 @@ public void failed(Throwable exc, ByteBuffer readingBuffer) {
   };
 
   final AtomicBoolean reading = new AtomicBoolean(false);
+  final AtomicInteger emptyReadsCounter = new AtomicInteger(0);
 
   final C connection;
   final AsynchronousSocketChannel socketChannel;
@@ -117,8 +118,9 @@ protected void startReadImpl() {
       socketChannel.read(buffer, buffer, readChannelHandler);
     } catch (RuntimeException ex) {
       log.error(ex);
-      reading.compareAndSet(true, false);
-      retryReadLater();
+      if (reading.compareAndSet(true, false)) {
+        retryReadLater();
+      }
     }
   }
 
@@ -392,20 +394,11 @@ protected void freeTempBigBuffers() {
   protected void handleReceivedData(int receivedBytes, ByteBuffer readingBuffer) {
     updateActivityFunction.run();
     if (receivedBytes == -1) {
-      log.debug(remoteAddress(), "[%s] Received empty bytes from channel"::formatted);
-      if (connection.closed()) {
-        reading.compareAndSet(true, false);
-        return;
-      } else if (!socketChannel.isOpen()) {
-        connection.close();
-        return;
-      }
-      if (reading.compareAndSet(false, true)) {
-        retryReadLater();
-      }
+      handleEmptyReadFromChannel();
     } else {
       log.debug(remoteAddress(), receivedBytes, "[%s] Received [%s] bytes from channel"::formatted);
       readingBuffer.flip();
+      emptyReadsCounter.set(0);
       try {
         readPackets(readingBuffer);
       } catch (Exception e) {
@@ -415,6 +408,31 @@ protected void handleReceivedData(int receivedBytes, ByteBuffer readingBuffer) {
     }
   }
 
+  protected void handleEmptyReadFromChannel() {
+    log.debug(remoteAddress(), "[%s] Received empty bytes from channel"::formatted);
+
+    if (connection.closed()) {
+      reading.compareAndSet(true, false);
+      return;
+    } else if (!socketChannel.isOpen()) {
+      connection.close();
+      return;
+    }
+
+    NetworkConfig config = connection
+        .network()
+        .config();
+
+    if (emptyReadsCounter.incrementAndGet() > config.maxEmptyReadsBeforeClose()) {
+      connection.close();
+      return;
+    }
+
+    if (reading.compareAndSet(true, false)) {
+      retryReadLater();
+    }
+  }
+
   /**
    * Handles the exception during receiving data from the channel.
    *
@@ -424,12 +442,14 @@ protected void handleReceivedData(int receivedBytes, ByteBuffer readingBuffer) {
   protected void handleFailedReceiving(Throwable exception, ByteBuffer readingBuffer) {
     if (exception instanceof InterruptedByTimeoutException) {
       if (reading.compareAndSet(true, false)) {
-        startRead();
+        retryReadLater();
       }
       return;
     }
     if (exception instanceof AsynchronousCloseException) {
       log.info(remoteAddress(), "[%s] Connection was closed"::formatted);
+    } else if (exception instanceof ClosedChannelException) {
+      log.info(remoteAddress(), "[%s] Connection was closed"::formatted);
     } else {
       log.error(exception);
       connection.close();
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
index 9c55dc62..84f40ee5 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritableNetworkPacket.java
@@ -9,7 +9,6 @@
 import javasabr.rlib.common.util.ClassUtils;
 import javasabr.rlib.network.Connection;
 import javasabr.rlib.network.packet.ReusableWritablePacket;
-import javasabr.rlib.network.packet.WritableNetworkPacket;
 import javasabr.rlib.reusable.pool.Pool;
 import javasabr.rlib.reusable.pool.PoolFactory;
 import lombok.AccessLevel;
diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
index 2c381a39..a8e9d767 100644
--- a/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
+++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedNetworkPacketWriter.java
@@ -4,9 +4,6 @@
 import java.nio.channels.AsynchronousSocketChannel;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import javasabr.rlib.common.function.NotNullBiConsumer;
-import javasabr.rlib.common.function.NotNullConsumer;
-import javasabr.rlib.common.function.NullableSupplier;
 import javasabr.rlib.functions.ObjBoolConsumer;
 import javasabr.rlib.network.BufferAllocator;
 import javasabr.rlib.network.Connection;