diff --git a/pom.xml b/pom.xml
index a3969a8..860fe52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.finn.unlegitlibrary</groupId>
     <artifactId>unlegitlibrary</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
     <url>https://unlegitdqrk.dev/UnlegitLibrary/</url>
     <description>Just a big library</description>
 
diff --git a/src/main/java/me/finn/unlegitlibrary/network/system/client/NetworkClient.java b/src/main/java/me/finn/unlegitlibrary/network/system/client/NetworkClient.java
index e14282c..3100443 100644
--- a/src/main/java/me/finn/unlegitlibrary/network/system/client/NetworkClient.java
+++ b/src/main/java/me/finn/unlegitlibrary/network/system/client/NetworkClient.java
@@ -5,6 +5,7 @@ import me.finn.unlegitlibrary.network.system.client.events.*;
 import me.finn.unlegitlibrary.network.system.packets.Packet;
 import me.finn.unlegitlibrary.network.system.packets.PacketHandler;
 import me.finn.unlegitlibrary.network.system.packets.impl.ClientIDPacket;
+import me.finn.unlegitlibrary.network.system.server.ConnectionHandler;
 import me.finn.unlegitlibrary.network.utils.PemUtils;
 import me.finn.unlegitlibrary.utils.DefaultMethodsOverrider;
 import me.finn.unlegitlibrary.utils.Logger;
@@ -174,6 +175,12 @@ public final class NetworkClient {
         return true;
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof NetworkClient target)) return false;
+        return target.getClientID() == clientID;
+    }
+
     public boolean sendPacket(Packet packet) throws IOException, ClassNotFoundException {
         if (!isConnected()) return false;
         boolean sent = packetHandler.sendPacket(packet, outputStream);
diff --git a/src/main/java/me/finn/unlegitlibrary/network/system/server/ConnectionHandler.java b/src/main/java/me/finn/unlegitlibrary/network/system/server/ConnectionHandler.java
index 4387cc8..19e2fd0 100644
--- a/src/main/java/me/finn/unlegitlibrary/network/system/server/ConnectionHandler.java
+++ b/src/main/java/me/finn/unlegitlibrary/network/system/server/ConnectionHandler.java
@@ -19,6 +19,12 @@ public class ConnectionHandler {
     private ObjectInputStream inputStream;
     private final NetworkServer server;
 
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ConnectionHandler target)) return false;
+        return target.getClientID() == clientID;
+    }
+
     public SSLSocket getSocket() {
         return socket;
     }
diff --git a/src/main/java/me/finn/unlegitlibrary/network/system/server/NetworkServer.java b/src/main/java/me/finn/unlegitlibrary/network/system/server/NetworkServer.java
index 39cfbd6..cc20343 100644
--- a/src/main/java/me/finn/unlegitlibrary/network/system/server/NetworkServer.java
+++ b/src/main/java/me/finn/unlegitlibrary/network/system/server/NetworkServer.java
@@ -33,6 +33,17 @@ public final class NetworkServer {
         return connectionHandlers;
     }
 
+    public ConnectionHandler getConnectionHandlerByID(int clientID) {
+        for (ConnectionHandler connectionHandler : connectionHandlers) if (connectionHandler.getClientID() == clientID) return connectionHandler;
+        return null;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof NetworkServer target)) return false;
+        return super.equals(obj);
+    }
+
     public int getPort() {
         return port;
     }
@@ -53,7 +64,7 @@ public final class NetworkServer {
         return eventManager;
     }
 
-    private boolean requireClientCert;
+    private final boolean requireClientCert;
 
     private NetworkServer(int port, PacketHandler packetHandler, EventManager eventManager,
                           Logger logger, int timeout, SSLServerSocketFactory factory, boolean requireClientCert) {