Improved multilanguage handling