FactCreator & ComponentCreator updated