Improve multilanguage support