Refactored Aggregate operations.