Refactoring, works with WebSocketHandlerProxy from now on