improved multi-language support