Add support for checkboxes
Added check and check-on support