Added 2-3 letter codes to countries