better support for localization
better localization added