replaced nulls in CreateClass with Option