Logic: edited ModelFactory