Adding Country and State Codes