Added support for different locales