Added support for radio buttons