Move aggregator to its own class and modify calling structure