Country codes

Better support for country codes.