Improved multilanguage support