Some further development on the websocket client