adding localization support