updated WebSocketService impl