Update to websocket based relay/client