Fix FactoryService