Improved localization support.