Refactor index Funnel