Updated data repository to include country mappings