Added more enum variants for class definition