Added support for widgets