Refactor handling of InvoiceRequest