added more websocket support