Added websocket based TODO