Adding radio buttons support