ComponentCheckBox - Some changes