Start working on refactoring providers