Expand on WebSocket implementation