Refactor ExtendedLoanRequest