Add localization handling