More work on WebSocketClient.