- Added i18n and refactored