Major refactoring to the Invoice.