Correcting i18n management and adding list