diff --git a/include/transport/networkpluginserver.h b/include/transport/networkpluginserver.h
index 7f89d7569fd4a4afd84d3a77033887d33f115546..082bbc426d5cf41f74dc1fbc357b40fd33e4b2a7 100644
--- a/include/transport/networkpluginserver.h
+++ b/include/transport/networkpluginserver.h
@@ -44,6 +44,7 @@ class NetworkPluginServer {
 			bool pongReceived;
 			std::list<User *> users;
 			std::string data;
+			boost::shared_ptr<Swift::Connection> connection;
 		};
 
 		NetworkPluginServer(Component *component, Config *config, UserManager *userManager);
@@ -54,8 +55,8 @@ class NetworkPluginServer {
 
 	private:
 		void handleNewClientConnection(boost::shared_ptr<Swift::Connection> c);
-		void handleSessionFinished(boost::shared_ptr<Swift::Connection>);
-		void handleDataRead(boost::shared_ptr<Swift::Connection>, const Swift::ByteArray&);
+		void handleSessionFinished(Client *c);
+		void handleDataRead(Client *c, const Swift::ByteArray&);
 
 		void handleConnectedPayload(const std::string &payload);
 		void handleDisconnectedPayload(const std::string &payload);
@@ -73,13 +74,13 @@ class NetworkPluginServer {
 		void send(boost::shared_ptr<Swift::Connection> &, const std::string &data);
 
 		void pingTimeout();
-		void sendPing(boost::shared_ptr<Swift::Connection> c);
-		boost::shared_ptr<Swift::Connection> getFreeClient();
+		void sendPing(Client *c);
+		Client *getFreeClient();
 
 		UserManager *m_userManager;
 		Config *m_config;
 		boost::shared_ptr<Swift::ConnectionServer> m_server;
-		std::map<boost::shared_ptr<Swift::Connection>, Client >  m_clients;
+		std::list<Client *>  m_clients;
 		Swift::Timer::ref m_pingTimer;
 };