Added support for localization