Add checkboxes and radio buttons support