Added support to checkbox and radio
Passing options