Improvements to providers template