Updated websocket support