Change CountryAggregation to function