Adding multilingual support