Renamed Aggregator back to SampleAggregator