Added checkbox and radio support