Sharpening multi language support