Add support for widgets in control groups