Adds support for the addition of country_code