Moving to the FactorySystem