Improve the websocket server