Adding support for localization