improve enums.