Updated for latest Funnel master