Added fields for invoice