ModuleProvider Refactorings