Refactoring and now using fedtools-i18n