Added support for OptionState