Removed CountryCode field