Added StructureFactory