Update configuration and add country data source