Improve Websocket notification interface