Add support for Checkboxes