Update to support new locales