Added support for auto localization