Updates to aggregator refactor