Added challenge to factory and enum