Support enum and enum value options