Added i18n-node based support