Finished the Localization support