Add support for widgets