Added support for funnel widgets