Added checkbox and radio