Removed use of enums