Localization enhancements