New provider config data structure
Merge branch 'config'