Refactor aggregators