Refactored Aggregates constructor