Added support for translation