Added multilingual support