Added support for internationalization