Added support for check buttons