CountryId is now an int