Improve i18n handler commands