Added adhoc multi-language support