Add options, generalize enums.