Updated FactoryManager