improve multi language support