Seriously added InvoiceClass this time