Updating listeners to support checkboxes