Update to use BorrowFrom