Preliminary websocket support