diff --git a/Ragon.Client/Sources/RagonClient.cs b/Ragon.Client/Sources/RagonClient.cs
index f54cd4f..f64e928 100644
--- a/Ragon.Client/Sources/RagonClient.cs
+++ b/Ragon.Client/Sources/RagonClient.cs
@@ -74,17 +74,7 @@ namespace Ragon.Client
       _stats = new NetworkStatistics();
       _status = RagonStatus.DISCONNECTED;
     }
-
-    public void AddListener(IRagonListener listener)
-    {
-      _listenerList.Add(listener);
-    }
-
-    public void RemoveListener(IRagonListener listener)
-    {
-      _listenerList.Remove(listener);
-    }
-
+    
     public void Connect(string address, ushort port, string protocol)
     {
       _writeBuffer = new RagonBuffer();
@@ -147,6 +137,28 @@ namespace Ragon.Client
       _connection.Dispose();
     }
 
+    public void AddListener(IRagonListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonAuthorizationListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonConnectedListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonFailedListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonJoinListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonLeftListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonLevelListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonOwnershipChangedListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonPlayerJoinListener listener) => _listenerList.Add(listener);
+    public void AddListener(IRagonPlayerLeftListener listener) => _listenerList.Add(listener);
+
+    public void RemoveListener(IRagonListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonAuthorizationListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonConnectedListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonFailedListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonJoinListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonLeftListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonLevelListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonOwnershipChangedListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonPlayerJoinListener listener) => _listenerList.Remove(listener);
+    public void RemoveListener(IRagonPlayerLeftListener listener) => _listenerList.Remove(listener);
+    
     #endregion
 
     #region INTERNAL