Refactorings for providers