Add support for language and territory names