Country.CountryId is now an int