Added support for specifying a locale