Move factory method to Aggregator