Adding support for radio buttons