Funding refactor