Refactored to return multiple aggregated results