Added funding scopes, updated views, funding model