Add enum option type

(cherry picked from commit ab2cd34076cceef0288a05b40afee1160c44d40b)