Added localization functionality