More Aggregate refactoring