- Added i18n package and refactored