Change view macros to handle multiple providers