improve enum validations