Finish WebSocket Support additions