Enhanced OptionsField