Refactor out the ProviderConfig object retriever.
Work in progress