Modified all enums to be enum classes. Fixed issues around that