Replaced all discrete valued features with enums