InvoiceMapper updated to new method