Updated SocketClient