Refactored I18n class