Add support for checkboxes