Removed country_id