Add support for locales