More efficient localization handling