Milestone: Provider refactoring.