Added localization support
More localization