Removing extra data checking type, and setting invoiceNumber as string