Added support for checkboxes