Refactor
New Aggregate