Added support for default locale