Added locales support