Modify OptionSetField to generate enum type field