Started work on refactoring the provider configs