Condensed to one enum. Fixed Question class