Add: support for checkboxes