Finish vanilla localization support