Added code for handling country codes.