Added support for radio choices