Updated Aggregator and Modes to allow score aggregation.