WebSocket Enhancement