Improve locales support