Pulling over new config structure