Added locales logic