Attempt at simplifying and cleaning up Aggregator