Improve WebSocket