Add more websocket checks and code
Add more websocket checks and code