Change to aggregator and scripts