Refactoring AggregateFactories