Websocket support changes