Adding support for checkboxes as fields