Refactoring: Add new CustomField subclass OptionField