adding some support for widgets