Update aggregator to contain all modules