Continued work on Localization support.