Updates for multilanguage support