Added custom checkboxes