Change to non-static localization API