Adding localization support