Added Funnel support
Added Funnel support