Issue #1: Added support for multilingual