Further Provider template refinement