Localization support added