Changes for new websocket version