Fixes #79 - Introduce SocketController