Added support for button groups