Updated Invoices to cope with new Journal structure