Simplify FactoryService