Refactor aggregates classes