Added checkboxes and radio