Minor changes for providers config.
Minor refactoring.