Adding websocket support