More websocket refinement