Add checkboxes support