Adding support for checkbox and radio button