Continue work on multi language support