Added functionality to FactoryInstanceMaker