Localization support

Added localization support