Improving locales support