Updated to use the new I18n system in core!