Added various changes for invoice creation