Improved migration multi language keys