better mapping of invoices