Adapted websocket changes #168