added support for checkboxes