Refactor multilingual support