Changes to invoice generation