Added Funnel support