Updates to support new locales