Add enumerations instead of options in some states of selection