diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
new file mode 100644
index 00000000000..8250a5a9b44
--- /dev/null
+++ b/.github/workflows/test-workflows.yml
@@ -0,0 +1,85 @@
+name: Run test workflows
+
+on:
+  schedule:
+    - cron: "0 2 * * *"
+  workflow_dispatch:
+
+
+jobs:
+  run-test-workflows:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: n8n
+      -
+        name: Checkout workflows repo
+        uses: actions/checkout@v2
+        with:
+          repository: n8n-io/test-workflows
+          path: test-workflows
+      -
+        name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      -
+        name: npm install and build
+        run: |
+          cd n8n
+          npm install
+          npm run bootstrap
+          npm run build --if-present
+        env:
+          CI: true
+        shell: bash
+      -
+        name: Import credentials
+        run: n8n/packages/cli/bin/n8n import:credentials --input=test-workflows/credentials.json
+        shell: bash
+        env:
+          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      -
+        name: Import workflows
+        run: n8n/packages/cli/bin/n8n import:workflow --separate --input=test-workflows/workflows
+        shell: bash
+        env:
+          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      -
+        name: Copy static assets
+        run: |
+          cp n8n/assets/n8n-logo.png /tmp/n8n-logo.png
+          cp n8n/assets/n8n-screenshot.png /tmp/n8n-screenshot.png
+          cp n8n/node_modules/pdf-parse/test/data/05-versions-space.pdf /tmp/05-versions-space.pdf
+          cp n8n/node_modules/pdf-parse/test/data/04-valid.pdf /tmp/04-valid.pdf
+        shell: bash
+      -
+        name: Run tests
+        run: n8n/packages/cli/bin/n8n executeBatch --shallow --skipList=test-workflows/skipList.txt --shortOutput --concurrency=16 --compare=test-workflows/snapshots
+        shell: bash
+        env:
+          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      -
+        name: Export credentials
+        if: always()
+        run: n8n/packages/cli/bin/n8n export:credentials --output=test-workflows/credentials.json --all --pretty
+        shell: bash
+        env:
+          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      -
+        name: Commit and push credential changes
+        if: always()
+        run: |
+          cd test-workflows
+          git config --global user.name 'n8n test bot'
+          git config --global user.email 'n8n-test-bot@users.noreply.github.com'
+          git commit -am "Automated credential update"
+          git push --force --quiet "https://janober:${{ secrets.TOKEN }}@github.com/n8n-io/test-workflows.git" main:main
diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 2a762e04768..a7ac4db33b7 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,16 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 0.127.0
+
+### What changed?
+
+For the Zoho node, the `lead:create` operation now requires a "Company" parameter, the parameter "Address" is now inside "Additional Options", and the parameters "Title" and "Is Duplicate Record" were removed. Also, the `lead:delete` operation now returns only the `id` of the deleted lead.
+
+### When is action necessary?
+
+If you are using `lead:create` with "Company" or "Address", reset the parameters; for the other two parameters, no action needed. If you are using the response from `lead:delete`, reselect the `id` key.
+
 ## 0.118.0
 
 ### What changed?
diff --git a/packages/cli/commands/Interfaces.d.ts b/packages/cli/commands/Interfaces.d.ts
new file mode 100644
index 00000000000..aedd1945397
--- /dev/null
+++ b/packages/cli/commands/Interfaces.d.ts
@@ -0,0 +1,54 @@
+interface IResult {
+	totalWorkflows: number;
+	summary: {
+		failedExecutions: number,
+		successfulExecutions: number,
+		warningExecutions: number,
+		errors: IExecutionError[],
+		warnings: IExecutionError[],
+	};
+	coveredNodes: {
+		[nodeType: string]: number
+	};
+	executions: IExecutionResult[];
+}
+interface IExecutionResult {
+	workflowId: string | number;
+	workflowName: string;
+	executionTime: number; // Given in seconds with decimals for milisseconds
+	finished: boolean;
+	executionStatus: ExecutionStatus;
+	error?: string;
+	changes?: string;
+	coveredNodes: {
+		[nodeType: string]: number
+	};
+}
+
+interface IExecutionError {
+	workflowId: string | number;
+	error: string;
+}
+
+interface IWorkflowExecutionProgress {
+	workflowId: string | number;
+	status: ExecutionStatus;
+}
+
+interface INodeSpecialCases {
+	[nodeName: string]: INodeSpecialCase;
+}
+
+interface INodeSpecialCase {
+	ignoredProperties?: string[];
+	capResults?: number;
+}
+
+type ExecutionStatus = 'success' | 'error' | 'warning' | 'running';
+
+declare module 'json-diff' {
+	interface IDiffOptions {
+		keysOnly?: boolean;
+	}
+	export function diff(obj1: unknown, obj2: unknown, diffOptions: IDiffOptions): string;
+}
diff --git a/packages/cli/commands/execute.ts b/packages/cli/commands/execute.ts
index 9eafd28c9e9..48ae6a19f00 100644
--- a/packages/cli/commands/execute.ts
+++ b/packages/cli/commands/execute.ts
@@ -22,7 +22,7 @@ import {
 	WorkflowRunner,
 } from '../src';
 
-import { 
+import {
 	getLogger,
 } from '../src/Logger';
 
@@ -46,6 +46,9 @@ export class Execute extends Command {
 		id: flags.string({
 			description: 'id of the workflow to execute',
 		}),
+		rawOutput: flags.boolean({
+			description: 'Outputs only JSON data, with no other text',
+		}),
 	};
 
 
@@ -183,10 +186,11 @@ export class Execute extends Command {
 					stack: error.stack,
 				};
 			}
-
-			console.info('Execution was successful:');
-			console.info('====================================');
-			console.info(JSON.stringify(data, null, 2));
+			if (flags.rawOutput === undefined) {
+				this.log('Execution was successful:');
+				this.log('====================================');
+			}
+			this.log(JSON.stringify(data, null, 2));
 		} catch (e) {
 			console.error('Error executing workflow. See log messages for details.');
 			logger.error('\nExecution error:');
diff --git a/packages/cli/commands/executeBatch.ts b/packages/cli/commands/executeBatch.ts
new file mode 100644
index 00000000000..7bc6bb858d3
--- /dev/null
+++ b/packages/cli/commands/executeBatch.ts
@@ -0,0 +1,796 @@
+import * as fs from 'fs';
+import {
+	Command,
+	flags,
+} from '@oclif/command';
+
+import {
+	UserSettings,
+} from 'n8n-core';
+
+import {
+	INode,
+	INodeExecutionData,
+	ITaskData,
+} from 'n8n-workflow';
+
+import {
+	ActiveExecutions,
+	CredentialsOverwrites,
+	CredentialTypes,
+	Db,
+	ExternalHooks,
+	IExecutionsCurrentSummary,
+	IWorkflowDb,
+	IWorkflowExecutionDataProcess,
+	LoadNodesAndCredentials,
+	NodeTypes,
+	WorkflowCredentials,
+	WorkflowRunner,
+} from '../src';
+
+import {
+	sep,
+} from 'path';
+
+import {
+	diff,
+} from 'json-diff';
+
+import {
+	getLogger,
+} from '../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
+
+export class ExecuteBatch extends Command {
+	static description = '\nExecutes multiple workflows once';
+
+	static cancelled = false;
+
+	static workflowExecutionsProgress: IWorkflowExecutionProgress[][];
+
+	static shallow = false;
+
+	static compare: string;
+
+	static snapshot: string;
+
+	static concurrency = 1;
+
+	static debug = false;
+
+	static executionTimeout = 3 * 60 * 1000;
+
+	static examples = [
+		`$ n8n executeAll`,
+		`$ n8n executeAll --concurrency=10 --skipList=/data/skipList.txt`,
+		`$ n8n executeAll --debug --output=/data/output.json`,
+		`$ n8n executeAll --ids=10,13,15 --shortOutput`,
+		`$ n8n executeAll --snapshot=/data/snapshots --shallow`,
+		`$ n8n executeAll --compare=/data/previousExecutionData --retries=2`,
+	];
+
+	static flags = {
+		help: flags.help({ char: 'h' }),
+		debug: flags.boolean({
+			description: 'Toggles on displaying all errors and debug messages.',
+		}),
+		ids: flags.string({
+			description: 'Specifies workflow IDs to get executed, separated by a comma.',
+		}),
+		concurrency: flags.integer({
+			default: 1,
+			description: 'How many workflows can run in parallel. Defaults to 1 which means no concurrency.',
+		}),
+		output: flags.string({
+			description: 'Enable execution saving, You must inform an existing folder to save execution via this param',
+		}),
+		snapshot: flags.string({
+			description: 'Enables snapshot saving. You must inform an existing folder to save snapshots via this param.',
+		}),
+		compare: flags.string({
+			description: 'Compares current execution with an existing snapshot. You must inform an existing folder where the snapshots are saved.',
+		}),
+		shallow: flags.boolean({
+			description: 'Compares only if attributes output from node are the same, with no regards to neste JSON objects.',
+		}),
+		skipList: flags.string({
+			description: 'File containing a comma separated list of workflow IDs to skip.',
+		}),
+		retries: flags.integer({
+			description: 'Retries failed workflows up to N tries. Default is 1. Set 0 to disable.',
+			default: 1,
+		}),
+		shortOutput: flags.boolean({
+			description: 'Omits the full execution information from output, displaying only summary.',
+		}),
+	};
+
+	/**
+	 * Gracefully handles exit.
+	 * @param {boolean} skipExit Whether to skip exit or number according to received signal
+	 */
+	static async stopProcess(skipExit: boolean | number = false) {
+
+		if (ExecuteBatch.cancelled === true) {
+			process.exit(0);
+		}
+
+		ExecuteBatch.cancelled = true;
+		const activeExecutionsInstance = ActiveExecutions.getInstance();
+		const stopPromises = activeExecutionsInstance.getActiveExecutions().map(async execution => {
+			activeExecutionsInstance.stopExecution(execution.id);
+		});
+
+		await Promise.allSettled(stopPromises);
+
+		setTimeout(() => {
+			process.exit(0);
+		}, 30000);
+
+		let executingWorkflows = activeExecutionsInstance.getActiveExecutions() as IExecutionsCurrentSummary[];
+
+		let count = 0;
+		while (executingWorkflows.length !== 0) {
+			if (count++ % 4 === 0) {
+				console.log(`Waiting for ${executingWorkflows.length} active executions to finish...`);
+				executingWorkflows.map(execution => {
+					console.log(` - Execution ID ${execution.id}, workflow ID: ${execution.workflowId}`);
+				});
+			}
+			await new Promise((resolve) => {
+				setTimeout(resolve, 500);
+			});
+			executingWorkflows = activeExecutionsInstance.getActiveExecutions();
+		}
+		// We may receive true but when called from `process.on`
+		// we get the signal (SIGNIT, etc.)
+		if (skipExit !== true) {
+			process.exit(0);
+		}
+	}
+
+	formatJsonOutput(data: object) {
+		return JSON.stringify(data, null, 2);
+	}
+
+	shouldBeConsideredAsWarning(errorMessage: string) {
+
+		const warningStrings = [
+			'refresh token is invalid',
+			'unable to connect to',
+			'econnreset',
+			'429',
+			'econnrefused',
+			'missing a required parameter',
+		];
+
+		errorMessage = errorMessage.toLowerCase();
+
+		for (let i = 0; i < warningStrings.length; i++) {
+			if (errorMessage.includes(warningStrings[i])) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+
+	async run() {
+
+		process.on('SIGTERM', ExecuteBatch.stopProcess);
+		process.on('SIGINT', ExecuteBatch.stopProcess);
+
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
+		const { flags } = this.parse(ExecuteBatch);
+
+		ExecuteBatch.debug = flags.debug === true;
+		ExecuteBatch.concurrency = flags.concurrency || 1;
+
+		const ids: number[] = [];
+		const skipIds: number[] = [];
+
+		if (flags.snapshot !== undefined) {
+			if (fs.existsSync(flags.snapshot)) {
+				if (!fs.lstatSync(flags.snapshot).isDirectory()) {
+					console.log(`The parameter --snapshot must be an existing directory`);
+					return;
+				}
+			} else {
+				console.log(`The parameter --snapshot must be an existing directory`);
+				return;
+			}
+
+			ExecuteBatch.snapshot = flags.snapshot;
+		}
+		if (flags.compare !== undefined) {
+			if (fs.existsSync(flags.compare)) {
+				if (!fs.lstatSync(flags.compare).isDirectory()) {
+					console.log(`The parameter --compare must be an existing directory`);
+					return;
+				}
+			} else {
+				console.log(`The parameter --compare must be an existing directory`);
+				return;
+			}
+
+			ExecuteBatch.compare = flags.compare;
+		}
+
+		if (flags.output !== undefined) {
+			if (fs.existsSync(flags.output)) {
+				if (fs.lstatSync(flags.output).isDirectory()) {
+					console.log(`The parameter --output must be a writable file`);
+					return;
+				}
+			}
+		}
+
+		if (flags.ids !== undefined) {
+			const paramIds = flags.ids.split(',');
+			const re = /\d+/;
+			const matchedIds = paramIds.filter(id => id.match(re)).map(id => parseInt(id.trim(), 10));
+
+			if (matchedIds.length === 0) {
+				console.log(`The parameter --ids must be a list of numeric IDs separated by a comma.`);
+				return;
+			}
+
+			ids.push(...matchedIds);
+		}
+
+		if (flags.skipList !== undefined) {
+			if (fs.existsSync(flags.skipList)) {
+				const contents = fs.readFileSync(flags.skipList, { encoding: 'utf-8' });
+				skipIds.push(...contents.split(',').map(id => parseInt(id.trim(), 10)));
+			} else {
+				console.log('Skip list file not found. Exiting.');
+				return;
+			}
+		}
+
+		if (flags.shallow === true) {
+			ExecuteBatch.shallow = true;
+		}
+
+
+		// Start directly with the init of the database to improve startup time
+		const startDbInitPromise = Db.init();
+
+		// Load all node and credential types
+		const loadNodesAndCredentials = LoadNodesAndCredentials();
+		const loadNodesAndCredentialsPromise = loadNodesAndCredentials.init();
+
+		// Make sure the settings exist
+		await UserSettings.prepareUserSettings();
+
+		// Wait till the database is ready
+		await startDbInitPromise;
+
+		let allWorkflows;
+
+		const query = Db.collections!.Workflow!.createQueryBuilder('workflows');
+
+		if (ids.length > 0) {
+			query.andWhere(`workflows.id in (:...ids)`, { ids });
+		}
+
+		if (skipIds.length > 0) {
+			query.andWhere(`workflows.id not in (:...skipIds)`, { skipIds });
+		}
+
+		allWorkflows = await query.getMany() as IWorkflowDb[];
+
+		if (ExecuteBatch.debug === true) {
+			process.stdout.write(`Found ${allWorkflows.length} workflows to execute.\n`);
+		}
+
+		// Wait till the n8n-packages have been read
+		await loadNodesAndCredentialsPromise;
+
+		// Load the credentials overwrites if any exist
+		await CredentialsOverwrites().init();
+
+		// Load all external hooks
+		const externalHooks = ExternalHooks();
+		await externalHooks.init();
+
+		// Add the found types to an instance other parts of the application can use
+		const nodeTypes = NodeTypes();
+		await nodeTypes.init(loadNodesAndCredentials.nodeTypes);
+		const credentialTypes = CredentialTypes();
+		await credentialTypes.init(loadNodesAndCredentials.credentialTypes);
+
+		// Send a shallow copy of allWorkflows so we still have all workflow data.
+		const results = await this.runTests([...allWorkflows]);
+
+		let { retries } = flags;
+
+		while (retries > 0 && (results.summary.warningExecutions + results.summary.failedExecutions > 0) && ExecuteBatch.cancelled === false) {
+			const failedWorkflowIds = results.summary.errors.map(execution => execution.workflowId);
+			failedWorkflowIds.push(...results.summary.warnings.map(execution => execution.workflowId));
+
+			const newWorkflowList = allWorkflows.filter(workflow => failedWorkflowIds.includes(workflow.id));
+
+			const retryResults = await this.runTests(newWorkflowList);
+
+			this.mergeResults(results, retryResults);
+			// By now, `results` has been updated with the new successful executions.
+			retries--;
+		}
+
+		if (flags.output !== undefined) {
+			fs.writeFileSync(flags.output, this.formatJsonOutput(results));
+			console.log('\nExecution finished.');
+			console.log('Summary:');
+			console.log(`\tSuccess: ${results.summary.successfulExecutions}`);
+			console.log(`\tFailures: ${results.summary.failedExecutions}`);
+			console.log(`\tWarnings: ${results.summary.warningExecutions}`);
+			console.log('\nNodes successfully tested:');
+			Object.entries(results.coveredNodes).forEach(([nodeName, nodeCount]) => {
+				console.log(`\t${nodeName}: ${nodeCount}`);
+			});
+			console.log('\nCheck the JSON file for more details.');
+		} else {
+			if (flags.shortOutput === true) {
+				console.log(this.formatJsonOutput({ ...results, executions: results.executions.filter(execution => execution.executionStatus !== 'success') }));
+			} else {
+				console.log(this.formatJsonOutput(results));
+			}
+		}
+
+		await ExecuteBatch.stopProcess(true);
+
+		if (results.summary.failedExecutions > 0) {
+			this.exit(1);
+		}
+		this.exit(0);
+
+	}
+
+	mergeResults(results: IResult, retryResults: IResult) {
+
+		if (retryResults.summary.successfulExecutions === 0) {
+			// Nothing to replace.
+			return;
+		}
+
+		// Find successful executions and replace them on previous result.
+		retryResults.executions.forEach(newExecution => {
+			if (newExecution.executionStatus === 'success') {
+				// Remove previous execution from list.
+				results.executions = results.executions.filter(previousExecutions => previousExecutions.workflowId !== newExecution.workflowId);
+
+				const errorIndex = results.summary.errors.findIndex(summaryInformation => summaryInformation.workflowId === newExecution.workflowId);
+				if (errorIndex !== -1) {
+					// This workflow errored previously. Decrement error count.
+					results.summary.failedExecutions--;
+					// Remove from the list of errors.
+					results.summary.errors.splice(errorIndex, 1);
+				}
+
+				const warningIndex = results.summary.warnings.findIndex(summaryInformation => summaryInformation.workflowId === newExecution.workflowId);
+				if (warningIndex !== -1) {
+					// This workflow errored previously. Decrement error count.
+					results.summary.warningExecutions--;
+					// Remove from the list of errors.
+					results.summary.warnings.splice(warningIndex, 1);
+				}
+				// Increment successful executions count and push it to all executions array.
+				results.summary.successfulExecutions++;
+				results.executions.push(newExecution);
+			}
+		});
+	}
+
+	async runTests(allWorkflows: IWorkflowDb[]): Promise<IResult> {
+		const result: IResult = {
+			totalWorkflows: allWorkflows.length,
+			summary: {
+				failedExecutions: 0,
+				warningExecutions: 0,
+				successfulExecutions: 0,
+				errors: [],
+				warnings: [],
+			},
+			coveredNodes: {},
+			executions: [],
+		};
+
+		if (ExecuteBatch.debug) {
+			this.initializeLogs();
+		}
+
+		return new Promise(async (res) => {
+			const promisesArray = [];
+			for (let i = 0; i < ExecuteBatch.concurrency; i++) {
+				const promise = new Promise(async (resolve) => {
+					let workflow: IWorkflowDb | undefined;
+					while (allWorkflows.length > 0) {
+						workflow = allWorkflows.shift();
+						if (ExecuteBatch.cancelled === true) {
+							process.stdout.write(`Thread ${i + 1} resolving and quitting.`);
+							resolve(true);
+							break;
+						}
+						// This if shouldn't be really needed
+						// but it's a concurrency precaution.
+						if (workflow === undefined) {
+							resolve(true);
+							return;
+						}
+
+						if (ExecuteBatch.debug) {
+							ExecuteBatch.workflowExecutionsProgress[i].push({
+								workflowId: workflow.id,
+								status: 'running',
+							});
+							this.updateStatus();
+						}
+
+						await this.startThread(workflow).then((executionResult) => {
+							if (ExecuteBatch.debug) {
+								ExecuteBatch.workflowExecutionsProgress[i].pop();
+							}
+							result.executions.push(executionResult);
+							if (executionResult.executionStatus === 'success') {
+								if (ExecuteBatch.debug) {
+									ExecuteBatch.workflowExecutionsProgress[i].push({
+										workflowId: workflow!.id,
+										status: 'success',
+									});
+									this.updateStatus();
+								}
+								result.summary.successfulExecutions++;
+								const nodeNames = Object.keys(executionResult.coveredNodes);
+
+								nodeNames.map(nodeName => {
+									if (result.coveredNodes[nodeName] === undefined) {
+										result.coveredNodes[nodeName] = 0;
+									}
+									result.coveredNodes[nodeName] += executionResult.coveredNodes[nodeName];
+								});
+							} else if (executionResult.executionStatus === 'warning') {
+								result.summary.warningExecutions++;
+								result.summary.warnings.push({
+									workflowId: executionResult.workflowId,
+									error: executionResult.error!,
+								});
+								if (ExecuteBatch.debug) {
+									ExecuteBatch.workflowExecutionsProgress[i].push({
+										workflowId: workflow!.id,
+										status: 'warning',
+									});
+									this.updateStatus();
+								}
+							} else if (executionResult.executionStatus === 'error') {
+								result.summary.failedExecutions++;
+								result.summary.errors.push({
+									workflowId: executionResult.workflowId,
+									error: executionResult.error!,
+								});
+								if (ExecuteBatch.debug) {
+									ExecuteBatch.workflowExecutionsProgress[i].push({
+										workflowId: workflow!.id,
+										status: 'error',
+									});
+									this.updateStatus();
+								}
+							} else {
+								throw new Error('Wrong execution status - cannot proceed');
+							}
+						});
+					}
+
+					resolve(true);
+				});
+
+				promisesArray.push(promise);
+			}
+
+			await Promise.allSettled(promisesArray);
+
+			res(result);
+		});
+	}
+
+	updateStatus() {
+
+		if (ExecuteBatch.cancelled === true) {
+			return;
+		}
+
+		if (process.stdout.isTTY === true) {
+			process.stdout.moveCursor(0, - (ExecuteBatch.concurrency));
+			process.stdout.cursorTo(0);
+			process.stdout.clearLine(0);
+		}
+
+
+		ExecuteBatch.workflowExecutionsProgress.map((concurrentThread, index) => {
+			let message = `${index + 1}: `;
+			concurrentThread.map((executionItem, workflowIndex) => {
+				let openColor = '\x1b[0m';
+				const closeColor = '\x1b[0m';
+				switch (executionItem.status) {
+					case 'success':
+						openColor = '\x1b[32m';
+						break;
+					case 'error':
+						openColor = '\x1b[31m';
+						break;
+					case 'warning':
+						openColor = '\x1b[33m';
+						break;
+					default:
+						break;
+				}
+				message += (workflowIndex > 0 ? ', ' : '') + `${openColor}${executionItem.workflowId}${closeColor}`;
+			});
+			if (process.stdout.isTTY === true) {
+				process.stdout.cursorTo(0);
+				process.stdout.clearLine(0);
+			}
+			process.stdout.write(message + '\n');
+		});
+	}
+
+	initializeLogs() {
+		process.stdout.write('**********************************************\n');
+		process.stdout.write('              n8n test workflows\n');
+		process.stdout.write('**********************************************\n');
+		process.stdout.write('\n');
+		process.stdout.write('Batch number:\n');
+		ExecuteBatch.workflowExecutionsProgress = [];
+		for (let i = 0; i < ExecuteBatch.concurrency; i++) {
+			ExecuteBatch.workflowExecutionsProgress.push([]);
+			process.stdout.write(`${i + 1}: \n`);
+		}
+	}
+
+	startThread(workflowData: IWorkflowDb): Promise<IExecutionResult> {
+		// This will be the object returned by the promise.
+		// It will be updated according to execution progress below.
+		const executionResult: IExecutionResult = {
+			workflowId: workflowData.id,
+			workflowName: workflowData.name,
+			executionTime: 0,
+			finished: false,
+			executionStatus: 'running',
+			coveredNodes: {},
+		};
+
+
+
+		const requiredNodeTypes = ['n8n-nodes-base.start'];
+		let startNode: INode | undefined = undefined;
+		for (const node of workflowData.nodes) {
+			if (requiredNodeTypes.includes(node.type)) {
+				startNode = node;
+				break;
+			}
+		}
+
+		// We have a cool feature here.
+		// On each node, on the Settings tab in the node editor you can change
+		// the `Notes` field to add special cases for comparison and snapshots.
+		// You need to set one configuration per line with the following possible keys:
+		// CAP_RESULTS_LENGTH=x where x is a number. Cap the number of rows from this node to x.
+		// This means if you set CAP_RESULTS_LENGTH=1 we will have only 1 row in the output
+		// IGNORED_PROPERTIES=x,y,z where x, y and z are JSON property names. Removes these
+		//    properties from the JSON object (useful for optional properties that can
+		//    cause the comparison to detect changes when not true).
+		const nodeEdgeCases = {} as INodeSpecialCases;
+		workflowData.nodes.forEach(node => {
+			executionResult.coveredNodes[node.type] = (executionResult.coveredNodes[node.type] || 0) + 1;
+			if (node.notes !== undefined && node.notes !== '') {
+				node.notes.split('\n').forEach(note => {
+					const parts = note.split('=');
+					if (parts.length === 2) {
+						if (nodeEdgeCases[node.name] === undefined) {
+							nodeEdgeCases[node.name] = {} as INodeSpecialCase;
+						}
+						if (parts[0] === 'CAP_RESULTS_LENGTH') {
+							nodeEdgeCases[node.name].capResults = parseInt(parts[1], 10);
+						} else if (parts[0] === 'IGNORED_PROPERTIES') {
+							nodeEdgeCases[node.name].ignoredProperties = parts[1].split(',').map(property => property.trim());
+						}
+					}
+				});
+			}
+		});
+
+		return new Promise(async (resolve) => {
+			if (startNode === undefined) {
+				// If the workflow does not contain a start-node we can not know what
+				// should be executed and with which data to start.
+				executionResult.error = 'Workflow cannot be started as it does not contain a "Start" node.';
+				executionResult.executionStatus = 'warning';
+				resolve(executionResult);
+			}
+
+			let gotCancel = false;
+
+			// Timeouts execution after 5 minutes.
+			const timeoutTimer = setTimeout(() => {
+				gotCancel = true;
+				executionResult.error = 'Workflow execution timed out.';
+				executionResult.executionStatus = 'warning';
+				resolve(executionResult);
+			}, ExecuteBatch.executionTimeout);
+
+
+			try {
+				const credentials = await WorkflowCredentials(workflowData!.nodes);
+
+				const runData: IWorkflowExecutionDataProcess = {
+					credentials,
+					executionMode: 'cli',
+					startNodes: [startNode!.name],
+					workflowData: workflowData!,
+				};
+
+				const workflowRunner = new WorkflowRunner();
+				const executionId = await workflowRunner.run(runData);
+
+				const activeExecutions = ActiveExecutions.getInstance();
+				const data = await activeExecutions.getPostExecutePromise(executionId);
+				if (gotCancel || ExecuteBatch.cancelled === true) {
+					clearTimeout(timeoutTimer);
+					// The promise was settled already so we simply ignore.
+					return;
+				}
+
+				if (data === undefined) {
+					executionResult.error = 'Workflow did not return any data.';
+					executionResult.executionStatus = 'error';
+				} else {
+					executionResult.executionTime = (Date.parse(data.stoppedAt as unknown as string) - Date.parse(data.startedAt as unknown as string)) / 1000;
+					executionResult.finished = (data?.finished !== undefined) as boolean;
+
+					if (data.data.resultData.error) {
+						executionResult.error =
+							data.data.resultData.error.hasOwnProperty('description') ?
+								// @ts-ignore
+								data.data.resultData.error.description : data.data.resultData.error.message;
+						if (data.data.resultData.lastNodeExecuted !== undefined) {
+							executionResult.error += ` on node ${data.data.resultData.lastNodeExecuted}`;
+						}
+						executionResult.executionStatus = 'error';
+
+						if (this.shouldBeConsideredAsWarning(executionResult.error || '')) {
+							executionResult.executionStatus = 'warning';
+						}
+					} else {
+						if (ExecuteBatch.shallow === true) {
+							// What this does is guarantee that top-level attributes
+							// from the JSON are kept and the are the same type.
+
+							// We convert nested JSON objects to a simple {object:true}
+							// and we convert nested arrays to ['json array']
+
+							// This reduces the chance of false positives but may
+							// result in not detecting deeper changes.
+							Object.keys(data.data.resultData.runData).map((nodeName: string) => {
+								data.data.resultData.runData[nodeName].map((taskData: ITaskData) => {
+									if (taskData.data === undefined) {
+										return;
+									}
+									Object.keys(taskData.data).map(connectionName => {
+										const connection = taskData.data![connectionName] as Array<INodeExecutionData[] | null>;
+										connection.map(executionDataArray => {
+											if (executionDataArray === null) {
+												return;
+											}
+
+											if (nodeEdgeCases[nodeName] !== undefined && nodeEdgeCases[nodeName].capResults !== undefined) {
+												executionDataArray.splice(nodeEdgeCases[nodeName].capResults!);
+											}
+
+											executionDataArray.map(executionData => {
+												if (executionData.json === undefined) {
+													return;
+												}
+												if (nodeEdgeCases[nodeName] !== undefined && nodeEdgeCases[nodeName].ignoredProperties !== undefined) {
+													nodeEdgeCases[nodeName].ignoredProperties!.forEach(ignoredProperty => delete executionData.json[ignoredProperty]);
+												}
+
+												const jsonProperties = executionData.json;
+
+												const nodeOutputAttributes = Object.keys(jsonProperties);
+												nodeOutputAttributes.map(attributeName => {
+													if (Array.isArray(jsonProperties[attributeName])) {
+														jsonProperties[attributeName] = ['json array'];
+													} else if (typeof jsonProperties[attributeName] === 'object') {
+														jsonProperties[attributeName] = { object: true };
+													}
+												});
+											});
+										});
+
+									});
+								});
+							});
+						} else {
+							// If not using shallow comparison then we only treat nodeEdgeCases.
+							const specialCases = Object.keys(nodeEdgeCases);
+
+							specialCases.forEach(nodeName => {
+								data.data.resultData.runData[nodeName].map((taskData: ITaskData) => {
+									if (taskData.data === undefined) {
+										return;
+									}
+									Object.keys(taskData.data).map(connectionName => {
+										const connection = taskData.data![connectionName] as Array<INodeExecutionData[] | null>;
+										connection.map(executionDataArray => {
+											if (executionDataArray === null) {
+												return;
+											}
+
+											if (nodeEdgeCases[nodeName].capResults !== undefined) {
+												executionDataArray.splice(nodeEdgeCases[nodeName].capResults!);
+											}
+
+											if (nodeEdgeCases[nodeName].ignoredProperties !== undefined) {
+												executionDataArray.map(executionData => {
+													if (executionData.json === undefined) {
+														return;
+													}
+													nodeEdgeCases[nodeName].ignoredProperties!.forEach(ignoredProperty => delete executionData.json[ignoredProperty]);
+												});
+											}
+										});
+
+									});
+								});
+							});
+						}
+
+						const serializedData = this.formatJsonOutput(data);
+						if (ExecuteBatch.compare === undefined) {
+							executionResult.executionStatus = 'success';
+						} else {
+							const fileName = (ExecuteBatch.compare.endsWith(sep) ? ExecuteBatch.compare : ExecuteBatch.compare + sep) + `${workflowData.id}-snapshot.json`;
+							if (fs.existsSync(fileName) === true) {
+
+								const contents = fs.readFileSync(fileName, { encoding: 'utf-8' });
+
+								const changes = diff(JSON.parse(contents), data, { keysOnly: true });
+
+								if (changes !== undefined) {
+									// we have structural changes. Report them.
+									executionResult.error = `Workflow may contain breaking changes`;
+									executionResult.changes = changes;
+									executionResult.executionStatus = 'error';
+								} else {
+									executionResult.executionStatus = 'success';
+								}
+							} else {
+								executionResult.error = 'Snapshot for not found.';
+								executionResult.executionStatus = 'warning';
+							}
+						}
+						// Save snapshots only after comparing - this is to make sure we're updating
+						// After comparing to existing verion.
+						if (ExecuteBatch.snapshot !== undefined) {
+							const fileName = (ExecuteBatch.snapshot.endsWith(sep) ? ExecuteBatch.snapshot : ExecuteBatch.snapshot + sep) + `${workflowData.id}-snapshot.json`;
+							fs.writeFileSync(fileName, serializedData);
+						}
+					}
+				}
+			} catch (e) {
+				executionResult.error = 'Workflow failed to execute.';
+				executionResult.executionStatus = 'error';
+			}
+			clearTimeout(timeoutTimer);
+			resolve(executionResult);
+		});
+	}
+
+}
diff --git a/packages/cli/commands/import/credentials.ts b/packages/cli/commands/import/credentials.ts
index b038f33693e..af2d7e0d46d 100644
--- a/packages/cli/commands/import/credentials.ts
+++ b/packages/cli/commands/import/credentials.ts
@@ -65,6 +65,9 @@ export class ImportCredentialsCommand extends Command {
 
 		try {
 			await Db.init();
+
+			// Make sure the settings exist
+			await UserSettings.prepareUserSettings();
 			let i;
 
 			const encryptionKey = await UserSettings.getEncryptionKey();
diff --git a/packages/cli/commands/import/workflow.ts b/packages/cli/commands/import/workflow.ts
index 5b31041a44d..65ddb770009 100644
--- a/packages/cli/commands/import/workflow.ts
+++ b/packages/cli/commands/import/workflow.ts
@@ -18,6 +18,9 @@ import {
 import * as fs from 'fs';
 import * as glob from 'glob-promise';
 import * as path from 'path';
+import { 
+	UserSettings,
+} from 'n8n-core';
 
 export class ImportWorkflowsCommand extends Command {
 	static description = 'Import workflows';
@@ -60,6 +63,9 @@ export class ImportWorkflowsCommand extends Command {
 
 		try {
 			await Db.init();
+
+			// Make sure the settings exist
+			await UserSettings.prepareUserSettings();
 			let i;
 			if (flags.separate) {
 				const files = await glob((flags.input.endsWith(path.sep) ? flags.input : flags.input + path.sep) + '*.json');
diff --git a/packages/cli/commands/list/workflow.ts b/packages/cli/commands/list/workflow.ts
new file mode 100644
index 00000000000..6fdca2e2533
--- /dev/null
+++ b/packages/cli/commands/list/workflow.ts
@@ -0,0 +1,67 @@
+import {
+	Command,
+	flags,
+} from '@oclif/command';
+
+import {
+	IDataObject
+} from 'n8n-workflow';
+
+import {
+	Db,
+} from "../../src";
+
+
+export class ListWorkflowCommand extends Command {
+	static description = '\nList workflows';
+
+	static examples = [
+		'$ n8n list:workflow',
+		'$ n8n list:workflow --active=true --onlyId',
+		'$ n8n list:workflow --active=false',
+	];
+
+	static flags = {
+		help: flags.help({ char: 'h' }),
+		active: flags.string({
+			description: 'Filters workflows by active status. Can be true or false',
+		}),
+		onlyId: flags.boolean({
+			description: 'Outputs workflow IDs only, one per line.',
+		}),
+	};
+
+	async run() {
+		const { flags } = this.parse(ListWorkflowCommand);
+
+		if (flags.active !== undefined && !['true', 'false'].includes(flags.active)) {
+			this.error('The --active flag has to be passed using true or false');
+		}
+
+		try {
+			await Db.init();
+
+			const findQuery: IDataObject = {};
+			if (flags.active !== undefined) {
+				findQuery.active = flags.active === 'true';
+			}
+
+			const workflows = await Db.collections.Workflow!.find(findQuery);
+			if (flags.onlyId) {
+				workflows.forEach(workflow => console.log(workflow.id));
+			} else {
+				workflows.forEach(workflow => console.log(workflow.id + "|" + workflow.name));
+			}
+
+
+		} catch (e) {
+			console.error('\nGOT ERROR');
+			console.log('====================================');
+			console.error(e.message);
+			console.error(e.stack);
+			this.exit(1);
+		}
+
+		this.exit();
+	}
+}
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ca4a198df18..4d866ec7293 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.126.1",
+  "version": "0.127.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -82,6 +82,7 @@
   "dependencies": {
     "@oclif/command": "^1.5.18",
     "@oclif/errors": "^1.2.2",
+    "@types/json-diff": "^0.5.1",
     "@types/jsonwebtoken": "^8.5.2",
     "basic-auth": "^2.0.1",
     "bcryptjs": "^2.4.3",
@@ -101,15 +102,16 @@
     "glob-promise": "^3.4.0",
     "google-timezones-json": "^1.0.2",
     "inquirer": "^7.0.1",
+    "json-diff": "^0.5.4",
     "jsonwebtoken": "^8.5.1",
     "jwks-rsa": "~1.12.1",
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.75.0",
-    "n8n-editor-ui": "~0.96.1",
-    "n8n-nodes-base": "~0.123.1",
-    "n8n-workflow": "~0.62.0",
+    "n8n-core": "~0.76.0",
+    "n8n-editor-ui": "~0.97.0",
+    "n8n-nodes-base": "~0.124.0",
+    "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
     "pg": "^8.3.0",
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index df965c50e74..e1c09cf55e0 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -188,6 +188,7 @@ export interface IExecutionsListResponse {
 	count: number;
 	// results: IExecutionShortResponse[];
 	results: IExecutionsSummary[];
+	estimated: boolean;
 }
 
 export interface IExecutionsStopData {
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 0a31144999d..ee2f50f2cfc 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -33,6 +33,7 @@ import {
 	CredentialsHelper,
 	CredentialsOverwrites,
 	CredentialTypes,
+	DatabaseType,
 	Db,
 	ExternalHooks,
 	GenericHelpers,
@@ -88,6 +89,7 @@ import {
 	IRunData,
 	IWorkflowBase,
 	IWorkflowCredentials,
+	LoggerProxy,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
@@ -1612,8 +1614,7 @@ class App {
 			executingWorkflowIds.push(...this.activeExecutionsInstance.getActiveExecutions().map(execution => execution.id.toString()) as string[]);
 
 			const countFilter = JSON.parse(JSON.stringify(filter));
-			countFilter.select = ['id'];
-			countFilter.where = {id: Not(In(executingWorkflowIds))};
+			countFilter.id = Not(In(executingWorkflowIds));
 
 			const resultsQuery = await Db.collections.Execution!
 				.createQueryBuilder("execution")
@@ -1645,10 +1646,10 @@ class App {
 
 			const resultsPromise = resultsQuery.getMany();
 
-			const countPromise = Db.collections.Execution!.count(countFilter);
+			const countPromise = getExecutionsCount(countFilter);
 
 			const results: IExecutionFlattedDb[] = await resultsPromise;
-			const count = await countPromise;
+			const countedObjects = await countPromise;
 
 			const returnResults: IExecutionsSummary[] = [];
 
@@ -1667,8 +1668,9 @@ class App {
 			}
 
 			return {
-				count,
+				count: countedObjects.count,
 				results: returnResults,
+				estimated: countedObjects.estimate,
 			};
 		}));
 
@@ -2161,3 +2163,35 @@ export async function start(): Promise<void> {
 		await app.externalHooks.run('n8n.ready', [app]);
 	});
 }
+
+async function getExecutionsCount(countFilter: IDataObject): Promise<{ count: number; estimate: boolean; }> {
+
+	const dbType = await GenericHelpers.getConfigValue('database.type') as DatabaseType;
+	const filteredFields = Object.keys(countFilter).filter(field => field !== 'id');
+
+	// Do regular count for other databases than pgsql and
+	// if we are filtering based on workflowId or finished fields.
+	if (dbType !== 'postgresdb' || filteredFields.length > 0) {
+		const count = await Db.collections.Execution!.count(countFilter);
+		return { count, estimate: false };
+	}
+
+	try {
+		// Get an estimate of rows count.
+		const estimateRowsNumberSql = "SELECT n_live_tup FROM pg_stat_all_tables WHERE relname = 'execution_entity';";
+		const rows: Array<{ n_live_tup: string }> = await Db.collections.Execution!.query(estimateRowsNumberSql);
+
+		const estimate = parseInt(rows[0].n_live_tup, 10);
+		// If over 100k, return just an estimate.
+		if (estimate > 100000) {
+			// if less than 100k, we get the real count as even a full
+			// table scan should not take so long.
+			return { count: estimate, estimate: true };
+		}
+	} catch (err) {
+		LoggerProxy.warn('Unable to get executions count from postgres: ' + err);
+	}
+
+	const count = await Db.collections.Execution!.count(countFilter);
+	return { count, estimate: false };
+}
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 4aaf4747fc6..aa44bc610f2 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -1,7 +1,8 @@
 {
 	"compilerOptions": {
 		"lib": [
-			"es2017"
+			"es2017",
+			"ES2020.Promise"
 		],
 		"types": [
 			"node",
diff --git a/packages/core/package.json b/packages/core/package.json
index 71871514bfd..5151bfbb5ba 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.75.0",
+  "version": "0.76.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -47,7 +47,7 @@
     "file-type": "^14.6.2",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.62.0",
+    "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "request": "^2.88.2",
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 26fbc7c7731..b987c32da0f 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.96.1",
+  "version": "0.97.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -69,7 +69,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "n8n-workflow": "~0.62.0",
+    "n8n-workflow": "~0.63.0",
     "node-sass": "^4.12.0",
     "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 5acbaae9989..3a0790cf48e 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -325,6 +325,7 @@ export interface IExecutionShortResponse {
 export interface IExecutionsListResponse {
 	count: number;
 	results: IExecutionsSummary[];
+	estimated: boolean;
 }
 
 export interface IExecutionsCurrentSummaryExtended {
diff --git a/packages/editor-ui/src/components/BinaryDataDisplay.vue b/packages/editor-ui/src/components/BinaryDataDisplay.vue
index c6ab2aa7485..3a737c1f0fd 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplay.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplay.vue
@@ -14,6 +14,10 @@
 			<div v-if="!binaryData">
 				Data to display did not get found
 			</div>
+			<video v-else-if="binaryData.mimeType && binaryData.mimeType.startsWith('video/')" controls autoplay>
+				<source :src="'data:' + binaryData.mimeType + ';base64,' + binaryData.data" :type="binaryData.mimeType">
+				Your browser does not support the video element. Kindly update it to latest version.
+			</video>
 			<embed v-else :src="'data:' + binaryData.mimeType + ';base64,' + binaryData.data" class="binary-data" :class="embedClass"/>
 		</div>
 
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index e0e129a7374..1ecfc4caf84 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -1,6 +1,6 @@
 <template>
 	<span>
-		<el-dialog :visible="dialogVisible" append-to-body width="80%" :title="`Workflow Executions (${combinedExecutions.length}/${combinedExecutionsCount})`" :before-close="closeDialog">
+		<el-dialog :visible="dialogVisible" append-to-body width="80%" :title="`Workflow Executions ${combinedExecutions.length}/${finishedExecutionsCountEstimated === true ? '~' : ''}${combinedExecutionsCount}`" :before-close="closeDialog">
 			<div class="filters">
 				<el-row>
 					<el-col :span="4" class="filter-headline">
@@ -38,7 +38,7 @@
 
 			<div class="selection-options">
 				<span v-if="checkAll === true || isIndeterminate === true">
-					Selected: {{numSelected}}/{{finishedExecutionsCount}}
+					Selected: {{numSelected}} / <span v-if="finishedExecutionsCountEstimated === true">~</span>{{finishedExecutionsCount}}
 					<el-button type="danger" title="Delete Selected" icon="el-icon-delete" size="mini" @click="handleDeleteSelected" circle></el-button>
 				</span>
 			</div>
@@ -142,7 +142,7 @@
 				</el-table-column>
 			</el-table>
 
-			<div class="load-more" v-if="finishedExecutionsCount > finishedExecutions.length">
+			<div class="load-more" v-if="finishedExecutionsCount > finishedExecutions.length || finishedExecutionsCountEstimated === true">
 				<el-button title="Load More" @click="loadMore()" size="small" :disabled="isDataLoading">
 					<font-awesome-icon icon="sync" /> Load More
 				</el-button>
@@ -200,6 +200,7 @@ export default mixins(
 		return {
 			finishedExecutions: [] as IExecutionsSummary[],
 			finishedExecutionsCount: 0,
+			finishedExecutionsCountEstimated: false,
 
 			checkAll: false,
 			autoRefresh: true,
@@ -256,7 +257,7 @@ export default mixins(
 			return returnData;
 		},
 		combinedExecutionsCount (): number {
-			return this.activeExecutions.length + this.finishedExecutionsCount;
+			return 0 + this.activeExecutions.length + this.finishedExecutionsCount;
 		},
 		numSelected (): number {
 			if (this.checkAll === true) {
@@ -489,16 +490,19 @@ export default mixins(
 			}
 			this.finishedExecutions = this.finishedExecutions.filter(execution => !gaps.includes(parseInt(execution.id, 10)) && lastId >= parseInt(execution.id, 10));
 			this.finishedExecutionsCount = results[0].count;
+			this.finishedExecutionsCountEstimated = results[0].estimated;
 		},
 		async loadFinishedExecutions (): Promise<void> {
 			if (this.filter.status === 'running') {
 				this.finishedExecutions = [];
 				this.finishedExecutionsCount = 0;
+				this.finishedExecutionsCountEstimated = false;
 				return;
 			}
 			const data = await this.restApi().getPastExecutions(this.workflowFilterPast, this.requestItemsPerRequest);
 			this.finishedExecutions = data.results;
 			this.finishedExecutionsCount = data.count;
+			this.finishedExecutionsCountEstimated = data.estimated;
 		},
 		async loadMore () {
 			if (this.filter.status === 'running') {
@@ -526,6 +530,7 @@ export default mixins(
 
 			this.finishedExecutions.push.apply(this.finishedExecutions, data.results);
 			this.finishedExecutionsCount = data.count;
+			this.finishedExecutionsCountEstimated = data.estimated;
 
 			this.isDataLoading = false;
 		},
diff --git a/packages/editor-ui/src/components/WorkflowOpen.vue b/packages/editor-ui/src/components/WorkflowOpen.vue
index 568b35a5745..77e9e8a640f 100644
--- a/packages/editor-ui/src/components/WorkflowOpen.vue
+++ b/packages/editor-ui/src/components/WorkflowOpen.vue
@@ -32,7 +32,7 @@
 						<template slot-scope="scope">
 							<div :key="scope.row.id">
 								<span class="name">{{scope.row.name}}</span>
-								<TagsContainer class="hidden-sm-and-down" :tagIds="getIds(scope.row.tags)" :limit="3" />
+								<TagsContainer class="hidden-sm-and-down" :tagIds="getIds(scope.row.tags)" :limit="3" @click="onTagClick" :clickable="true" :hoverable="true" />
 							</div>
 						</template>
 					</el-table-column>
@@ -124,6 +124,11 @@ export default mixins(
 		updateTagsFilter(tags: string[]) {
 			this.filterTagIds = tags;
 		},
+		onTagClick(tagId: string) {
+			if (tagId !== 'count' && !this.filterTagIds.includes(tagId)) {
+				this.filterTagIds.push(tagId);
+			}
+		},
 		async openWorkflow (data: IWorkflowShortResponse, column: any) { // tslint:disable-line:no-any
 			if (column.label !== 'Active') {
 
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 594fe741335..e6d7bceaa94 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.75.0",
-    "n8n-workflow": "~0.62.0",
+    "n8n-core": "~0.76.0",
+    "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",
diff --git a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
index 7d0693ca72f..2b09904e18e 100644
--- a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
@@ -57,5 +57,12 @@ export class MicrosoftSql implements ICredentialType {
 			default: 15000,
 			description: 'Connection timeout in ms.',
 		},
+		{
+			displayName: 'Request Timeout',
+			name: 'requestTimeout',
+			type: 'number',
+			default: 15000,
+			description: ' Request timeout in ms.',
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 36c2846618c..6f9c8fe5062 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -390,7 +390,7 @@ export class Airtable implements INodeType {
 			},
 
 			// ----------------------------------
-			//         append + update
+			//         append + delete + update
 			// ----------------------------------
 			{
 				displayName: 'Options',
@@ -401,12 +401,24 @@ export class Airtable implements INodeType {
 					show: {
 						operation: [
 							'append',
+							'delete',
 							'update',
 						],
 					},
 				},
 				default: {},
 				options: [
+					{
+						displayName: 'Bulk Size',
+						name: 'bulkSize',
+						type: 'number',
+						typeOptions: {
+							minValue: 1,
+							maxValue: 10,
+						},
+						default: 10,
+						description: `Number of records to process at once.`,
+					},
 					{
 						displayName: 'Ignore Fields',
 						name: 'ignoreFields',
@@ -428,6 +440,14 @@ export class Airtable implements INodeType {
 						displayName: 'Typecast',
 						name: 'typecast',
 						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'append',
+									'update',
+								],
+							},
+						},
 						default: false,
 						description: 'If the Airtable API should attempt mapping of string values for linked records & select options.',
 					},
@@ -465,54 +485,81 @@ export class Airtable implements INodeType {
 			let fields: string[];
 			let options: IDataObject;
 
+			const rows: IDataObject[] = [];
+			let bulkSize = 10;
+
 			for (let i = 0; i < items.length; i++) {
 				addAllFields = this.getNodeParameter('addAllFields', i) as boolean;
 				options = this.getNodeParameter('options', i, {}) as IDataObject;
+				bulkSize = options.bulkSize as number || bulkSize;
+
+				const row: IDataObject = {};
 
 				if (addAllFields === true) {
 					// Add all the fields the item has
-					body.fields = items[i].json;
+					row.fields = { ...items[i].json };
+					// tslint:disable-next-line: no-any
+					delete (row.fields! as any).id;
 				} else {
 					// Add only the specified fields
-					body.fields = {} as IDataObject;
+					row.fields = {} as IDataObject;
 
 					fields = this.getNodeParameter('fields', i, []) as string[];
 
 					for (const fieldName of fields) {
 						// @ts-ignore
-						body.fields[fieldName] = items[i].json[fieldName];
+						row.fields[fieldName] = items[i].json[fieldName];
 					}
 				}
 
-				if (options.typecast === true) {
-					body['typecast'] = true;
+				rows.push(row);
+
+				if (rows.length === bulkSize || i === items.length - 1) {
+					if (options.typecast === true) {
+						body['typecast'] = true;
+					}
+
+					body['records'] = rows;
+
+					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+					returnData.push(...responseData.records);
+					// empty rows
+					rows.length = 0;
 				}
-
-				responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-
-				returnData.push(responseData);
 			}
 
 		} else if (operation === 'delete') {
 			requestMethod = 'DELETE';
 
-			let id: string;
+			const rows: string[] = [];
+			const options = this.getNodeParameter('options', 0, {}) as IDataObject;
+			const bulkSize = options.bulkSize as number || 10;
+
 			for (let i = 0; i < items.length; i++) {
+				let id: string;
+
 				id = this.getNodeParameter('id', i) as string;
 
-				endpoint = `${application}/${table}`;
+				rows.push(id);
 
-				// Make one request after another. This is slower but makes
-				// sure that we do not run into the rate limit they have in
-				// place and so block for 30 seconds. Later some global
-				// functionality in core should make it easy to make requests
-				// according to specific rules like not more than 5 requests
-				// per seconds.
-				qs.records = [id];
+				if (rows.length === bulkSize || i === items.length - 1) {
+					endpoint = `${application}/${table}`;
 
-				responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+					// Make one request after another. This is slower but makes
+					// sure that we do not run into the rate limit they have in
+					// place and so block for 30 seconds. Later some global
+					// functionality in core should make it easy to make requests
+					// according to specific rules like not more than 5 requests
+					// per seconds.
+					qs.records = rows;
 
-				returnData.push(...responseData.records);
+					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+					returnData.push(...responseData.records);
+					// empty rows
+					rows.length = 0;
+				}
 			}
 
 		} else if (operation === 'list') {
@@ -585,55 +632,69 @@ export class Airtable implements INodeType {
 
 			requestMethod = 'PATCH';
 
-			let id: string;
 			let updateAllFields: boolean;
 			let fields: string[];
 			let options: IDataObject;
+
+			const rows: IDataObject[] = [];
+			let bulkSize = 10;
+
 			for (let i = 0; i < items.length; i++) {
 				updateAllFields = this.getNodeParameter('updateAllFields', i) as boolean;
 				options = this.getNodeParameter('options', i, {}) as IDataObject;
+				bulkSize = options.bulkSize as number || bulkSize;
+
+				const row: IDataObject = {};
+				row.fields = {} as IDataObject;
 
 				if (updateAllFields === true) {
 					// Update all the fields the item has
-					body.fields = items[i].json;
+					row.fields = { ...items[i].json };
+					// remove id field
+					// tslint:disable-next-line: no-any
+					delete (row.fields! as any).id;
 
 					if (options.ignoreFields && options.ignoreFields !== '') {
 						const ignoreFields = (options.ignoreFields as string).split(',').map(field => field.trim()).filter(field => !!field);
 						if (ignoreFields.length) {
 							// From: https://stackoverflow.com/questions/17781472/how-to-get-a-subset-of-a-javascript-objects-properties
-							body.fields = Object.entries(items[i].json)
+							row.fields = Object.entries(items[i].json)
 								.filter(([key]) => !ignoreFields.includes(key))
 								.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
 						}
 					}
 				} else {
-					// Update only the specified fields
-					body.fields = {} as IDataObject;
-
 					fields = this.getNodeParameter('fields', i, []) as string[];
 
 					for (const fieldName of fields) {
 						// @ts-ignore
-						body.fields[fieldName] = items[i].json[fieldName];
+						row.fields[fieldName] = items[i].json[fieldName];
 					}
 				}
 
-				id = this.getNodeParameter('id', i) as string;
+				row.id = this.getNodeParameter('id', i) as string;
 
-				endpoint = `${application}/${table}`;
+				rows.push(row);
 
-				// Make one request after another. This is slower but makes
-				// sure that we do not run into the rate limit they have in
-				// place and so block for 30 seconds. Later some global
-				// functionality in core should make it easy to make requests
-				// according to specific rules like not more than 5 requests
-				// per seconds.
+				if (rows.length === bulkSize || i === items.length - 1) {
+					endpoint = `${application}/${table}`;
 
-				const data = { records: [{ id, fields: body.fields }], typecast: (options.typecast) ? true : false };
+					// Make one request after another. This is slower but makes
+					// sure that we do not run into the rate limit they have in
+					// place and so block for 30 seconds. Later some global
+					// functionality in core should make it easy to make requests
+					// according to specific rules like not more than 5 requests
+					// per seconds.
 
-				responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
+					const data = { records: rows, typecast: (options.typecast) ? true : false };
 
-				returnData.push(...responseData.records);
+					responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
+
+					returnData.push(...responseData.records);
+
+					// empty rows
+					rows.length = 0;
+				}
 			}
 
 		} else {
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index 75006e46c24..9d462b60b79 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -29,6 +29,10 @@ import {
 
 import * as moment from 'moment-timezone';
 
+import {
+	noCase,
+} from 'change-case';
+
 export class Box implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Box',
@@ -81,6 +85,7 @@ export class Box implements INodeType {
 		const length = items.length as unknown as number;
 		const qs: IDataObject = {};
 		let responseData;
+		const timezone = this.getTimezone();
 		const resource = this.getNodeParameter('resource', 0) as string;
 		const operation = this.getNodeParameter('operation', 0) as string;
 		for (let i = 0; i < length; i++) {
@@ -199,6 +204,51 @@ export class Box implements INodeType {
 					}
 					returnData.push.apply(returnData, responseData as IDataObject[]);
 				}
+				// https://developer.box.com/reference/post-collaborations/
+				if (operation === 'share') {
+					const fileId = this.getNodeParameter('fileId', i) as string;
+					const role = this.getNodeParameter('role', i) as string;
+					const accessibleBy = this.getNodeParameter('accessibleBy', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					// tslint:disable-next-line: no-any
+					const body: { accessible_by: IDataObject, [key: string]: any } = {
+						accessible_by: {},
+						item: {
+							id: fileId,
+							type: 'file',
+						},
+						role: (role === 'coOwner') ? 'co-owner' : noCase(role),
+						...options,
+					};
+
+					if (body.fields) {
+						qs.fields = body.fields;
+						delete body.fields;
+					}
+
+					if (body.expires_at) {
+						body.expires_at = moment.tz(body.expires_at, timezone).format();
+					}
+
+					if (body.notify) {
+						qs.notify = body.notify;
+						delete body.notify;
+					}
+
+					if (accessibleBy === 'user') {
+						const useEmail = this.getNodeParameter('useEmail', i) as boolean;
+						if (useEmail) {
+							body.accessible_by['login'] = this.getNodeParameter('email', i) as string;
+						} else {
+							body.accessible_by['id'] = this.getNodeParameter('userId', i) as string;
+						}
+					} else {
+						body.accessible_by['id'] = this.getNodeParameter('groupId', i) as string;
+					}
+
+					responseData = await boxApiRequest.call(this, 'POST', `/collaborations`, body, qs);
+					returnData.push(responseData as IDataObject);
+				}
 				// https://developer.box.com/reference/post-files-content
 				if (operation === 'upload') {
 					const parentId = this.getNodeParameter('parentId', i) as string;
@@ -356,6 +406,79 @@ export class Box implements INodeType {
 					}
 					returnData.push.apply(returnData, responseData as IDataObject[]);
 				}
+				// https://developer.box.com/reference/post-collaborations/
+				if (operation === 'share') {
+					const folderId = this.getNodeParameter('folderId', i) as string;
+					const role = this.getNodeParameter('role', i) as string;
+					const accessibleBy = this.getNodeParameter('accessibleBy', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					// tslint:disable-next-line: no-any
+					const body: { accessible_by: IDataObject, [key: string]: any } = {
+						accessible_by: {},
+						item: {
+							id: folderId,
+							type: 'folder',
+						},
+						role: (role === 'coOwner') ? 'co-owner' : noCase(role),
+						...options,
+					};
+
+					if (body.fields) {
+						qs.fields = body.fields;
+						delete body.fields;
+					}
+
+					if (body.expires_at) {
+						body.expires_at = moment.tz(body.expires_at, timezone).format();
+					}
+
+					if (body.notify) {
+						qs.notify = body.notify;
+						delete body.notify;
+					}
+
+					if (accessibleBy === 'user') {
+						const useEmail = this.getNodeParameter('useEmail', i) as boolean;
+						if (useEmail) {
+							body.accessible_by['login'] = this.getNodeParameter('email', i) as string;
+						} else {
+							body.accessible_by['id'] = this.getNodeParameter('userId', i) as string;
+						}
+					} else {
+						body.accessible_by['id'] = this.getNodeParameter('groupId', i) as string;
+					}
+
+					responseData = await boxApiRequest.call(this, 'POST', `/collaborations`, body, qs);
+					returnData.push(responseData as IDataObject);
+				}
+				//https://developer.box.com/guides/folders/single/move/
+				if (operation === 'update') {
+					const folderId = this.getNodeParameter('folderId', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					if (updateFields.fields) {
+						qs.fields = updateFields.fields;
+						delete updateFields.fields;
+					}
+
+					const body = {
+						...updateFields,
+					} as IDataObject;
+
+					if (body.parentId) {
+						body.parent = {
+							id: body.parentId,
+						};
+						delete body.parentId;
+					}
+
+					if (body.tags) {
+						body.tags = (body.tags as string).split(',');
+					}
+
+					responseData = await boxApiRequest.call(this, 'PUT', `/folders/${folderId}`, body, qs);
+					returnData.push(responseData as IDataObject);
+				}
 			}
 		}
 		if (resource === 'file' && operation === 'download') {
diff --git a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
index 534f11a9934..ffd2a4ee34c 100644
--- a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
+++ b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
@@ -21,7 +21,7 @@ export class BoxTrigger implements INodeType {
 		icon: 'file:box.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a Box events occurs.',
+		description: 'Starts the workflow when Box events occur',
 		defaults: {
 			name: 'Box Trigger',
 			color: '#00aeef',
diff --git a/packages/nodes-base/nodes/Box/FileDescription.ts b/packages/nodes-base/nodes/Box/FileDescription.ts
index 9a3ae0e2c2a..7aa5a87d72e 100644
--- a/packages/nodes-base/nodes/Box/FileDescription.ts
+++ b/packages/nodes-base/nodes/Box/FileDescription.ts
@@ -40,6 +40,11 @@ export const fileOperations = [
 				value: 'search',
 				description: 'Search files',
 			},
+			{
+				name: 'Share',
+				value: 'share',
+				description: 'Share a file',
+			},
 			{
 				name: 'Upload',
 				value: 'upload',
@@ -496,6 +501,242 @@ export const fileFields = [
 		],
 	},
 
+	/* -------------------------------------------------------------------------- */
+	/*                                 file:share                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'File ID',
+		name: 'fileId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the file to share.',
+	},
+	{
+		displayName: 'Accessible By',
+		name: 'accessibleBy',
+		type: 'options',
+		options: [
+			{
+				name: 'Group',
+				value: 'group',
+			},
+			{
+				name: 'User',
+				value: 'user',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: '',
+		description: 'The type of object the file will be shared with.',
+	},
+	{
+		displayName: 'Use Email',
+		name: 'useEmail',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+				accessibleBy: [
+					'user',
+				],
+			},
+		},
+		default: true,
+		description: 'Whether identify the user by email or ID.',
+	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+				useEmail: [
+					true,
+				],
+				accessibleBy: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: `The user's email address to share the file with.`,
+	},
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+				useEmail: [
+					false,
+				],
+				accessibleBy: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: `The user's ID to share the file with.`,
+	},
+	{
+		displayName: 'Group ID',
+		name: 'groupId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+				accessibleBy: [
+					'group',
+				],
+			},
+		},
+		default: '',
+		description: `The group's ID to share the file with.`,
+	},
+	{
+		displayName: 'Role',
+		name: 'role',
+		type: 'options',
+		options: [
+			{
+				name: 'Co-Owner',
+				value: 'coOwner',
+				description: 'A Co-owner has all of functional read/write access that an editor does',
+			},
+			{
+				name: 'Editor',
+				value: 'editor',
+				description: 'An editor has full read/write access to a folder or file',
+			},
+			{
+				name: 'Previewer',
+				value: 'previewer',
+				description: 'A previewer has limited read access',
+			},
+			{
+				name: 'Previewer Uploader',
+				value: 'previewerUploader',
+				description: 'This access level is a combination of Previewer and Uploader',
+			},
+			{
+				name: 'Uploader',
+				value: 'uploader',
+				description: 'An uploader has limited write access',
+			},
+			{
+				name: 'Viewer',
+				value: 'viewer',
+				description: 'A viewer has read access to a folder or file',
+			},
+			{
+				name: 'Viewer Uploader',
+				value: 'viewerUploader',
+				description: 'This access level is a combination of Viewer and Uploader',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: 'editor',
+		description: 'The level of access granted.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Can View Path',
+				name: 'can_view_path',
+				type: 'boolean',
+				default: false,
+				description: `Whether the invited users can see the entire parent path to the associated folder.</br>
+				The user will not gain privileges in any parent folder and therefore cannot see content the user is not collaborated on.`,
+			},
+			{
+				displayName: 'Expires At',
+				name: 'expires_at',
+				type: 'dateTime',
+				default: '',
+				description: 'Set the expiration date for the collaboration. At this date, the collaboration will be automatically removed from the item.',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of attributes to include in the response. This can be used to request fields that are not normally returned in a standard response.',
+			},
+			{
+				displayName: 'Notify',
+				name: 'notify',
+				type: 'boolean',
+				default: false,
+				description: 'Whether if users should receive email notification for the action performed.',
+			},
+		],
+	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                 file:upload                                */
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/Box/FolderDescription.ts b/packages/nodes-base/nodes/Box/FolderDescription.ts
index 5e944b25d14..11ed33c2cf4 100644
--- a/packages/nodes-base/nodes/Box/FolderDescription.ts
+++ b/packages/nodes-base/nodes/Box/FolderDescription.ts
@@ -35,6 +35,16 @@ export const folderOperations = [
 				value: 'search',
 				description: 'Search files',
 			},
+			{
+				name: 'Share',
+				value: 'share',
+				description: 'Share a folder',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update folder',
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -147,6 +157,7 @@ export const folderFields = [
 		default: '',
 		description: 'Folder ID',
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                 folder:delete                              */
 	/* -------------------------------------------------------------------------- */
@@ -441,4 +452,417 @@ export const folderFields = [
 			},
 		],
 	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 folder:share                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Folder ID',
+		name: 'folderId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the folder to share.',
+	},
+	{
+		displayName: 'Accessible By',
+		name: 'accessibleBy',
+		type: 'options',
+		options: [
+			{
+				name: 'User',
+				value: 'user',
+			},
+			{
+				name: 'Group',
+				value: 'group',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: 'user',
+		description: 'The type of object the file will be shared with.',
+	},
+	{
+		displayName: 'Use Email',
+		name: 'useEmail',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+				accessibleBy: [
+					'user',
+				],
+			},
+		},
+		default: true,
+		description: 'Whether identify the user by email or ID.',
+	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+				accessibleBy: [
+					'user',
+				],
+				useEmail: [
+					true,
+				],
+			},
+		},
+		default: '',
+		description: `The user's email address to share the folder with.`,
+	},
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+				accessibleBy: [
+					'user',
+				],
+				useEmail: [
+					false,
+				],
+			},
+		},
+		default: '',
+		description: `The user's ID to share the folder with.`,
+	},
+	{
+		displayName: 'Group ID',
+		name: 'groupId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+				accessibleBy: [
+					'group',
+				],
+			},
+		},
+		default: '',
+		description: `The group's ID to share the folder with.`,
+	},
+	{
+		displayName: 'Role',
+		name: 'role',
+		type: 'options',
+		options: [
+			{
+				name: 'Co-Owner',
+				value: 'coOwner',
+				description: 'A Co-owner has all of functional read/write access that an editor does',
+			},
+			{
+				name: 'Editor',
+				value: 'editor',
+				description: 'An editor has full read/write access to a folder or file',
+			},
+			{
+				name: 'Previewer',
+				value: 'previewer',
+				description: 'A previewer has limited read access',
+			},
+			{
+				name: 'Previewer Uploader',
+				value: 'previewerUploader',
+				description: 'This access level is a combination of Previewer and Uploader',
+			},
+			{
+				name: 'Uploader',
+				value: 'uploader',
+				description: 'An uploader has limited write access',
+			},
+			{
+				name: 'Viewer',
+				value: 'viewer',
+				description: 'A viewer has read access to a folder or file',
+			},
+			{
+				name: 'Viewer Uploader',
+				value: 'viewerUploader',
+				description: 'This access level is a combination of Viewer and Uploader',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: 'editor',
+		description: 'The level of access granted.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Can View Path',
+				name: 'can_view_path',
+				type: 'boolean',
+				default: false,
+				description: `Whether the invited users can see the entire parent path to the associated folder.</br>
+				The user will not gain privileges in any parent folder and therefore cannot see content the user is not collaborated on.`,
+			},
+			{
+				displayName: 'Expires At',
+				name: 'expires_at',
+				type: 'dateTime',
+				default: '',
+				description: 'Set the expiration date for the collaboration. At this date, the collaboration will be automatically removed from the item.',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of attributes to include in the response. This can be used to request fields that are not normally returned in a standard response.',
+			},
+			{
+				displayName: 'Notify',
+				name: 'notify',
+				type: 'boolean',
+				default: false,
+				description: 'Whether if users should receive email notification for the action performed.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 folder:update                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Folder ID',
+		name: 'folderId',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: '',
+		description: 'Folder ID',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Can Non-Owners Invite',
+				name: 'can_non_owners_invite',
+				type: 'boolean',
+				default: false,
+				description: 'Specifies if users who are not the owner of the folder can invite new collaborators to the folder.',
+			},
+			{
+				displayName: 'Can Non-Owners View Colaborators',
+				name: 'can_non_owners_view_collaborators',
+				type: 'boolean',
+				default: false,
+				description: 'Restricts collaborators who are not the owner of this folder from viewing other collaborations on this folder.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The optional description of this folder.',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of attributes to include in the response. This can be used to request fields that are not normally returned in a standard response.',
+			},
+			{
+				displayName: 'Is Collaboration Restricted To Enterprise',
+				name: 'is_collaboration_restricted_to_enterprise',
+				type: 'boolean',
+				default: false,
+				description: 'Specifies if new invites to this folder are restricted to users within the enterprise. This does not affect existing collaborations.',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'The optional new name for this folder.',
+			},
+			{
+				displayName: 'Parent ID',
+				name: 'parentId',
+				type: 'string',
+				default: '',
+				description: 'The parent folder for this folder. Use this to move the folder or to restore it out of the trash.',
+			},
+			{
+				displayName: 'Shared Link',
+				name: 'shared_link',
+				type: 'collection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				description: 'Share link information.',
+				placeholder: 'Add Shared Link Config',
+				default: {},
+				options: [
+					{
+						displayName: 'Access',
+						name: 'access',
+						type: 'options',
+						options: [
+							{
+								name: 'Collaborators',
+								value: 'collaborators',
+								description: 'Only those who have been invited to the folder',
+							},
+							{
+								name: 'Company',
+								value: 'company',
+								description: 'only people within the company',
+							},
+							{
+								name: 'Open',
+								value: 'open',
+								description: 'Anyone with the link',
+							},
+						],
+						default: 'open',
+					},
+					{
+						displayName: 'Password',
+						name: 'password',
+						type: 'string',
+						displayOptions: {
+							show: {
+								access: [
+									'open',
+								],
+							},
+						},
+						default: '',
+						description: 'The password required to access the shared link. Set the password to null to remove it.',
+					},
+					{
+						displayName: 'Permissions',
+						name: 'permissions',
+						type: 'collection',
+						placeholder: 'Add Permition',
+						default: {},
+						options: [
+							{
+								displayName: 'Can Download',
+								name: 'can_download',
+								type: 'boolean',
+								default: false,
+								description: 'If the shared link allows for downloading of files.',
+							},
+							{
+								displayName: 'Unshared At',
+								name: 'unshared_at',
+								type: 'dateTime',
+								default: '',
+								description: 'The timestamp at which this shared link will expire.',
+							},
+							{
+								displayName: 'Vanity Name',
+								name: 'vanity_name',
+								type: 'string',
+								default: '',
+								description: 'Defines a custom vanity name to use in the shared link URL, for example https://app.box.com/v/my-shared-link.',
+							},
+						],
+					},
+					{
+						displayName: 'Tags',
+						name: 'tags',
+						type: 'string',
+						default: '',
+						description: 'The tags for this item. These tags are shown in the Box web app and mobile apps next to an item.',
+					},
+				],
+			},
+		],
+	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index 227f1e2cef5..0a33857d5e9 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -20,7 +20,7 @@ export class CalendlyTrigger implements INodeType {
 		icon: 'file:calendly.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Calendly events occur.',
+		description: 'Starts the workflow when Calendly events occur',
 		defaults: {
 			name: 'Calendly Trigger',
 			color: '#374252',
diff --git a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
index 2c0f7fafcd0..fb7fcdf035a 100644
--- a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
@@ -17,7 +17,7 @@ export class ChargebeeTrigger implements INodeType {
 		icon: 'file:chargebee.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Chargebee events occur.',
+		description: 'Starts the workflow when Chargebee events occur',
 		defaults: {
 			name: 'Chargebee Trigger',
 			color: '#559922',
diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
index 5558862ba7d..047a1b5ef0c 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
@@ -26,7 +26,7 @@ export class ClockifyTrigger implements INodeType {
 		name: 'clockifyTrigger',
 		group: [ 'trigger' ],
 		version: 1,
-		description: 'Watches Clockify For Events',
+		description: 'Listens to Clockify events',
 		defaults: {
 			name: 'Clockify Trigger',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index 806d2d942eb..2d7ed96c529 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -48,7 +48,7 @@ export class ConvertKit implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume ConvertKit API.',
+		description: 'Consume ConvertKit API',
 		defaults: {
 			name: 'ConvertKit',
 			color: '#fb6970',
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index 4dc1130b522..659001eec1e 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -25,7 +25,7 @@ export class CrateDb implements INodeType {
 		icon: 'file:cratedb.png',
 		group: ['input'],
 		version: 1,
-		description: 'Add and update data in CrateDB.',
+		description: 'Add and update data in CrateDB',
 		defaults: {
 			name: 'CrateDB',
 			color: '#47889f',
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
index b39a48333bc..e0de9a5df85 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
@@ -31,7 +31,7 @@ export class CustomerIoTrigger implements INodeType {
 		group: ['trigger'],
 		icon: 'file:customerio.svg',
 		version: 1,
-		description: 'Starts the workflow on a Customer.io update. (Beta)',
+		description: 'Starts the workflow on a Customer.io update (Beta)',
 		defaults: {
 			name: 'Customer.io Trigger',
 			color: '#ffcd00',
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.ts b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
index 78f68374f5b..7110e0759b2 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.ts
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
@@ -55,7 +55,7 @@ export class Discourse implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Discourse API.',
+		description: 'Consume Discourse API',
 		defaults: {
 			name: 'Discourse',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/EmailReadImap.node.ts b/packages/nodes-base/nodes/EmailReadImap.node.ts
index fb90534a7ce..1a046287b13 100644
--- a/packages/nodes-base/nodes/EmailReadImap.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap.node.ts
@@ -35,7 +35,7 @@ export class EmailReadImap implements INodeType {
 		icon: 'fa:inbox',
 		group: ['trigger'],
 		version: 1,
-		description: 'Triggers the workflow when a new email gets received',
+		description: 'Triggers the workflow when a new email is received',
 		defaults: {
 			name: 'IMAP Email',
 			color: '#44AA22',
diff --git a/packages/nodes-base/nodes/ExecuteCommand.node.ts b/packages/nodes-base/nodes/ExecuteCommand.node.ts
index 55494ce9f22..acf72d9dc7e 100644
--- a/packages/nodes-base/nodes/ExecuteCommand.node.ts
+++ b/packages/nodes-base/nodes/ExecuteCommand.node.ts
@@ -51,7 +51,7 @@ export class ExecuteCommand implements INodeType {
 		icon: 'fa:terminal',
 		group: ['transform'],
 		version: 1,
-		description: 'Executes a command on the host.',
+		description: 'Executes a command on the host',
 		defaults: {
 			name: 'Execute Command',
 			color: '#886644',
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index 2f685217901..738134a81ef 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -33,7 +33,7 @@ export class FacebookTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["appId"] +"/"+ $parameter["object"]}}',
-		description: 'Starts the workflow when a Facebook events occurs.',
+		description: 'Starts the workflow when Facebook events occur',
 		defaults: {
 			name: 'Facebook Trigger',
 			color: '#3B5998',
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index 402ff35f9d5..8ddd3c2bc0c 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -30,7 +30,7 @@ export class FileMaker implements INodeType {
 		icon: 'file:filemaker.png',
 		group: ['input'],
 		version: 1,
-		description: 'Retrieve data from FileMaker data API.',
+		description: 'Retrieve data from the FileMaker data API',
 		defaults: {
 			name: 'FileMaker',
 			color: '#665533',
diff --git a/packages/nodes-base/nodes/Ftp.node.ts b/packages/nodes-base/nodes/Ftp.node.ts
index ef254b055d4..27f20a079e5 100644
--- a/packages/nodes-base/nodes/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp.node.ts
@@ -45,7 +45,7 @@ export class Ftp implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["protocol"] + ": " + $parameter["operation"]}}',
-		description: 'Transfers files via FTP or SFTP.',
+		description: 'Transfers files via FTP or SFTP',
 		defaults: {
 			name: 'FTP',
 			color: '#303050',
diff --git a/packages/nodes-base/nodes/Function.node.ts b/packages/nodes-base/nodes/Function.node.ts
index 3058468dae3..6fcb75a244d 100644
--- a/packages/nodes-base/nodes/Function.node.ts
+++ b/packages/nodes-base/nodes/Function.node.ts
@@ -15,7 +15,7 @@ export class Function implements INodeType {
 		icon: 'fa:code',
 		group: ['transform'],
 		version: 1,
-		description: 'Run custom function code which gets executed once and allows to add, remove, change and replace items.',
+		description: 'Run custom function code which gets executed once and allows you to add, remove, change and replace items',
 		defaults: {
 			name: 'Function',
 			color: '#FF9922',
diff --git a/packages/nodes-base/nodes/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem.node.ts
index 88142fa5302..64cb55be2fb 100644
--- a/packages/nodes-base/nodes/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem.node.ts
@@ -17,7 +17,7 @@ export class FunctionItem implements INodeType {
 		icon: 'fa:code',
 		group: ['transform'],
 		version: 1,
-		description: 'Run custom function code which gets executed once per item.',
+		description: 'Run custom function code which gets executed once per item',
 		defaults: {
 			name: 'FunctionItem',
 			color: '#ddbb33',
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
index 09e772e1ac8..0cdbc66ef5f 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
@@ -31,7 +31,7 @@ export class GetResponse implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume GetResponse API.',
+		description: 'Consume GetResponse API',
 		defaults: {
 			name: 'GetResponse',
 			color: '#00afec',
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
index c1bd9cbbf7f..911f82f94dd 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
@@ -26,7 +26,7 @@ export class GetResponseTrigger implements INodeType {
 		icon: 'file:getResponse.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when GetResponse events occur.',
+		description: 'Starts the workflow when GetResponse events occur',
 		defaults: {
 			name: 'GetResponse Trigger',
 			color: '#00afec',
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index 241ae39ec95..0e52947639d 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -33,7 +33,7 @@ export class Ghost implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Ghost API.',
+		description: 'Consume Ghost API',
 		defaults: {
 			name: 'Ghost',
 			color: '#15212a',
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index c1b27ffa029..d39fa72b5f5 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -28,7 +28,7 @@ export class Github implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume GitHub API.',
+		description: 'Consume GitHub API',
 		defaults: {
 			name: 'GitHub',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 64a5b6faf09..039173cb3ff 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -25,7 +25,7 @@ export class GithubTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["owner"] + "/" + $parameter["repository"] + ": " + $parameter["events"].join(", ")}}',
-		description: 'Starts the workflow when a Github events occurs.',
+		description: 'Starts the workflow when Github events occur',
 		defaults: {
 			name: 'Github Trigger',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 4b0f10d9fe3..fc2a1754306 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -23,7 +23,7 @@ export class Gitlab implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Retrieve data from GitLab API.',
+		description: 'Retrieve data from GitLab API',
 		defaults: {
 			name: 'Gitlab',
 			color: '#FC6D27',
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 9098d987b77..3fda35e8ef9 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -24,7 +24,7 @@ export class GitlabTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["owner"] + "/" + $parameter["repository"] + ": " + $parameter["events"].join(", ")}}',
-		description: 'Starts the workflow when a GitLab event occurs.',
+		description: 'Starts the workflow when GitLab events occur',
 		defaults: {
 			name: 'Gitlab Trigger',
 			color: '#FC6D27',
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
index 77423a3301f..fef36f86f1f 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
@@ -32,7 +32,7 @@ export class GoogleBigQuery implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Google BigQuery API.',
+		description: 'Consume Google BigQuery API',
 		defaults: {
 			name: 'Google BigQuery',
 			color: '#3E87E4',
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 5c2d4a4d76d..6cf7e674dfd 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -44,7 +44,7 @@ export class GoogleCalendar implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Google Calendar API.',
+		description: 'Consume Google Calendar API',
 		defaults: {
 			name: 'Google Calendar',
 			color: '#3E87E4',
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index 0caa44bf7aa..e777e943ef2 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -33,7 +33,7 @@ export class GoogleContacts implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Google Contacts API.',
+		description: 'Consume Google Contacts API',
 		defaults: {
 			name: 'Google Contacts',
 			color: '#1a73e8',
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index 3e0f7a31f39..e594b4656eb 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -24,7 +24,7 @@
 // 		group: ['trigger'],
 // 		version: 1,
 // 		subtitle: '={{$parameter["owner"] + "/" + $parameter["repository"] + ": " + $parameter["events"].join(", ")}}',
-// 		description: 'Starts the workflow when a file on Google Drive got changed.',
+// 		description: 'Starts the workflow when a file on Google Drive is changed',
 // 		defaults: {
 // 			name: 'Google Drive Trigger',
 // 			color: '#3f87f2',
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
index aca82ddea24..28d35d5afeb 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
@@ -486,8 +486,9 @@ export class GoogleSheet {
 		inputData.forEach((item) => {
 			rowData = [];
 			keyColumnOrder.forEach((key) => {
-				if (item.hasOwnProperty(key) && item[key]) {
-					rowData.push(item[key]!.toString());
+				const data = item[key];
+				if (item.hasOwnProperty(key) && data !== null && typeof data !== 'undefined') {
+					rowData.push(data.toString());
 				} else {
 					rowData.push('');
 				}
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index ae711478c71..29c945d9dbf 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -29,7 +29,7 @@ export class GoogleTasks implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Google Tasks API.',
+		description: 'Consume Google Tasks API',
 		defaults: {
 			name: 'Google Tasks',
 			color: '#3E87E4',
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 9179277488a..016634aaa51 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -55,7 +55,7 @@ export class YouTube implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume YouTube API.',
+		description: 'Consume YouTube API',
 		defaults: {
 			name: 'YouTube',
 			color: '#FF0000',
diff --git a/packages/nodes-base/nodes/Gotify/Gotify.node.ts b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
index 1c6179efc62..03e3eec7e2c 100644
--- a/packages/nodes-base/nodes/Gotify/Gotify.node.ts
+++ b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
@@ -22,7 +22,7 @@ export class Gotify implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Gotify API.',
+		description: 'Consume Gotify API',
 		defaults: {
 			name: 'Gotify',
 			color: '#71c8ec',
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index 73dab6fef1c..b2756f1a687 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -64,7 +64,7 @@ export class HelpScout implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Help Scout API.',
+		description: 'Consume HelpScout API',
 		defaults: {
 			name: 'HelpScout',
 			color: '#1392ee',
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
index 8ca2d098ec7..292272a120d 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
@@ -26,7 +26,7 @@ export class HelpScoutTrigger implements INodeType {
 		icon: 'file:helpScout.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when HelpScout events occur.',
+		description: 'Starts the workflow when HelpScout events occur',
 		defaults: {
 			name: 'HelpScout Trigger',
 			color: '#1392ee',
diff --git a/packages/nodes-base/nodes/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest.node.ts
index 0d9ac472c0e..ae26e3dd98c 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest.node.ts
@@ -32,7 +32,7 @@ export class HttpRequest implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["requestMethod"] + ": " + $parameter["url"]}}',
-		description: 'Makes a HTTP request and returns the received data',
+		description: 'Makes an HTTP request and returns the response data',
 		defaults: {
 			name: 'HTTP Request',
 			color: '#2200DD',
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 6281780e205..d6224f39481 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -37,7 +37,7 @@ export class HubspotTrigger implements INodeType {
 		icon: 'file:hubspot.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when HubSpot events occur.',
+		description: 'Starts the workflow when HubSpot events occur',
 		defaults: {
 			name: 'Hubspot Trigger',
 			color: '#ff7f64',
diff --git a/packages/nodes-base/nodes/If.node.ts b/packages/nodes-base/nodes/If.node.ts
index 278162d6060..2a2a3bd0bd6 100644
--- a/packages/nodes-base/nodes/If.node.ts
+++ b/packages/nodes-base/nodes/If.node.ts
@@ -16,7 +16,7 @@ export class If implements INodeType {
 		icon: 'fa:map-signs',
 		group: ['transform'],
 		version: 1,
-		description: 'Splits a stream depending on defined compare operations.',
+		description: 'Splits a stream based on comparisons',
 		defaults: {
 			name: 'IF',
 			color: '#408000',
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index d1f677dbcb9..ac530779001 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -47,7 +47,7 @@ export class Intercom implements INodeType {
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume intercom API',
+		description: 'Consume Intercom API',
 		defaults: {
 			name: 'Intercom',
 			color: '#0575f3',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
index daffd871fcc..1b1cce0dc9a 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
@@ -20,7 +20,7 @@ export class InvoiceNinjaTrigger implements INodeType {
 		icon: 'file:invoiceNinja.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Invoice Ninja events occur.',
+		description: 'Starts the workflow when Invoice Ninja events occur',
 		defaults: {
 			name: 'Invoice Ninja Trigger',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index bde2a5acf2b..44356f21439 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -42,7 +42,7 @@ export class Iterable implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Iterable API.',
+		description: 'Consume Iterable API',
 		defaults: {
 			name: 'Iterable',
 			color: '#725ed8',
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index 64ad3963724..af66c852ccb 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -26,7 +26,7 @@ export class JiraTrigger implements INodeType {
 		icon: 'file:jira.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Jira events occurs.',
+		description: 'Starts the workflow when Jira events occur',
 		defaults: {
 			name: 'Jira Trigger',
 			color: '#4185f7',
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 8ddcf53f131..d335af4aa1a 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -110,7 +110,7 @@ export class Keap implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Keap API.',
+		description: 'Consume Keap API',
 		defaults: {
 			name: 'Keap',
 			color: '#79af53',
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index 4ea0ef21a91..4474bc2a2e2 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -28,7 +28,7 @@ export class KeapTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["eventId"]}}',
-		description: 'Starts the workflow when Infusionsoft events occur.',
+		description: 'Starts the workflow when Infusionsoft events occur',
 		defaults: {
 			name: 'Keap Trigger',
 			color: '#79af53',
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index b4681c3ec3a..57ae68b2639 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -29,7 +29,7 @@ export class Line implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Line API.',
+		description: 'Consume Line API',
 		defaults: {
 			name: 'Line',
 			color: '#00b900',
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 2f7d3e0da97..3a93c55f7d0 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -24,7 +24,7 @@ export class LinkedIn implements INodeType {
 		icon: 'file:linkedin.png',
 		group: ['input'],
 		version: 1,
-		description: 'Consume LinkedIn Api',
+		description: 'Consume LinkedIn API',
 		defaults: {
 			name: 'LinkedIn',
 			color: '#0075b4',
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
index f45e900a386..1e383fd0b8e 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
@@ -29,7 +29,7 @@ export class MailerLite implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Mailer Lite API.',
+		description: 'Consume Mailer Lite API',
 		defaults: {
 			name: 'MailerLite',
 			color: '#58be72',
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
index 658e059af0c..a527c74fb6f 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
@@ -21,7 +21,7 @@ export class MailerLiteTrigger implements INodeType {
 		icon: 'file:mailerLite.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a MailerLite events occurs.',
+		description: 'Starts the workflow when MailerLite events occur',
 		defaults: {
 			name: 'MailerLite Trigger',
 			color: '#58be72',
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index 596fed5147c..b59db606d00 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -19,7 +19,7 @@ export class Mailgun implements INodeType {
 		icon: 'file:mailgun.svg',
 		group: ['output'],
 		version: 1,
-		description: 'Sends an Email via Mailgun',
+		description: 'Sends an email via Mailgun',
 		defaults: {
 			name: 'Mailgun',
 			color: '#c02428',
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index c29f66d0df1..74a2a6fe27f 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -105,7 +105,7 @@ export class Mandrill implements INodeType {
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume mandrill API',
+		description: 'Consume Mandrill API',
 		defaults: {
 			name: 'Mandrill',
 			color: '#c02428',
diff --git a/packages/nodes-base/nodes/Merge.node.ts b/packages/nodes-base/nodes/Merge.node.ts
index 7a8a0a3ac1d..a6cb8ab4f71 100644
--- a/packages/nodes-base/nodes/Merge.node.ts
+++ b/packages/nodes-base/nodes/Merge.node.ts
@@ -17,7 +17,7 @@ export class Merge implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["mode"]}}',
-		description: 'Merges data of multiple streams once data of both is available',
+		description: 'Merges data of multiple streams once data from both is available',
 		defaults: {
 			name: 'Merge',
 			color: '#00bbcc',
diff --git a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
index d61b7ccb331..c6b767a6f9d 100644
--- a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
+++ b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
@@ -22,7 +22,7 @@ export class MessageBird implements INodeType {
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Sending SMS',
+		description: 'Sends SMS via MessageBird',
 		defaults: {
 			name: 'MessageBird',
 			color: '#2481d7',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
index 02f43789e0f..22f11ec2383 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
@@ -42,7 +42,7 @@ export class MicrosoftExcel implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Microsoft Excel API.',
+		description: 'Consume Microsoft Excel API',
 		defaults: {
 			name: 'Microsoft Excel',
 			color: '#1c6d40',
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index 0574c1fe9da..65e374b3433 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -36,7 +36,7 @@ export class MicrosoftOneDrive implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Microsoft OneDrive API.',
+		description: 'Consume Microsoft OneDrive API',
 		defaults: {
 			name: 'Microsoft OneDrive',
 			color: '#1d4bab',
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
index cff19da729d..23a929b3aad 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
@@ -121,7 +121,7 @@ export function extractUpdateSet(item: IDataObject, columns: string[]): string {
 	return columns
 		.map(
 			column =>
-				`${column} = ${
+				`"${column}" = ${
 					typeof item[column] === 'string' ? `'${item[column]}'` : item[column]
 				}`,
 		)
@@ -153,3 +153,9 @@ export function extractDeleteValues(items: IDataObject[], key: string): string {
 		.map(item => (typeof item[key] === 'string' ? `'${item[key]}'` : item[key]))
 		.join(',')})`;
 }
+
+
+export function formatColumns(columns: string) {
+	return columns.split(',')
+	.map((column) => (`"${column.trim()}"`)).join(',');
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 3043600c99a..867928a24f5 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -29,6 +29,7 @@ import {
 	extractUpdateCondition,
 	extractUpdateSet,
 	extractValues,
+	formatColumns,
 } from './GenericFunctions';
 
 export class MicrosoftSql implements INodeType {
@@ -38,7 +39,7 @@ export class MicrosoftSql implements INodeType {
 		icon: 'file:mssql.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Gets, add and update data in Microsoft SQL.',
+		description: 'Get, add and update data in Microsoft SQL',
 		defaults: {
 			name: 'Microsoft SQL',
 			color: '#bcbcbd',
@@ -226,7 +227,8 @@ export class MicrosoftSql implements INodeType {
 			user: credentials.user as string,
 			password: credentials.password as string,
 			domain: credentials.domain ? (credentials.domain as string) : undefined,
-			connectTimeout: credentials.connectTimeout as number,
+			connectionTimeout: credentials.connectTimeout as number,
+			requestTimeout: credentials.requestTimeout as number,
 			options: {
 				encrypt: credentials.tls as boolean,
 				enableArithAbort: false,
@@ -281,7 +283,7 @@ export class MicrosoftSql implements INodeType {
 							return pool
 								.request()
 								.query(
-									`INSERT INTO ${table}(${columnString}) VALUES ${values};`,
+									`INSERT INTO ${table}(${formatColumns(columnString)}) VALUES ${values};`,
 								);
 						});
 					},
@@ -364,7 +366,7 @@ export class MicrosoftSql implements INodeType {
 									return pool
 										.request()
 										.query(
-											`DELETE FROM ${table} WHERE ${deleteKey} IN ${extractDeleteValues(
+											`DELETE FROM ${table} WHERE "${deleteKey}" IN ${extractDeleteValues(
 												deleteValues,
 												deleteKey,
 											)};`,
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index be504e88c99..53c3046d302 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.ts
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -26,7 +26,7 @@ export class Mindee implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Mindee API.',
+		description: 'Consume Mindee API',
 		defaults: {
 			name: 'Mindee',
 			color: '#e94950',
diff --git a/packages/nodes-base/nodes/Mocean/Mocean.node.ts b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
index 3c2e9facfdf..ae2f87ba433 100644
--- a/packages/nodes-base/nodes/Mocean/Mocean.node.ts
+++ b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
@@ -17,7 +17,7 @@ export class Mocean implements INodeType {
 		icon: 'file:mocean.png',
 		group: ['transform'],
 		version: 1,
-		description: 'Send SMS & voice messages via Mocean (https://moceanapi.com)',
+		description: 'Send SMS and voice messages via Mocean',
 		defaults: {
 			name: 'Mocean',
 			color: '#772244',
diff --git a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
index 6d863987ccb..f6e96012148 100644
--- a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
+++ b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
@@ -11,7 +11,7 @@ export const nodeDescription: INodeTypeDescription = {
 	icon: 'file:mongodb.svg',
 	group: ['input'],
 	version: 1,
-	description: 'Find, insert and update documents in MongoDB.',
+	description: 'Find, insert and update documents in MongoDB',
 	defaults: {
 		name: 'MongoDB',
 		color: '#13AA52',
diff --git a/packages/nodes-base/nodes/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData.node.ts
index 79e74f82448..ed6454d5810 100644
--- a/packages/nodes-base/nodes/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData.node.ts
@@ -49,7 +49,7 @@ export class MoveBinaryData implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["mode"]==="binaryToJson" ? "Binary to JSON" : "JSON to Binary"}}',
-		description: 'Move data between binary and JSON properties.',
+		description: 'Move data between binary and JSON properties',
 		defaults: {
 			name: 'Move Binary Data',
 			color: '#7722CC',
diff --git a/packages/nodes-base/nodes/Msg91/Msg91.node.ts b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
index 6dc6b14b0ae..9f605d7ee87 100644
--- a/packages/nodes-base/nodes/Msg91/Msg91.node.ts
+++ b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
@@ -20,7 +20,7 @@ export class Msg91 implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Send Transactional SMS',
+		description: 'Sends transactional SMS via MSG91',
 		defaults: {
 			name: 'Msg91',
 			color: '#0000ff',
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index fd1de1af075..20eebf52de0 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -18,7 +18,7 @@ export class MySql implements INodeType {
 		icon: 'file:mysql.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Get, add and update data in MySQL.',
+		description: 'Get, add and update data in MySQL',
 		defaults: {
 			name: 'MySQL',
 			color: '#4279a2',
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts
index 0ccc9042c38..99705a72457 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts
@@ -147,7 +147,7 @@ export class N8nTrainingCustomerDatastore implements INodeType {
 					responseData = data;
 				} else {
 					const limit = this.getNodeParameter('limit', i) as number;
-					responseData = data.splice(0, limit);
+					responseData = data.slice(0, limit);
 				}
 			}
 
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 5b523c5bc0a..6a3d249e823 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -25,7 +25,7 @@ export class Nasa implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
-		description: 'Retrieve data the from NASA API',
+		description: 'Retrieve data from the NASA API',
 		defaults: {
 			name: 'NASA',
 			color: '#0B3D91',
diff --git a/packages/nodes-base/nodes/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap.node.ts
index 4aaa76a4bc6..305d7e8c2a3 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap.node.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap.node.ts
@@ -19,7 +19,7 @@ export class OpenWeatherMap implements INodeType {
 		icon: 'fa:sun',
 		group: ['input'],
 		version: 1,
-		description: 'Gets current and future weather information.',
+		description: 'Gets current and future weather information',
 		defaults: {
 			name: 'OpenWeatherMap',
 			color: '#554455',
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index 8c1616b4fef..da913acdb27 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -33,7 +33,7 @@ export class Phantombuster implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Phantombuster API.',
+		description: 'Consume Phantombuster API',
 		defaults: {
 			name: 'Phantombuster',
 			color: '#62bfd7',
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index 908790a5cf3..6286663353b 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -29,7 +29,7 @@ export class PhilipsHue implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Philips Hue API.',
+		description: 'Consume Philips Hue API',
 		defaults: {
 			name: 'Philips Hue',
 			color: '#063c9a',
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index eeadedf4031..067f41eb45d 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -43,7 +43,7 @@ export class PipedriveTrigger implements INodeType {
 		icon: 'file:pipedrive.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Pipedrive events occur.',
+		description: 'Starts the workflow when Pipedrive events occur',
 		defaults: {
 			name: 'Pipedrive Trigger',
 			color: '#559922',
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index f56860731a4..7f4dbce2c50 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
@@ -47,7 +47,7 @@ export class PostHog implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume PostHog API.',
+		description: 'Consume PostHog API',
 		defaults: {
 			name: 'PostHog',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 30880f3f8d8..2b7f49baab2 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -18,7 +18,7 @@ export class Postgres implements INodeType {
 		icon: 'file:postgres.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Gets, add and update data in Postgres.',
+		description: 'Get, add and update data in Postgres',
 		defaults: {
 			name: 'Postgres',
 			color: '#336791',
diff --git a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
index a66f0993990..b85aa2d04f8 100644
--- a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
@@ -22,7 +22,7 @@ export class PostmarkTrigger implements INodeType {
 		icon: 'file:postmark.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Postmark events occur.',
+		description: 'Starts the workflow when Postmark events occur',
 		defaults: {
 			name: 'Postmark Trigger',
 			color: '#fedd00',
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 8e38f2c45d9..ea95fe61ca3 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -29,7 +29,7 @@ export class Pushbullet implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Pushbullet API.',
+		description: 'Consume Pushbullet API',
 		defaults: {
 			name: 'Pushbullet',
 			color: '#457854',
diff --git a/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts b/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
index 28fb18cb97e..27d7242ebe6 100644
--- a/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
@@ -23,7 +23,7 @@ export class Pushcut implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Pushcut API.',
+		description: 'Consume Pushcut API',
 		defaults: {
 			name: 'Pushcut',
 			color: '#1f2957',
diff --git a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
index 3e7e4df6c4a..7922c70fbf6 100644
--- a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
@@ -21,7 +21,7 @@ export class PushcutTrigger implements INodeType {
 		icon: 'file:pushcut.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a Pushcut events occurs.',
+		description: 'Starts the workflow when Pushcut events occur',
 		defaults: {
 			name: 'Pushcut Trigger',
 			color: '#1f2957',
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index 10115f9bcb2..44cc8438dd1 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -27,7 +27,7 @@ export class Pushover implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Pushover API.',
+		description: 'Consume Pushover API',
 		defaults: {
 			name: 'Pushover',
 			color: '#4b9cea',
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 03e26d41ed2..50a4e7c9e49 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -21,7 +21,7 @@ export class QuestDb implements INodeType {
 		icon: 'file:questdb.png',
 		group: ['input'],
 		version: 1,
-		description: 'Gets, add and update data in QuestDB.',
+		description: 'Get, add and update data in QuestDB',
 		defaults: {
 			name: 'QuestDB',
 			color: '#2C4A79',
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index b26128c22d0..c7e072ee75e 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -46,7 +46,7 @@ export class QuickBase implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Integrate with the Quick Base RESTful API.',
+		description: 'Integrate with the Quick Base RESTful API',
 		defaults: {
 			name: 'Quick Base',
 			color: '#73489d',
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index 012486462e2..3202fa576ed 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -20,7 +20,7 @@ export class Redis implements INodeType {
 		icon: 'file:redis.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Get, send and update data in Redis.',
+		description: 'Get, send and update data in Redis',
 		defaults: {
 			name: 'Redis',
 			color: '#0033AA',
diff --git a/packages/nodes-base/nodes/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys.node.ts
index d427db9cf42..167be3234dc 100644
--- a/packages/nodes-base/nodes/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys.node.ts
@@ -23,7 +23,7 @@ export class RenameKeys implements INodeType {
 		icon: 'fa:edit',
 		group: ['transform'],
 		version: 1,
-		description: 'Renames keys.',
+		description: 'Renames keys',
 		defaults: {
 			name: 'Rename Keys',
 			color: '#772244',
diff --git a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
index 3ec78b6e116..4e9901fc6e3 100644
--- a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
@@ -570,6 +570,13 @@ export const contactFields = [
 				description: `references the ID of a contact in Data.com.
 				If a contact has a value in this field, it means that a contact was imported as a contact from Data.com.`,
 			},
+			{
+				displayName: 'Last Name',
+				name: 'lastName',
+				type: 'string',
+				default: '',
+				description: 'Last name of the contact. Limited to 80 characters.',
+			},
 			{
 				displayName: 'Lead Source',
 				name: 'leadSource',
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 9afccd687f5..08269b0ca71 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -1337,6 +1337,9 @@ export class Salesforce implements INodeType {
 					if (!Object.keys(updateFields).length) {
 						throw new NodeOperationError(this.getNode(), 'You must add at least one update field');
 					}
+					if (updateFields.lastName !== undefined) {
+						body.LastName = updateFields.lastName as string;
+					}
 					if (updateFields.fax !== undefined) {
 						body.Fax = updateFields.fax as string;
 					}
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index 7a010b81653..14548355f1d 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -33,7 +33,7 @@ export class Sendy implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Sendy API.',
+		description: 'Consume Sendy API',
 		defaults: {
 			name: 'Sendy',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Set.node.ts b/packages/nodes-base/nodes/Set.node.ts
index 9c17ec7e501..01cd0ff8f06 100644
--- a/packages/nodes-base/nodes/Set.node.ts
+++ b/packages/nodes-base/nodes/Set.node.ts
@@ -16,7 +16,7 @@ export class Set implements INodeType {
 		icon: 'fa:pen',
 		group: ['input'],
 		version: 1,
-		description: 'Sets values on the items and removes if selected all other values.',
+		description: 'Sets values on items and optionally remove other values',
 		defaults: {
 			name: 'Set',
 			color: '#0000FF',
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.ts b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
index e54d7d0425b..390d1fd1c27 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.ts
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
@@ -24,7 +24,7 @@ export class Signl4 implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume SIGNL4 API.',
+		description: 'Consume SIGNL4 API',
 		defaults: {
 			name: 'SIGNL4',
 			color: '#53afe8',
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index cc8e7533296..4da65da65a9 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -25,7 +25,7 @@ export class Snowflake implements INodeType {
 		icon: 'file:snowflake.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Get, add and update data in Snowflake.',
+		description: 'Get, add and update data in Snowflake',
 		defaults: {
 			name: 'Snowflake',
 			color: '#5ebbeb',
diff --git a/packages/nodes-base/nodes/SplitInBatches.node.ts b/packages/nodes-base/nodes/SplitInBatches.node.ts
index fb2fd6a582e..ed7fd01d730 100644
--- a/packages/nodes-base/nodes/SplitInBatches.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches.node.ts
@@ -14,7 +14,7 @@ export class SplitInBatches implements INodeType {
 		icon: 'fa:th-large',
 		group: ['organization'],
 		version: 1,
-		description: 'Saves the originally incoming data and with each iteration it returns a predefined amount of them.',
+		description: 'Split data into batches and iterate over each batch',
 		defaults: {
 			name: 'SplitInBatches',
 			color: '#007755',
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 1b3e4b48dd5..012867f3953 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -25,7 +25,7 @@ export class Spotify implements INodeType {
 		icon: 'file:spotify.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Access public song data via the Spotify API.',
+		description: 'Access public song data via the Spotify API',
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		defaults: {
 			name: 'Spotify',
diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
index e2b8350a848..628aa0c882b 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
@@ -53,7 +53,7 @@ export class SpreadsheetFile implements INodeType {
 		icon: 'fa:table',
 		group: ['transform'],
 		version: 1,
-		description: 'Reads and writes data from a spreadsheet file.',
+		description: 'Reads and writes data from a spreadsheet file',
 		defaults: {
 			name: 'Spreadsheet File',
 			color: '#2244FF',
diff --git a/packages/nodes-base/nodes/SseTrigger.node.ts b/packages/nodes-base/nodes/SseTrigger.node.ts
index 6d410a097e8..69983c87c65 100644
--- a/packages/nodes-base/nodes/SseTrigger.node.ts
+++ b/packages/nodes-base/nodes/SseTrigger.node.ts
@@ -14,7 +14,7 @@ export class SseTrigger implements INodeType {
 		icon: 'fa:cloud-download-alt',
 		group: ['trigger'],
 		version: 1,
-		description: 'Triggers workflow on a new Server-Sent Event',
+		description: 'Triggers the workflow when Server-Sent Events occur',
 		defaults: {
 			name: 'SSE Trigger',
 			color: '#225577',
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index 293203e3ebf..acbb3cb2c02 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -320,7 +320,7 @@ export class Ssh implements INodeType {
 					privateKey: path,
 				} as any; // tslint:disable-line: no-any
 
-				if (!credentials.passphrase) {
+				if (credentials.passphrase) {
 					options.passphrase = credentials.passphrase as string;
 				}
 
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index f06c6836de3..6e595cd12e5 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -23,7 +23,7 @@ export class Stackby implements INodeType {
 		icon: 'file:stackby.png',
 		group: ['transform'],
 		version: 1,
-		description: 'Read, Write, and Delete Data in Stackby',
+		description: 'Read, write, and delete data in Stackby',
 		defaults: {
 			name: 'Stackby',
 			color: '#772244',
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index 70e3357632d..2091df3a9e5 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -30,7 +30,7 @@ export class Strapi implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Strapi API.',
+		description: 'Consume Strapi API',
 		defaults: {
 			name: 'Strapi',
 			color: '#725ed8',
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index 5fbf6d7b455..b420c0f5197 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -29,7 +29,7 @@ export class Strava implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Strava API.',
+		description: 'Consume Strava API',
 		defaults: {
 			name: 'Strava',
 			color: '#ea5929',
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index 0e78a63555c..95008912246 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -26,7 +26,7 @@ export class StravaTrigger implements INodeType {
 		icon: 'file:strava.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a Strava events occurs.',
+		description: 'Starts the workflow when Strava events occur',
 		defaults: {
 			name: 'Strava Trigger',
 			color: '#ea5929',
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 8aa2b3dac13..e285003f6e4 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -40,7 +40,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 		icon: 'file:surveyMonkey.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Survey Monkey events occur.',
+		description: 'Starts the workflow when Survey Monkey events occur',
 		defaults: {
 			name: 'SurveyMonkey Trigger',
 			color: '#53b675',
diff --git a/packages/nodes-base/nodes/Switch.node.ts b/packages/nodes-base/nodes/Switch.node.ts
index 665aac4d84f..8d903993248 100644
--- a/packages/nodes-base/nodes/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch.node.ts
@@ -16,7 +16,7 @@ export class Switch implements INodeType {
 		icon: 'fa:map-signs',
 		group: ['transform'],
 		version: 1,
-		description: 'Route items depending on defined expression or rules.',
+		description: 'Route items depending on defined expression or rules',
 		defaults: {
 			name: 'Switch',
 			color: '#506000',
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index e55c4774190..8f5ee6a254c 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -24,7 +24,7 @@ export class Telegram implements INodeType {
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Sends data to Telegram.',
+		description: 'Sends data to Telegram',
 		defaults: {
 			name: 'Telegram',
 			color: '#0088cc',
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index b55b4264e09..554983cef92 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -27,7 +27,7 @@ export class TelegramTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '=Updates: {{$parameter["updates"].join(", ")}}',
-		description: 'Starts the workflow on a Telegram update.',
+		description: 'Starts the workflow on a Telegram update',
 		defaults: {
 			name: 'Telegram Trigger',
 			color: '#0088cc',
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index e3021879c0a..5b3a93c7f01 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -72,7 +72,7 @@ export class TheHive implements INodeType {
 		group: ['transform'],
 		subtitle: '={{$parameter["operation"]}} : {{$parameter["resource"]}}',
 		version: 1,
-		description: 'Consume TheHive APIs',
+		description: 'Consume TheHive API',
 		defaults: {
 			name: 'TheHive',
 			color: '#f3d02f',
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
index fcd211d12e7..82a07b50992 100644
--- a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
@@ -17,7 +17,7 @@ export class TheHiveTrigger implements INodeType {
 		icon: 'file:thehive.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a TheHive event occurs.',
+		description: 'Starts the workflow when TheHive events occur',
 		defaults: {
 			name: 'TheHive Trigger',
 			color: '#f3d02f',
diff --git a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
index 0ecf55fa705..0ed7aa2e86a 100644
--- a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
+++ b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
@@ -24,7 +24,7 @@ export class TrelloTrigger implements INodeType {
 		icon: 'file:trello.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Trello events occur.',
+		description: 'Starts the workflow when Trello events occur',
 		defaults: {
 			name: 'Trello Trigger',
 			color: '#026aa7',
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index 5cd9cac97a8..f6e4a4def77 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
@@ -28,7 +28,7 @@ export class TypeformTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '=Form ID: {{$parameter["formId"]}}',
-		description: 'Starts the workflow on a Typeform form submission.',
+		description: 'Starts the workflow on a Typeform form submission',
 		defaults: {
 			name: 'Typeform Trigger',
 			color: '#404040',
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index d7fd01cb080..aba898064d8 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -26,7 +26,7 @@ export class Vero implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Vero',
 		name: 'vero',
-		icon: 'file:vero.png',
+		icon: 'file:vero.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Vero/vero.png b/packages/nodes-base/nodes/Vero/vero.png
deleted file mode 100644
index aaa2d140d45..00000000000
Binary files a/packages/nodes-base/nodes/Vero/vero.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Vero/vero.svg b/packages/nodes-base/nodes/Vero/vero.svg
new file mode 100644
index 00000000000..46f4cf1efa9
--- /dev/null
+++ b/packages/nodes-base/nodes/Vero/vero.svg
@@ -0,0 +1,21 @@
+<svg width="225" height="225" xmlns="http://www.w3.org/2000/svg" fill="none">
+ <defs>
+  <linearGradient y2="0.53466" y1="0.45356" x2="-0.15926" x1="1.04746" id="a">
+   <stop stop-color="#2936a3" offset="0"/>
+   <stop stop-color="#162286" offset="1"/>
+  </linearGradient>
+  <linearGradient y2="0.15582" y1="0.6753" x2="0.95825" x1="-0.19201" id="b">
+   <stop stop-color="#2297f4" offset="0"/>
+   <stop stop-color="#31a0f9" offset="1"/>
+  </linearGradient>
+ </defs>
+ <clipPath id="c">
+  <path id="svg_1" d="m0,0l720,0l0,150.523l-720,0l0,-150.523z"/>
+ </clipPath>
+ <g>
+  <title>Layer 1</title>
+  <path stroke="null" id="svg_4" fill="url(#a)" d="m211.145,121.3891c18.18,-18.1614 18.18,-47.6067 0,-65.7681c-18.18,-18.16132 -47.656,-18.16135 -65.836,0l-32.919,32.8841l32.817,32.7831c0.034,0.0338 0.068,0.0674 0.101,0.1011c18.161,18.1421 47.594,18.1613 65.779,0.0578l0.058,-0.058z"/>
+  <path stroke="null" id="svg_5" fill="#17da88" d="m46.5554,154.275l-32.9202,-32.8854c-18.18028,-18.1613 -18.18026,-47.6066 0,-65.768c18.1803,-18.16133 47.6564,-18.16132 65.8367,0l32.9201,32.8859l-65.8366,65.7675z"/>
+  <path stroke="null" id="svg_6" fill="url(#b)" d="m211.145,121.3893c-18.18,18.1613 -47.656,18.1613 -65.836,0c-0.034,-0.0337 -0.068,-0.0674 -0.101,-0.1011l-32.816,-32.781l-65.8363,65.7678l18.8086,18.789c25.9719,25.945 68.0807,25.945 94.0527,0l51.728,-51.6747z"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Webhook.node.ts b/packages/nodes-base/nodes/Webhook.node.ts
index 5526d93782e..f51a0fb6927 100644
--- a/packages/nodes-base/nodes/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook.node.ts
@@ -45,7 +45,7 @@ export class Webhook implements INodeType {
 		name: 'webhook',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a webhook got called.',
+		description: 'Starts the workflow when a webhook is called',
 		defaults: {
 			name: 'Webhook',
 			color: '#885577',
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index 87f99d9df24..ced73ee6657 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -56,7 +56,7 @@ export class Wekan implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Open-Source Kanban',
+		description: 'Consume Wekan API',
 		defaults: {
 			name: 'Wekan',
 			color: '#006581',
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index d5e07a3877d..fa862de03bc 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -1,59 +1,434 @@
-import { 
+import {
 	OptionsWithUri,
 } from 'request';
 
 import {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
+	IHookFunctions,
 } from 'n8n-core';
+
 import {
-	IDataObject, NodeApiError
+	IDataObject,
+	ILoadOptionsFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
-export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-	const { oauthTokenData: { api_domain } } = this.getCredentials('zohoOAuth2Api') as { [key: string]: IDataObject };
+import {
+	flow,
+	sortBy,
+} from 'lodash';
+
+import {
+	AllFields,
+	CamelCaseResource,
+	DateType,
+	GetAllFilterOptions,
+	IdType,
+	LoadedFields,
+	LoadedLayouts,
+	LocationType,
+	NameType,
+	ProductDetails,
+	ResourceItems,
+	SnakeCaseResource,
+	ZohoOAuth2ApiCredentials,
+} from './types';
+
+export async function zohoApiRequest(
+	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	uri?: string,
+) {
+	const { oauthTokenData } = this.getCredentials('zohoOAuth2Api') as ZohoOAuth2ApiCredentials;
 
 	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/json',
-		},
-		method,
 		body: {
 			data: [
 				body,
 			],
 		},
+		method,
 		qs,
-		uri: uri || `${api_domain}/crm/v2${resource}`,
+		uri: uri ?? `${oauthTokenData.api_domain}/crm/v2${endpoint}`,
 		json: true,
 	};
+
+	if (!Object.keys(body).length) {
+		delete options.body;
+	}
+
+	if (!Object.keys(qs).length) {
+		delete options.qs;
+	}
+
 	try {
-		//@ts-ignore
-		return await this.helpers.requestOAuth2.call(this, 'zohoOAuth2Api', options);
+		const responseData = await this.helpers.requestOAuth2?.call(this, 'zohoOAuth2Api', options);
+
+		if (responseData === undefined) return [];
+
+		throwOnErrorStatus.call(this, responseData);
+
+		return responseData;
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
-export async function zohoApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-
+/**
+ * Make an authenticated API request to Zoho CRM API and return all items.
+ */
+export async function zohoApiRequestAllItems(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
 	let uri: string | undefined;
-	query.per_page = 200;
-	query.page = 0;
+	qs.per_page = 200;
+	qs.page = 0;
 
 	do {
-		responseData = await zohoApiRequest.call(this, method, endpoint, body, query, uri);
+		responseData = await zohoApiRequest.call(this, method, endpoint, body, qs, uri);
+		if (Array.isArray(responseData) && !responseData.length) return returnData;
+		returnData.push(...responseData.data);
 		uri = responseData.info.more_records;
-		returnData.push.apply(returnData, responseData[propertyName]);
-		query.page++;
+		qs.page++;
 	} while (
 		responseData.info.more_records !== undefined &&
 		responseData.info.more_records === true
 	);
 
 	return returnData;
-}
\ No newline at end of file
+}
+
+/**
+ * Handle a Zoho CRM API listing by returning all items or up to a limit.
+ */
+export async function handleListing(
+	this: IExecuteFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+) {
+	const returnAll = this.getNodeParameter('returnAll', 0) as boolean;
+
+	if (returnAll) {
+		return await zohoApiRequestAllItems.call(this, method, endpoint, body, qs);
+	}
+
+	const responseData = await zohoApiRequestAllItems.call(this, method, endpoint, body, qs);
+	const limit = this.getNodeParameter('limit', 0) as number;
+
+	return responseData.slice(0, limit);
+}
+
+export function throwOnEmptyUpdate(this: IExecuteFunctions, resource: CamelCaseResource) {
+	throw new NodeOperationError(
+		this.getNode(),
+		`Please enter at least one field to update for the ${resource}.`,
+	);
+}
+
+export function throwOnMissingProducts(
+	this: IExecuteFunctions,
+	resource: CamelCaseResource,
+	productDetails: ProductDetails,
+	) {
+	if (!productDetails.length) {
+		throw new NodeOperationError(
+			this.getNode(),
+			`Please enter at least one product for the ${resource}.`,
+		);
+	}
+}
+
+export function throwOnErrorStatus(
+	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
+	responseData: { data?: Array<{ status: string, message: string }> },
+) {
+	if (responseData?.data?.[0].status === 'error') {
+		throw new NodeOperationError(this.getNode(), responseData as Error);
+	}
+}
+
+// ----------------------------------------
+//        required field adjusters
+// ----------------------------------------
+
+/**
+ * Place a product ID at a nested position in a product details field.
+ */
+export const adjustProductDetails = (productDetails: ProductDetails) => {
+	return productDetails.map(p => {
+		return {
+			...omit('product', p),
+			product: { id: p.id },
+			quantity: p.quantity || 1,
+		};
+	});
+};
+
+// ----------------------------------------
+//        additional field adjusters
+// ----------------------------------------
+
+/**
+ * Place a product ID at a nested position in a product details field.
+ *
+ * Only for updating products from Invoice, Purchase Order, Quote, and Sales Order.
+ */
+export const adjustProductDetailsOnUpdate = (allFields: AllFields) => {
+	if (!allFields.Product_Details) return allFields;
+
+	return allFields.Product_Details.map(p => {
+		return {
+			...omit('product', p),
+			product: { id: p.id },
+			quantity: p.quantity || 1,
+		};
+	});
+};
+
+/**
+ * Place a location field's contents at the top level of the payload.
+ */
+const adjustLocationFields = (locationType: LocationType) => (allFields: AllFields) => {
+	const locationField = allFields[locationType];
+
+	if (!locationField) return allFields;
+
+	return {
+		...omit(locationType, allFields),
+		...locationField.address_fields,
+	};
+};
+
+const adjustAddressFields = adjustLocationFields('Address');
+const adjustBillingAddressFields = adjustLocationFields('Billing_Address');
+const adjustMailingAddressFields = adjustLocationFields('Mailing_Address');
+const adjustShippingAddressFields = adjustLocationFields('Shipping_Address');
+const adjustOtherAddressFields = adjustLocationFields('Other_Address');
+
+/**
+ * Remove from a date field the timestamp set by the datepicker.
+ */
+ const adjustDateField = (dateType: DateType) => (allFields: AllFields) => {
+	const dateField = allFields[dateType];
+
+	if (!dateField) return allFields;
+
+	allFields[dateType] = dateField.split('T')[0];
+
+	return allFields;
+};
+
+const adjustDateOfBirthField = adjustDateField('Date_of_Birth');
+const adjustClosingDateField = adjustDateField('Closing_Date');
+const adjustInvoiceDateField = adjustDateField('Invoice_Date');
+const adjustDueDateField = adjustDateField('Due_Date');
+const adjustPurchaseOrderDateField = adjustDateField('PO_Date');
+const adjustValidTillField = adjustDateField('Valid_Till');
+
+/**
+ * Place an ID field's value nested inside the payload.
+ */
+const adjustIdField = (idType: IdType, nameProperty: NameType) => (allFields: AllFields) => {
+	const idValue = allFields[idType];
+
+	if (!idValue) return allFields;
+
+	return {
+		...omit(idType, allFields),
+		[nameProperty]: { id: idValue },
+	};
+};
+
+const adjustAccountIdField = adjustIdField('accountId', 'Account_Name');
+const adjustContactIdField = adjustIdField('contactId', 'Full_Name');
+const adjustDealIdField = adjustIdField('dealId', 'Deal_Name');
+
+const adjustCustomFields = (allFields: AllFields) => {
+	const { customFields, ...rest } = allFields;
+
+	if (!customFields?.customFields.length) return allFields;
+
+	return customFields.customFields.reduce((acc, cur) => {
+		acc[cur.fieldId] = cur.value;
+		return acc;
+	}, rest);
+};
+
+// ----------------------------------------
+//           payload adjusters
+// ----------------------------------------
+
+export const adjustAccountPayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustCustomFields,
+);
+
+export const adjustContactPayload = flow(
+	adjustMailingAddressFields,
+	adjustOtherAddressFields,
+	adjustDateOfBirthField,
+	adjustCustomFields,
+);
+
+export const adjustDealPayload = flow(
+	adjustClosingDateField,
+	adjustCustomFields,
+);
+
+export const adjustInvoicePayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustInvoiceDateField,
+	adjustDueDateField,
+	adjustAccountIdField,
+	adjustCustomFields,
+);
+
+export const adjustInvoicePayloadOnUpdate = flow(
+	adjustInvoicePayload,
+	adjustProductDetailsOnUpdate,
+);
+
+export const adjustLeadPayload = flow(
+	adjustAddressFields,
+	adjustCustomFields,
+);
+
+export const adjustPurchaseOrderPayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustDueDateField,
+	adjustPurchaseOrderDateField,
+	adjustCustomFields,
+);
+
+export const adjustQuotePayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustValidTillField,
+	adjustCustomFields,
+);
+
+export const adjustSalesOrderPayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustDueDateField,
+	adjustAccountIdField,
+	adjustContactIdField,
+	adjustDealIdField,
+	adjustCustomFields,
+);
+
+export const adjustVendorPayload = flow(
+	adjustAddressFields,
+	adjustCustomFields,
+);
+
+export const adjustProductPayload = adjustCustomFields;
+
+// ----------------------------------------
+//               helpers
+// ----------------------------------------
+
+/**
+ * Create a copy of an object without a specific property.
+ */
+const omit = (propertyToOmit: string, { [propertyToOmit]: _, ...remainingObject }) => remainingObject;
+
+/**
+ * Convert items in a Zoho CRM API response into n8n load options.
+ */
+export const toLoadOptions = (items: ResourceItems, nameProperty: NameType) =>
+	items.map((item) => ({ name: item[nameProperty], value: item.id }));
+
+/**
+ * Retrieve all fields for a resource, sorted alphabetically.
+ */
+export async function getFields(
+	this: ILoadOptionsFunctions,
+	resource: SnakeCaseResource,
+	{ onlyCustom } = { onlyCustom: false },
+) {
+	const qs = { module: getModuleName(resource) };
+
+	let { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs) as LoadedFields;
+
+	if (onlyCustom) {
+		fields = fields.filter(({ custom_field }) => custom_field);
+	}
+
+	const options = fields.map(({ field_label, api_name }) => ({ name: field_label, value: api_name }));
+
+	return sortBy(options, o => o.name);
+}
+
+export function getModuleName(resource: string) {
+	const map: { [key: string]: string } = {
+		account: 'Accounts',
+		contact: 'Contacts',
+		deal: 'Deals',
+		invoice: 'Invoices',
+		lead: 'Leads',
+		product: 'Products',
+		purchaseOrder: 'Purchase_Orders',
+		salesOrder: 'Sales_Orders',
+		vendor: 'Vendors',
+		quote: 'Quotes',
+	};
+
+	return map[resource];
+}
+
+export async function getPicklistOptions(
+	this: ILoadOptionsFunctions,
+	resource: string,
+	targetField: string,
+) {
+	const qs = { module: getModuleName(resource) };
+	const responseData = await zohoApiRequest.call(this, 'GET', '/settings/layouts', {}, qs) as LoadedLayouts;
+
+	const	pickListOptions = responseData.layouts[0]
+		.sections.find(section => section.api_name === getSectionApiName(resource))
+		?.fields.find(f => f.api_name === targetField)
+		?.pick_list_values;
+
+	if (!pickListOptions) return [];
+
+	return pickListOptions.map(
+		(option) => ({ name: option.display_value, value: option.actual_value }),
+	);
+}
+
+
+function getSectionApiName(resource: string) {
+	if (resource === 'purchaseOrder') return 'Purchase Order Information';
+	if (resource === 'salesOrder') return 'Sales Order Information';
+
+	return `${capitalizeInitial(resource)} Information`;
+}
+
+/**
+ * Add filter options to a query string object.
+ */
+export const addGetAllFilterOptions = (qs: IDataObject, options: GetAllFilterOptions) => {
+	if (Object.keys(options).length) {
+		const { fields, ...rest } = options;
+		Object.assign(qs, fields && { fields: fields.join(',') }, rest);
+	}
+};
+
+export const capitalizeInitial = (str: string) => str[0].toUpperCase() + str.slice(1);
diff --git a/packages/nodes-base/nodes/Zoho/LeadDescription.ts b/packages/nodes-base/nodes/Zoho/LeadDescription.ts
deleted file mode 100644
index d232098ca7b..00000000000
--- a/packages/nodes-base/nodes/Zoho/LeadDescription.ts
+++ /dev/null
@@ -1,706 +0,0 @@
-import { INodeProperties } from 'n8n-workflow';
-
-export const leadOperations = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-			},
-		},
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a new lead',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a lead',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get data of a lead',
-			},
-			{
-				name: 'Get All',
-				value: 'getAll',
-				description: 'Get data of all leads',
-			},
-			{
-				name: 'Get Fields',
-				value: 'getFields',
-				description: `Get the fields' metadata`,
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a lead',
-			},
-		],
-		default: 'create',
-		description: 'The operation to perform.',
-	},
-] as INodeProperties[];
-
-export const leadFields = [
-
-/* -------------------------------------------------------------------------- */
-/*                                 lead:create                                */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Last Name',
-		name: 'lastName',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'create',
-				],
-			},
-		},
-		description: `User's last name`,
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				operation: [
-					'create',
-				],
-				resource: [
-					'lead',
-				],
-			},
-		},
-		options: [
-			{
-				displayName: 'Annual Revenue',
-				name: 'annualRevenue',
-				type: 'number',
-				typeOptions: {
-					numberPrecision: 2,
-				},
-				default: 0,
-			},
-			{
-				displayName: 'Company',
-				name: 'company',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Email',
-				name: 'email',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Email Opt Out',
-				name: 'emailOptOut',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Fax',
-				name: 'fax',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'First Name',
-				name: 'firstName',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Industry',
-				name: 'industry',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getIndustries',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Is Record Duplicate',
-				name: 'isRecordDuplicate',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Lead Source',
-				name: 'leadSource',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getLeadSources',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Lead Status',
-				name: 'leadStatus',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getLeadStatuses',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Mobile',
-				name: 'mobile',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'No. of Employees',
-				name: 'numberOfEmployees',
-				type: 'number',
-				default: 1,
-			},
-			{
-				displayName: 'Owner',
-				name: 'owner',
-				type: 'options',
-				default: '',
-				typeOptions: {
-					loadOptionsMethod: 'getUsers',
-				},
-			},
-			{
-				displayName: 'Phone',
-				name: 'phone',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Salutation',
-				name: 'salutation',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Secondary Email',
-				name: 'secondaryEmail',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Skype ID',
-				name: 'SkypeId',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Title',
-				name: 'title',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Twitter',
-				name: 'twitter',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Website',
-				name: 'website',
-				type: 'string',
-				default: '',
-			},
-		],
-	},
-	{
-		displayName: 'Address',
-		name: 'addressUi',
-		type: 'fixedCollection',
-		default: {},
-		placeholder: 'Add Address',
-		typeOptions: {
-			multipleValues: false,
-		},
-		required: false,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'create',
-				],
-			},
-		},
-		options: [
-			{
-				name: 'addressValues',
-				displayName: 'Address',
-				values: [
-					{
-						displayName: 'Street',
-						name: 'street',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'City',
-						name: 'city',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'State',
-						name: 'state',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Country',
-						name: 'country',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Zip Code',
-						name: 'zipCode',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-/* -------------------------------------------------------------------------- */
-/*                                 lead:update                                */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Lead ID',
-		name: 'leadId',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-	},
-	{
-			displayName: 'Additional Fields',
-			name: 'additionalFields',
-			type: 'collection',
-			placeholder: 'Add Field',
-			default: {},
-			displayOptions: {
-				show: {
-					operation: [
-						'update',
-					],
-					resource: [
-						'lead',
-					],
-				},
-			},
-			options: [
-				{
-					displayName: 'Annual Revenue',
-					name: 'annualRevenue',
-					type: 'number',
-					typeOptions: {
-						numberPrecision: 2,
-					},
-					default: 0,
-				},
-				{
-					displayName: 'Company',
-					name: 'company',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Description',
-					name: 'description',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Email',
-					name: 'email',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Email Opt Out',
-					name: 'emailOptOut',
-					type: 'boolean',
-					default: false,
-				},
-				{
-					displayName: 'Fax',
-					name: 'fax',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'First Name',
-					name: 'firstName',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Industry',
-					name: 'industry',
-					type: 'options',
-					typeOptions: {
-						loadOptionsMethod: 'getIndustries',
-					},
-					default: '',
-				},
-				{
-					displayName: 'Is Record Duplicate',
-					name: 'isRecordDuplicate',
-					type: 'boolean',
-					default: false,
-				},
-				{
-					displayName: 'Last Name',
-					name: 'lastName',
-					type: 'string',
-					default: '',
-					description: `User's last name`,
-				},
-				{
-					displayName: 'Lead Source',
-					name: 'leadSource',
-					type: 'options',
-					typeOptions: {
-						loadOptionsMethod: 'getLeadSources',
-					},
-					default: '',
-				},
-				{
-					displayName: 'Lead Status',
-					name: 'leadStatus',
-					type: 'options',
-					typeOptions: {
-						loadOptionsMethod: 'getLeadStatuses',
-					},
-					default: '',
-				},
-				{
-					displayName: 'Mobile',
-					name: 'mobile',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'No. of Employees',
-					name: 'numberOfEmployees',
-					type: 'number',
-					default: 1,
-				},
-				{
-					displayName: 'Owner',
-					name: 'owner',
-					type: 'options',
-					default: '',
-					typeOptions: {
-						loadOptionsMethod: 'getUsers',
-					},
-				},
-				{
-					displayName: 'Phone',
-					name: 'phone',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Salutation',
-					name: 'salutation',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Secondary Email',
-					name: 'secondaryEmail',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Skype ID',
-					name: 'SkypeId',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Title',
-					name: 'title',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Twitter',
-					name: 'twitter',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Website',
-					name: 'website',
-					type: 'string',
-					default: '',
-				},
-			],
-	},
-	{
-		displayName: 'Address',
-		name: 'addressUi',
-		type: 'fixedCollection',
-		default: {},
-		placeholder: 'Add Address',
-		typeOptions: {
-			multipleValues: false,
-		},
-		required: false,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-		options: [
-			{
-				name: 'addressValues',
-				displayName: 'Address',
-				values: [
-					{
-						displayName: 'Street',
-						name: 'street',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'City',
-						name: 'city',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'State',
-						name: 'state',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Country',
-						name: 'country',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Zip Code',
-						name: 'zipCode',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-/* -------------------------------------------------------------------------- */
-/*                                 lead:get                                   */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Lead ID',
-		name: 'leadId',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'get',
-				],
-			},
-		},
-	},
-/* -------------------------------------------------------------------------- */
-/*                                 lead:getAll                                */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'getAll',
-				],
-			},
-		},
-		default: false,
-		description: 'If all results should be returned or only up to a given limit.',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'getAll',
-				],
-				returnAll: [
-					false,
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 200,
-		},
-		default: 100,
-		description: 'How many results to return.',
-	},
-	{
-		displayName: 'Options',
-		name: 'options',
-		type: 'collection',
-		placeholder: 'Add Option',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'getAll',
-				],
-			},
-		},
-		options: [
-			{
-				displayName: 'Approved',
-				name: 'approved',
-				type: 'boolean',
-				default: true,
-				description: 'To get the list of approved records. Default value is true.',
-			},
-			{
-				displayName: 'Converted',
-				name: 'converted',
-				type: 'boolean',
-				default: false,
-				description: 'To get the list of converted records. Default value is false',
-			},
-			{
-				displayName: 'Fields',
-				name: 'fields',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getLeadFields',
-				},
-				default: [],
-			},
-			{
-				displayName: 'Include Child',
-				name: 'includeChild',
-				type: 'boolean',
-				default: false,
-				description: 'To include records from the child territories. True includes child territory records',
-			},
-			{
-				displayName: 'Sort By',
-				name: 'sortBy',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getLeadFields',
-				},
-				default: [],
-			},
-			{
-				displayName: 'Sort Order',
-				name: 'sortOrder',
-				type: 'options',
-				options: [
-					{
-						name: 'ASC',
-						value: 'asc',
-					},
-					{
-						name: 'DESC',
-						value: 'desc',
-					},
-				],
-				default: 'desc',
-				description: 'Order sort attribute ascending or descending.',
-			},
-			{
-				displayName: 'Territory ID',
-				name: 'territoryId',
-				type: 'string',
-				default: '',
-				description: 'To get the list of records based on the territory	',
-			},
-		],
-	},
-/* -------------------------------------------------------------------------- */
-/*                                 lead:delete                                */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Lead ID',
-		name: 'leadId',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'delete',
-				],
-			},
-		},
-	},
-] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/LeadInterface.ts b/packages/nodes-base/nodes/Zoho/LeadInterface.ts
deleted file mode 100644
index 957f816cb65..00000000000
--- a/packages/nodes-base/nodes/Zoho/LeadInterface.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export interface ILead {
-	Annual_Revenue?: number;
-	City?: string;
-	Company?: string;
-	Country?: string;
-	Description?: string;
-	Designation?: string;
-	Email?: string;
-	Email_Opt_Out?: boolean;
-	Fax?: string;
-	First_Name?: string;
-	Industry?: string;
-	Is_Record_Duplicate?: boolean;
-	Last_Name?: string;
-	Lead_Owner?: string;
-	Lead_Source?: string;
-	Lead_Status?: string;
-	Mobile?: string;
-	No_of_Employees?: number;
-	Phone?: string;
-	Salutation?: string;
-	Secondary_Email?: string;
-	Skype_ID?: string;
-	State?: string;
-	Street?: string;
-	Twitter?: string;
-	Website?: string;
-	Zip_Code?: string;
-}
-
-export interface IAddress {
-	street?: string;
-	city?: string;
-	state?: string;
-	country?: string;
-	zipCode?: string;
-}
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index 8380f56049a..ec0a90e16fa 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -6,37 +6,80 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
-	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
+	addGetAllFilterOptions,
+	adjustAccountPayload,
+	adjustContactPayload,
+	adjustDealPayload,
+	adjustInvoicePayload,
+	adjustInvoicePayloadOnUpdate,
+	adjustLeadPayload,
+	adjustProductDetails,
+	adjustProductPayload,
+	adjustPurchaseOrderPayload,
+	adjustQuotePayload,
+	adjustSalesOrderPayload,
+	adjustVendorPayload,
+	getFields,
+	getModuleName,
+	getPicklistOptions,
+	handleListing,
+	throwOnEmptyUpdate,
+	throwOnMissingProducts,
+	toLoadOptions,
 	zohoApiRequest,
 	zohoApiRequestAllItems,
 } from './GenericFunctions';
 
 import {
-	leadFields,
-	leadOperations,
-} from './LeadDescription';
+	CamelCaseResource,
+	GetAllFilterOptions,
+	LoadedAccounts,
+	LoadedContacts,
+	LoadedDeals,
+	LoadedProducts,
+	LoadedVendors,
+	ProductDetails,
+} from './types';
 
 import {
-	IAddress,
-	ILead,
-} from './LeadInterface';
+	accountFields,
+	accountOperations,
+	contactFields,
+	contactOperations,
+	dealFields,
+	dealOperations,
+	invoiceFields,
+	invoiceOperations,
+	leadFields,
+	leadOperations,
+	productFields,
+	productOperations,
+	purchaseOrderFields,
+	purchaseOrderOperations,
+	quoteFields,
+	quoteOperations,
+	salesOrderFields,
+	salesOrderOperations,
+	vendorFields,
+	vendorOperations,
+} from './descriptions';
 
 export class ZohoCrm implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Zoho CRM',
 		name: 'zohoCrm',
 		icon: 'file:zoho.svg',
+		group: ['transform'],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		group: ['input'],
 		version: 1,
-		description: 'Consume Zoho CRM API.',
+		description: 'Consume Zoho CRM API',
 		defaults: {
-			name: 'Zoho CRM',
+			name: 'Zoho',
 			color: '#CE2232',
 		},
 		inputs: ['main'],
@@ -53,134 +96,222 @@ export class ZohoCrm implements INodeType {
 				name: 'resource',
 				type: 'options',
 				options: [
+					{
+						name: 'Account',
+						value: 'account',
+					},
+					{
+						name: 'Contact',
+						value: 'contact',
+					},
+					{
+						name: 'Deal',
+						value: 'deal',
+					},
+					{
+						name: 'Invoice',
+						value: 'invoice',
+					},
 					{
 						name: 'Lead',
 						value: 'lead',
 					},
+					{
+						name: 'Product',
+						value: 'product',
+					},
+					{
+						name: 'Purchase Order',
+						value: 'purchaseOrder',
+					},
+					{
+						name: 'Quote',
+						value: 'quote',
+					},
+					{
+						name: 'Sales Order',
+						value: 'salesOrder',
+					},
+					{
+						name: 'Vendor',
+						value: 'vendor',
+					},
 				],
-				default: 'lead',
-				description: 'The resource to operate on.',
+				default: 'account',
+				description: 'Resource to consume',
 			},
+			...accountOperations,
+			...accountFields,
+			...contactOperations,
+			...contactFields,
+			...dealOperations,
+			...dealFields,
+			...invoiceOperations,
+			...invoiceFields,
 			...leadOperations,
 			...leadFields,
+			...productOperations,
+			...productFields,
+			...purchaseOrderOperations,
+			...purchaseOrderFields,
+			...quoteOperations,
+			...quoteFields,
+			...salesOrderOperations,
+			...salesOrderFields,
+			...vendorOperations,
+			...vendorFields,
 		],
 	};
 
 	methods = {
 		loadOptions: {
-			// Get all the available users to display them to user so that he can
-			// select them easily
-			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const { users } = await zohoApiRequest.call(this, 'GET', '/users', {}, { type: 'AllUsers' });
-				for (const user of users) {
-					const userName = `${user.first_name} ${user.last_name}`;
-					const userId = user.profile.id;
-					returnData.push({
-						name: userName,
-						value: userId,
-					});
-				}
-				return returnData;
+			// ----------------------------------------
+			//               resources
+			// ----------------------------------------
+
+			async getAccounts(this: ILoadOptionsFunctions) {
+				const accounts = await zohoApiRequestAllItems.call(this, 'GET', '/accounts') as LoadedAccounts;
+				return toLoadOptions(accounts, 'Account_Name');
 			},
-			// Get all the available accounts to display them to user so that he can
-			// select them easily
-			async getAccounts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.sort_by = 'Created_Time';
-				qs.sort_order = 'desc';
-				const { data } = await zohoApiRequest.call(this, 'GET', '/accounts', {}, qs);
-				for (const account of data) {
-					const accountName = account.Account_Name;
-					const accountId = account.id;
-					returnData.push({
-						name: accountName,
-						value: accountId,
-					});
-				}
-				return returnData;
+
+			async getContacts(this: ILoadOptionsFunctions) {
+				const contacts = await zohoApiRequestAllItems.call(this, 'GET', '/contacts') as LoadedContacts;
+				return toLoadOptions(contacts, 'Full_Name');
 			},
-			// Get all the available lead statuses to display them to user so that he can
-			// select them easily
-			async getLeadStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.module = 'leads';
-				const { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-				for (const field of fields) {
-					if (field.api_name === 'Lead_Status') {
-						for (const value of field.pick_list_values) {
-							const valueName = value.display_value;
-							const valueId = value.actual_value;
-							returnData.push({
-								name: valueName,
-								value: valueId,
-							});
-							return returnData;
-						}
-					}
-				}
-				return returnData;
+
+			async getDeals(this: ILoadOptionsFunctions) {
+				const deals = await zohoApiRequestAllItems.call(this, 'GET', '/deals') as LoadedDeals;
+				return toLoadOptions(deals, 'Deal_Name');
 			},
-			// Get all the available lead sources to display them to user so that he can
-			// select them easily
-			async getLeadSources(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.module = 'leads';
-				const { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-				for (const field of fields) {
-					if (field.api_name === 'Lead_Source') {
-						for (const value of field.pick_list_values) {
-							const valueName = value.display_value;
-							const valueId = value.actual_value;
-							returnData.push({
-								name: valueName,
-								value: valueId,
-							});
-							return returnData;
-						}
-					}
-				}
-				return returnData;
+
+			async getProducts(this: ILoadOptionsFunctions) {
+				const products = await zohoApiRequestAllItems.call(this, 'GET', '/products') as LoadedProducts;
+				return toLoadOptions(products, 'Product_Name');
 			},
-			// Get all the available industries to display them to user so that he can
-			// select them easily
-			async getIndustries(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.module = 'leads';
-				const { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-				for (const field of fields) {
-					if (field.api_name === 'Industry') {
-						for (const value of field.pick_list_values) {
-							const valueName = value.display_value;
-							const valueId = value.actual_value;
-							returnData.push({
-								name: valueName,
-								value: valueId,
-							});
-							return returnData;
-						}
-					}
-				}
-				return returnData;
+
+			async getVendors(this: ILoadOptionsFunctions) {
+				const vendors = await zohoApiRequestAllItems.call(this, 'GET', '/vendors') as LoadedVendors;
+				return toLoadOptions(vendors, 'Vendor_Name');
 			},
-			// Get all the available lead fields to display them to user so that he can
-			// select them easily
-			async getLeadFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.module = 'leads';
-				const { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-				for (const field of fields) {
-					returnData.push({
-						name: field.field_label,
-						value: field.api_name,
-					});
-				}
-				return returnData;
+
+			// ----------------------------------------
+			//             resource fields
+			// ----------------------------------------
+
+			// standard fields - called from `makeGetAllFields`
+
+			async getAccountFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'account');
+			},
+
+			async getContactFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'contact');
+			},
+
+			async getDealFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'deal');
+			},
+
+			async getInvoiceFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'invoice');
+			},
+
+			async getLeadFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'lead');
+			},
+
+			async getProductFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'product');
+			},
+
+			async getPurchaseOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'purchase_order');
+			},
+
+			async getVendorOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'vendor');
+			},
+
+			async getQuoteFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'quote');
+			},
+
+			async getSalesOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'sales_order');
+			},
+
+			async getVendorFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'vendor');
+			},
+
+			// custom fields
+
+			async getCustomAccountFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'account', { onlyCustom: true });
+			},
+
+			async getCustomContactFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'contact', { onlyCustom: true });
+			},
+
+			async getCustomDealFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'deal', { onlyCustom: true });
+			},
+
+			async getCustomInvoiceFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'invoice', { onlyCustom: true });
+			},
+
+			async getCustomLeadFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'lead', { onlyCustom: true });
+			},
+
+			async getCustomProductFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'product', { onlyCustom: true });
+			},
+
+			async getCustomPurchaseOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'purchase_order', { onlyCustom: true });
+			},
+
+			async getCustomVendorOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'vendor', { onlyCustom: true });
+			},
+
+			async getCustomQuoteFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'quote', { onlyCustom: true });
+			},
+
+			async getCustomSalesOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'sales_order', { onlyCustom: true });
+			},
+
+			async getCustomVendorFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'vendor', { onlyCustom: true });
+			},
+
+			// ----------------------------------------
+			//        resource picklist options
+			// ----------------------------------------
+
+			async getAccountType(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'account', 'Account_Type');
+			},
+
+			async getDealStage(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'deal', 'Stage');
+			},
+
+			async getPurchaseOrderStatus(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'purchaseOrder', 'Status');
+			},
+
+			async getSalesOrderStatus(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'salesOrder', 'Status');
+			},
+
+			async getQuoteStage(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'quote', 'Quote_Stage');
 			},
 		},
 	};
@@ -188,265 +319,1147 @@ export class ZohoCrm implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: IDataObject[] = [];
-		const length = items.length as unknown as number;
-		const qs: IDataObject = {};
+
+		const resource = this.getNodeParameter('resource', 0) as CamelCaseResource;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		const resolveData = this.getNodeParameter('resolveData', 0, false) as boolean;
+
 		let responseData;
-		for (let i = 0; i < length; i++) {
-			const resource = this.getNodeParameter('resource', 0) as string;
-			const operation = this.getNodeParameter('operation', 0) as string;
-			if (resource === 'lead') {
-				//https://www.zoho.com/crm/developer/docs/api/insert-records.html
-				if (operation === 'create') {
-					const lastName = this.getNodeParameter('lastName', i) as string;
-					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
-					const body: ILead = {
-						Last_Name: lastName,
-					};
-					if (additionalFields.owner) {
-						body.Lead_Owner = additionalFields.owner as string;
-					}
-					if (additionalFields.company) {
-						body.Company = additionalFields.company as string;
-					}
-					if (additionalFields.firstName) {
-						body.First_Name = additionalFields.firstName as string;
-					}
-					if (additionalFields.email) {
-						body.Email = additionalFields.email as string;
-					}
-					if (additionalFields.title) {
-						body.Designation = additionalFields.title as string;
-					}
-					if (additionalFields.phone) {
-						body.Phone = additionalFields.phone as string;
-					}
-					if (additionalFields.mobile) {
-						body.Mobile = additionalFields.mobile as string;
-					}
-					if (additionalFields.leadStatus) {
-						body.Lead_Status = additionalFields.leadStatus as string;
-					}
-					if (additionalFields.fax) {
-						body.Fax = additionalFields.fax as string;
-					}
-					if (additionalFields.website) {
-						body.Website = additionalFields.website as string;
-					}
-					if (additionalFields.leadSource) {
-						body.Lead_Source = additionalFields.leadSource as string;
-					}
-					if (additionalFields.industry) {
-						body.Industry = additionalFields.industry as string;
-					}
-					if (additionalFields.numberOfEmployees) {
-						body.No_of_Employees = additionalFields.numberOfEmployees as number;
-					}
-					if (additionalFields.annualRevenue) {
-						body.Annual_Revenue = additionalFields.annualRevenue as number;
-					}
-					if (additionalFields.emailOptOut) {
-						body.Email_Opt_Out = additionalFields.emailOptOut as boolean;
-					}
-					if (additionalFields.skypeId) {
-						body.Skype_ID = additionalFields.skypeId as string;
-					}
-					if (additionalFields.salutation) {
-						body.Salutation = additionalFields.salutation as string;
-					}
-					if (additionalFields.secondaryEmail) {
-						body.Secondary_Email = additionalFields.secondaryEmail as string;
-					}
-					if (additionalFields.twitter) {
-						body.Twitter = additionalFields.twitter as string;
-					}
-					if (additionalFields.isRecordDuplicate) {
-						body.Is_Record_Duplicate = additionalFields.isRecordDuplicate as boolean;
-					}
-					if (additionalFields.description) {
-						body.Description = additionalFields.description as string;
-					}
-					const address = (this.getNodeParameter('addressUi', i) as IDataObject).addressValues as IAddress;
-					if (address) {
-						if (address.country) {
-							body.Country = address.country as string;
-						}
-						if (address.city) {
-							body.City = address.city as string;
-						}
-						if (address.state) {
-							body.State = address.state as string;
-						}
-						if (address.street) {
-							body.Street = address.street as string;
-						}
-						if (address.zipCode) {
-							body.Zip_Code = address.zipCode as string;
-						}
-					}
-					responseData = await zohoApiRequest.call(this, 'POST', '/leads', body);
-					responseData = responseData.data;
 
-					if (responseData.length) {
-						responseData = responseData[0].details;
-					}
-				}
-				//https://www.zoho.com/crm/developer/docs/api/update-specific-record.html
-				if (operation === 'update') {
-					const leadId = this.getNodeParameter('leadId', i) as string;
-					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
-					const body: ILead = {};
-					if (additionalFields.lastName) {
-						body.Last_Name = additionalFields.lastName as string;
-					}
-					if (additionalFields.owner) {
-						body.Lead_Owner = additionalFields.owner as string;
-					}
-					if (additionalFields.company) {
-						body.Company = additionalFields.company as string;
-					}
-					if (additionalFields.firstName) {
-						body.First_Name = additionalFields.firstName as string;
-					}
-					if (additionalFields.email) {
-						body.Email = additionalFields.email as string;
-					}
-					if (additionalFields.title) {
-						body.Designation = additionalFields.title as string;
-					}
-					if (additionalFields.phone) {
-						body.Phone = additionalFields.phone as string;
-					}
-					if (additionalFields.mobile) {
-						body.Mobile = additionalFields.mobile as string;
-					}
-					if (additionalFields.leadStatus) {
-						body.Lead_Status = additionalFields.leadStatus as string;
-					}
-					if (additionalFields.fax) {
-						body.Fax = additionalFields.fax as string;
-					}
-					if (additionalFields.website) {
-						body.Website = additionalFields.website as string;
-					}
-					if (additionalFields.leadSource) {
-						body.Lead_Source = additionalFields.leadSource as string;
-					}
-					if (additionalFields.industry) {
-						body.Industry = additionalFields.industry as string;
-					}
-					if (additionalFields.numberOfEmployees) {
-						body.No_of_Employees = additionalFields.numberOfEmployees as number;
-					}
-					if (additionalFields.annualRevenue) {
-						body.Annual_Revenue = additionalFields.annualRevenue as number;
-					}
-					if (additionalFields.emailOptOut) {
-						body.Email_Opt_Out = additionalFields.emailOptOut as boolean;
-					}
-					if (additionalFields.skypeId) {
-						body.Skype_ID = additionalFields.skypeId as string;
-					}
-					if (additionalFields.salutation) {
-						body.Salutation = additionalFields.salutation as string;
-					}
-					if (additionalFields.secondaryEmail) {
-						body.Secondary_Email = additionalFields.secondaryEmail as string;
-					}
-					if (additionalFields.twitter) {
-						body.Twitter = additionalFields.twitter as string;
-					}
-					if (additionalFields.isRecordDuplicate) {
-						body.Is_Record_Duplicate = additionalFields.isRecordDuplicate as boolean;
-					}
-					if (additionalFields.description) {
-						body.Description = additionalFields.description as string;
-					}
-					const address = (this.getNodeParameter('addressUi', i) as IDataObject).addressValues as IAddress;
-					if (address) {
-						if (address.country) {
-							body.Country = address.country as string;
-						}
-						if (address.city) {
-							body.City = address.city as string;
-						}
-						if (address.state) {
-							body.State = address.state as string;
-						}
-						if (address.street) {
-							body.Street = address.street as string;
-						}
-						if (address.zipCode) {
-							body.Zip_Code = address.zipCode as string;
-						}
-					}
-					responseData = await zohoApiRequest.call(this, 'PUT', `/leads/${leadId}`, body);
-					responseData = responseData.data;
+		for (let i = 0; i < items.length; i++) {
 
-					if (responseData.length) {
-						responseData = responseData[0].details;
-					}
-				}
-				//https://www.zoho.com/crm/developer/docs/api/update-specific-record.html
-				if (operation === 'get') {
-					const leadId = this.getNodeParameter('leadId', i) as string;
-					responseData = await zohoApiRequest.call(this, 'GET', `/leads/${leadId}`);
-					if (responseData !== undefined) {
+			// https://www.zoho.com/crm/developer/docs/api/insert-records.html
+			// https://www.zoho.com/crm/developer/docs/api/get-records.html
+			// https://www.zoho.com/crm/developer/docs/api/update-specific-record.html
+			// https://www.zoho.com/crm/developer/docs/api/delete-specific-record.html
+			// https://www.zoho.com/crm/developer/docs/api/v2/upsert-records.html
+
+			try {
+
+				if (resource === 'account') {
+
+					// **********************************************************************
+					//                                account
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/accounts-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Accounts
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//             account: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Account_Name: this.getNodeParameter('accountName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustAccountPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/accounts', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//             account: delete
+						// ----------------------------------------
+
+						const accountId = this.getNodeParameter('accountId', i);
+
+						const endpoint = `/accounts/${accountId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//               account: get
+						// ----------------------------------------
+
+						const accountId = this.getNodeParameter('accountId', i);
+
+						const endpoint = `/accounts/${accountId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
 						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//             account: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/accounts', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//             account: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustAccountPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const accountId = this.getNodeParameter('accountId', i);
+
+						const endpoint = `/accounts/${accountId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             account: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Account_Name: this.getNodeParameter('accountName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustAccountPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/accounts/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'contact') {
+
+					// **********************************************************************
+					//                                contact
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/contacts-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Contacts
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//             contact: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Last_Name: this.getNodeParameter('lastName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustContactPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/contacts', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//             contact: delete
+						// ----------------------------------------
+
+						const contactId = this.getNodeParameter('contactId', i);
+
+						const endpoint = `/contacts/${contactId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//               contact: get
+						// ----------------------------------------
+
+						const contactId = this.getNodeParameter('contactId', i);
+
+						const endpoint = `/contacts/${contactId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//             contact: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/contacts', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//             contact: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustContactPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const contactId = this.getNodeParameter('contactId', i);
+
+						const endpoint = `/contacts/${contactId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             contact: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Last_Name: this.getNodeParameter('lastName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustContactPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/contacts/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'deal') {
+
+					// **********************************************************************
+					//                                deal
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/deals-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Deals
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//               deal: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Deal_Name: this.getNodeParameter('dealName', i),
+							Stage: this.getNodeParameter('stage', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustDealPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/deals', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//               deal: delete
+						// ----------------------------------------
+
+						const dealId = this.getNodeParameter('dealId', i);
+
+						responseData = await zohoApiRequest.call(this, 'DELETE', `/deals/${dealId}`);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                deal: get
+						// ----------------------------------------
+
+						const dealId = this.getNodeParameter('dealId', i);
+
+						responseData = await zohoApiRequest.call(this, 'GET', `/deals/${dealId}`);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//               deal: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/deals', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//               deal: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustDealPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const dealId = this.getNodeParameter('dealId', i);
+
+						responseData = await zohoApiRequest.call(this, 'PUT', `/deals/${dealId}`, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//              deal: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Deal_Name: this.getNodeParameter('dealName', i),
+							Stage: this.getNodeParameter('stage', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustDealPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/deals/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'invoice') {
+
+					// **********************************************************************
+					//                                invoice
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/invoices-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Invoices
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//             invoice: create
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						throwOnMissingProducts.call(this, resource, productDetails);
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustInvoicePayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/invoices', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//             invoice: delete
+						// ----------------------------------------
+
+						const invoiceId = this.getNodeParameter('invoiceId', i);
+
+						const endpoint = `/invoices/${invoiceId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//               invoice: get
+						// ----------------------------------------
+
+						const invoiceId = this.getNodeParameter('invoiceId', i);
+
+						const endpoint = `/invoices/${invoiceId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//             invoice: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/invoices', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//             invoice: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustInvoicePayloadOnUpdate(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const invoiceId = this.getNodeParameter('invoiceId', i);
+
+						const endpoint = `/invoices/${invoiceId}`;
+
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             invoice: upsert
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustInvoicePayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/invoices/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'lead') {
+
+					// **********************************************************************
+					//                                  lead
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/leads-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Leads
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//               lead: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Company: this.getNodeParameter('Company', i),
+							Last_Name: this.getNodeParameter('lastName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustLeadPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/leads', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//               lead: delete
+						// ----------------------------------------
+
+						const leadId = this.getNodeParameter('leadId', i);
+
+						responseData = await zohoApiRequest.call(this, 'DELETE', `/leads/${leadId}`);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                lead: get
+						// ----------------------------------------
+
+						const leadId = this.getNodeParameter('leadId', i);
+
+						responseData = await zohoApiRequest.call(this, 'GET', `/leads/${leadId}`);
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//               lead: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/leads', {}, qs);
+
+					} else if (operation === 'getFields') {
+
+						// ----------------------------------------
+						//            lead: getFields
+						// ----------------------------------------
+
+						responseData = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, { module: 'leads' });
+						responseData = responseData.fields;
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//               lead: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustLeadPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const leadId = this.getNodeParameter('leadId', i);
+
+						responseData = await zohoApiRequest.call(this, 'PUT', `/leads/${leadId}`, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//              lead: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Company: this.getNodeParameter('Company', i),
+							Last_Name: this.getNodeParameter('lastName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustLeadPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/leads/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'product') {
+
+					// **********************************************************************
+					//                              product
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/products-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Products
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//             product: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Product_Name: this.getNodeParameter('productName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustProductPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/products', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//            product: delete
+						// ----------------------------------------
+
+						const productId = this.getNodeParameter('productId', i);
+
+						const endpoint = `/products/${productId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//              product: get
+						// ----------------------------------------
+
+						const productId = this.getNodeParameter('productId', i);
+
+						const endpoint = `/products/${productId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//            product: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/products', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//            product: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustProductPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const productId = this.getNodeParameter('productId', i);
+
+						const endpoint = `/products/${productId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             product: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Product_Name: this.getNodeParameter('productName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustProductPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/products/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'purchaseOrder') {
+
+					// **********************************************************************
+					//                             purchaseOrder
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/purchase-orders-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Purchase_Order
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//          purchaseOrder: create
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						throwOnMissingProducts.call(this, resource, productDetails);
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Vendor_Name: { id: this.getNodeParameter('vendorId', i) },
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustPurchaseOrderPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/purchase_orders', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//          purchaseOrder: delete
+						// ----------------------------------------
+
+						const purchaseOrderId = this.getNodeParameter('purchaseOrderId', i);
+
+						const endpoint = `/purchase_orders/${purchaseOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//            purchaseOrder: get
+						// ----------------------------------------
+
+						const purchaseOrderId = this.getNodeParameter('purchaseOrderId', i);
+
+						const endpoint = `/purchase_orders/${purchaseOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//          purchaseOrder: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/purchase_orders', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//          purchaseOrder: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustPurchaseOrderPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const purchaseOrderId = this.getNodeParameter('purchaseOrderId', i);
+
+						const endpoint = `/purchase_orders/${purchaseOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//          purchaseOrder: upsert
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Vendor_Name: { id: this.getNodeParameter('vendorId', i) },
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustPurchaseOrderPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/purchase_orders/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'quote') {
+
+					// **********************************************************************
+					//                                 quote
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/quotes-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Quotes
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//              quote: create
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						throwOnMissingProducts.call(this, resource, productDetails);
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustQuotePayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/quotes', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//              quote: delete
+						// ----------------------------------------
+
+						const quoteId = this.getNodeParameter('quoteId', i);
+
+						responseData = await zohoApiRequest.call(this, 'DELETE', `/quotes/${quoteId}`);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                quote: get
+						// ----------------------------------------
+
+						const quoteId = this.getNodeParameter('quoteId', i);
+
+						responseData = await zohoApiRequest.call(this, 'GET', `/quotes/${quoteId}`);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//              quote: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/quotes', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//              quote: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustQuotePayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const quoteId = this.getNodeParameter('quoteId', i);
+
+						responseData = await zohoApiRequest.call(this, 'PUT', `/quotes/${quoteId}`, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//              quote: upsert
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustQuotePayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/quotes/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'salesOrder') {
+
+					// **********************************************************************
+					//                               salesOrder
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/sales-orders-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Sales_Orders
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//            salesOrder: create
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Account_Name: { id: this.getNodeParameter('accountId', i) },
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustSalesOrderPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/sales_orders', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//            salesOrder: delete
+						// ----------------------------------------
+
+						const salesOrderId = this.getNodeParameter('salesOrderId', i);
+
+						const endpoint = `/sales_orders/${salesOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//             salesOrder: get
+						// ----------------------------------------
+
+						const salesOrderId = this.getNodeParameter('salesOrderId', i);
+
+						const endpoint = `/sales_orders/${salesOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//            salesOrder: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/sales_orders', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//            salesOrder: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustSalesOrderPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const salesOrderId = this.getNodeParameter('salesOrderId', i);
+
+						const endpoint = `/sales_orders/${salesOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//           salesOrder: upsert
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Account_Name: { id: this.getNodeParameter('accountId', i) },
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustSalesOrderPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/sales_orders/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'vendor') {
+
+					// **********************************************************************
+					//                               vendor
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/vendors-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Vendors
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//            vendor: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Vendor_Name: this.getNodeParameter('vendorName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustVendorPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/vendors', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//            vendor: delete
+						// ----------------------------------------
+
+						const vendorId = this.getNodeParameter('vendorId', i);
+
+						const endpoint = `/vendors/${vendorId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//             vendor: get
+						// ----------------------------------------
+
+						const vendorId = this.getNodeParameter('vendorId', i);
+
+						const endpoint = `/vendors/${vendorId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//            vendor: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/vendors', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//            vendor: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustVendorPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const vendorId = this.getNodeParameter('vendorId', i);
+
+						const endpoint = `/vendors/${vendorId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             vendor: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Vendor_Name: this.getNodeParameter('vendorName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustVendorPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/vendors/upsert', body);
+						responseData = responseData.data[0].details;
+
 					}
 
 				}
-				//https://www.zoho.com/crm/developer/docs/api/get-records.html
-				if (operation === 'getAll') {
-					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
-					const options = this.getNodeParameter('options', i) as IDataObject;
-					if (options.fields) {
-						qs.fields = (options.fields as string[]).join(',');
-					}
-					if (options.approved) {
-						qs.approved = options.approved as boolean;
-					}
-					if (options.converted) {
-						qs.converted = options.converted as boolean;
-					}
-					if (options.includeChild) {
-						qs.include_child = options.includeChild as boolean;
-					}
-					if (options.sortOrder) {
-						qs.sort_order = options.sortOrder as string;
-					}
-					if (options.sortBy) {
-						qs.sort_by = options.sortBy as string;
-					}
-					if (options.territoryId) {
-						qs.territory_id = options.territoryId as string;
-					}
-					if (returnAll) {
-						responseData = await zohoApiRequestAllItems.call(this, 'data', 'GET', '/leads', {}, qs);
-					} else {
-						qs.per_page = this.getNodeParameter('limit', i) as number;
-						responseData = await zohoApiRequest.call(this, 'GET', '/leads', {}, qs);
-						responseData = responseData.data;
-					}
-				}
-				//https://www.zoho.com/crm/developer/docs/api/delete-specific-record.html
-				if (operation === 'delete') {
-					const leadId = this.getNodeParameter('leadId', i) as string;
-					responseData = await zohoApiRequest.call(this, 'DELETE', `/leads/${leadId}`);
-					responseData = responseData.data;
-				}
-				//https://www.zoho.com/crm/developer/docs/api/field-meta.html
-				if (operation === 'getFields') {
-					qs.module = 'leads';
-					responseData = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-					responseData = responseData.fields;
+
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ error: error.message });
+					continue;
 				}
+
+				throw error;
 			}
-			if (Array.isArray(responseData)) {
-				returnData.push.apply(returnData, responseData as IDataObject[]);
-			} else if (responseData !== undefined) {
-				returnData.push(responseData as IDataObject);
-			}
+
+			Array.isArray(responseData)
+				? returnData.push(...responseData)
+				: returnData.push(responseData);
 		}
+
 		return [this.helpers.returnJsonArray(returnData)];
 	}
 }
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/AccountDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/AccountDescription.ts
new file mode 100644
index 00000000000..6351d49f4db
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/AccountDescription.ts
@@ -0,0 +1,415 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	shippingAddress,
+} from './SharedFields';
+
+export const accountOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an account',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an account',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an account',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all accounts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an account',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const accountFields = [
+	// ----------------------------------------
+	//            account: create
+	// ----------------------------------------
+	{
+		displayName: 'Account Name',
+		name: 'accountName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//          account: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Account Name',
+		name: 'accountName',
+		description: 'Name of the account. If a record with this account name exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//        account: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account Number',
+				name: 'Account_Number',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Account Site',
+				name: 'Account_Site',
+				type: 'string',
+				default: '',
+				description: 'Name of the account’s location, e.g. Headquarters or London.',
+			},
+			{
+				displayName: 'Account Type',
+				name: 'Account_Type',
+				type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getAccountType',
+					},
+				default: [],
+			},
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+			},
+			billingAddress,
+			{
+				displayName: 'Contact Details',
+				name: 'Contact_Details',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('account'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Employees',
+				name: 'Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the account’s company.',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: '',
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			shippingAddress,
+			{
+				displayName: 'Ticker Symbol',
+				name: 'Ticker_Symbol',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             account: delete
+	// ----------------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		description: 'ID of the account to delete. Can be found at the end of the URL.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               account: get
+	// ----------------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		description: 'ID of the account to retrieve. Can be found at the end of the URL.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             account: getAll
+	// ----------------------------------------
+	...makeGetAllFields('account'),
+
+	// ----------------------------------------
+	//             account: update
+	// ----------------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		description: 'ID of the account to update. Can be found at the end of the URL.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account Name',
+				name: 'Account_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Account Number',
+				name: 'Account_Number',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Account Site',
+				name: 'Account_Site',
+				type: 'string',
+				default: '',
+				description: 'Name of the account’s location, e.g. Headquarters or London.',
+			},
+			{
+				displayName: 'Account Type',
+				name: 'Account_Type',
+				type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getAccountType',
+					},
+				default: [],
+			},
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+			},
+			billingAddress,
+			{
+				displayName: 'Contact Details',
+				name: 'Contact_Details',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('account'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Employees',
+				name: 'Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the account’s company.',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: '',
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			shippingAddress,
+			{
+				displayName: 'Ticker Symbol',
+				name: 'Ticker_Symbol',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/ContactDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/ContactDescription.ts
new file mode 100644
index 00000000000..fc58c8f6f43
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/ContactDescription.ts
@@ -0,0 +1,590 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	currencies,
+	mailingAddress,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	otherAddress,
+} from './SharedFields';
+
+export const contactOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a contact',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a contact',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a contact',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all contacts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a contact',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const contactFields = [
+	// ----------------------------------------
+	//             contact: create
+	// ----------------------------------------
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assistant',
+				name: 'Assistant',
+				type: 'string',
+				default: '',
+				description: 'Name of the contact’s assistant.',
+			},
+			makeCustomFieldsFixedCollection('contact'),
+			{
+				displayName: 'Date of Birth',
+				name: 'Date_of_Birth',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Department',
+				name: 'Department',
+				type: 'string',
+				default: '',
+				description: 'Company department to which the contact belongs.',
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Primary)',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Secondary)',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			mailingAddress,
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			otherAddress,
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone (Assistant)',
+				name: 'Asst_Phone',
+				type: 'string',
+				default: '',
+				description: 'Phone number of the contact’s assistant.',
+			},
+			{
+				displayName: 'Phone (Home)',
+				name: 'Home_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone (Other)',
+				name: 'Other_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'Title',
+				type: 'string',
+				default: '',
+				description: 'Position of the contact at their company.',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//           contact: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assistant',
+				name: 'Assistant',
+				type: 'string',
+				default: '',
+				description: 'Name of the contact’s assistant.',
+			},
+			makeCustomFieldsFixedCollection('contact'),
+			{
+				displayName: 'Date of Birth',
+				name: 'Date_of_Birth',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Department',
+				name: 'Department',
+				type: 'string',
+				default: '',
+				description: 'Company department to which the contact belongs.',
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Primary)',
+				name: 'Email',
+				type: 'string',
+				default: '',
+				description: 'Email of the contact. If a record with this email exists it will be updated, otherwise a new one will be created.',
+			},
+			{
+				displayName: 'Email (Secondary)',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			mailingAddress,
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			otherAddress,
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone (Assistant)',
+				name: 'Asst_Phone',
+				type: 'string',
+				default: '',
+				description: 'Phone number of the contact’s assistant.',
+			},
+			{
+				displayName: 'Phone (Home)',
+				name: 'Home_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone (Other)',
+				name: 'Other_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'Title',
+				type: 'string',
+				default: '',
+				description: 'Position of the contact at their company.',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             contact: delete
+	// ----------------------------------------
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		description: 'ID of the contact to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               contact: get
+	// ----------------------------------------
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		description: 'ID of the contact to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             contact: getAll
+	// ----------------------------------------
+	...makeGetAllFields('contact'),
+
+	// ----------------------------------------
+	//             contact: update
+	// ----------------------------------------
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		description: 'ID of the contact to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assistant',
+				name: 'Assistant',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Assistant’s Phone',
+				name: 'Asst_Phone',
+				type: 'string',
+				default: '',
+				description: 'Phone number of the contact’s assistant.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('contact'),
+			{
+				displayName: 'Date of Birth',
+				name: 'Date_of_Birth',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Department',
+				name: 'Department',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Primary)',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Secondary)',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Home Phone',
+				name: 'Home_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'Last_Name',
+				type: 'string',
+				default: '',
+			},
+			mailingAddress,
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			otherAddress,
+			{
+				displayName: 'Other Phone',
+				name: 'Other_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'Title',
+				type: 'string',
+				default: '',
+				description: 'Position of the contact at their company.',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts
new file mode 100644
index 00000000000..312c9b855b7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts
@@ -0,0 +1,385 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+} from './SharedFields';
+
+export const dealOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a deal',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a contact',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a contact',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all contacts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a contact',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const dealFields = [
+	// ----------------------------------------
+	//              deal: create
+	// ----------------------------------------
+	{
+		displayName: 'Deal Name',
+		name: 'dealName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             deal: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Deal Name',
+		name: 'dealName',
+		description: 'Name of the deal. If a record with this deal name exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	// ----------------------------------------
+	//          deal: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Stage',
+		name: 'stage',
+		type: 'options',
+		required: true,
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getDealStage',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'Amount',
+				type: 'number',
+				default: '',
+				description: 'Monetary amount of the deal.',
+			},
+			{
+				displayName: 'Closing Date',
+				name: 'Closing_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('deal'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Lead Conversion Time',
+				name: 'Lead_Conversion_Time',
+				type: 'number',
+				default: '',
+				description: 'Averge number of days to convert the lead into a deal.',
+			},
+			{
+				displayName: 'Next Step',
+				name: 'Next_Step',
+				type: 'string',
+				default: '',
+				description: 'Description of the next step in the sales process.',
+			},
+			{
+				displayName: 'Overall Sales Duration',
+				name: 'Overall_Sales_Duration',
+				type: 'number',
+				default: '',
+				description: 'Averge number of days to convert the lead into a deal and to win the deal.',
+			},
+			{
+				displayName: 'Probability',
+				name: 'Probability',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+					maxValue: 100,
+				},
+				default: '',
+				description: 'Probability of deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			{
+				displayName: 'Sales Cycle Duration',
+				name: 'Sales_Cycle_Duration',
+				type: 'number',
+				default: 0,
+				description: 'Averge number of days for the deal to be won.',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//               deal: delete
+	// ----------------------------------------
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		description: 'ID of the deal to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                deal: get
+	// ----------------------------------------
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		description: 'ID of the deal to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               deal: getAll
+	// ----------------------------------------
+	...makeGetAllFields('deal'),
+
+	// ----------------------------------------
+	//               deal: update
+	// ----------------------------------------
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		description: 'ID of the deal to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'Amount',
+				type: 'number',
+				default: '',
+				description: 'Monetary amount of the deal.',
+			},
+			{
+				displayName: 'Closing Date',
+				name: 'Closing_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'string',
+				default: '',
+				description: 'Symbol of the currency in which revenue is generated.',
+			},
+			makeCustomFieldsFixedCollection('deal'),
+			{
+				displayName: 'Deal Name',
+				name: 'Deal_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Lead Conversion Time',
+				name: 'Lead_Conversion_Time',
+				type: 'number',
+				default: '',
+				description: 'Averge number of days to convert the lead into a deal.',
+			},
+			{
+				displayName: 'Next Step',
+				name: 'Next_Step',
+				type: 'string',
+				default: '',
+				description: 'Description of the next step in the sales process.',
+			},
+			{
+				displayName: 'Overall Sales Duration',
+				name: 'Overall_Sales_Duration',
+				type: 'number',
+				default: '',
+				description: 'Averge number of days to convert the lead into a deal and to win the deal.',
+			},
+			{
+				displayName: 'Probability',
+				name: 'Probability',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+					maxValue: 100,
+				},
+				default: '',
+				description: 'Probability of deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			{
+				displayName: 'Sales Cycle Duration',
+				name: 'Sales_Cycle_Duration',
+				type: 'number',
+				default: 0,
+				description: 'Averge number of days to win the deal.',
+			},
+			{
+				displayName: 'Stage',
+				name: 'Stage',
+				type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getDealStage',
+					},
+				default: [],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/InvoiceDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/InvoiceDescription.ts
new file mode 100644
index 00000000000..4ede26523f0
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/InvoiceDescription.ts
@@ -0,0 +1,463 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	productDetailsOptions,
+	shippingAddress,
+} from './SharedFields';
+
+export const invoiceOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an invoice',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an invoice',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an invoice',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all invoices',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an invoice',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const invoiceFields = [
+	// ----------------------------------------
+	//            invoice: create
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the invoice.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            invoice: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the invoice. If a record with this subject exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//        invoice: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Products',
+		name: 'Product_Details',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Product',
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: productDetailsOptions,
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account ID',
+				name: 'accountId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getAccounts',
+				},
+				description: 'ID of the account associated with this invoice.',
+			},
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: '',
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('invoice'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: '',
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: '',
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Invoice Date',
+				name: 'Invoice_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Invoice Number',
+				name: 'Invoice_Number',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: '',
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: '',
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: '',
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the invoice.',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             invoice: delete
+	// ----------------------------------------
+	{
+		displayName: 'Invoice ID',
+		name: 'invoiceId',
+		description: 'ID of the invoice to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               invoice: get
+	// ----------------------------------------
+	{
+		displayName: 'Invoice ID',
+		name: 'invoiceId',
+		description: 'ID of the invoice to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             invoice: getAll
+	// ----------------------------------------
+	...makeGetAllFields('invoice'),
+
+	// ----------------------------------------
+	//             invoice: update
+	// ----------------------------------------
+	{
+		displayName: 'Invoice ID',
+		name: 'invoiceId',
+		description: 'ID of the invoice to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account ID',
+				name: 'accountId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getAccounts',
+				},
+				description: 'ID of the account associated with this invoice.',
+			},
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: '',
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('invoice'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: '',
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: '',
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Invoice Date',
+				name: 'Invoice_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Invoice Number',
+				name: 'Invoice_Number',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Products',
+				name: 'Product_Details',
+				type: 'collection',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add Product',
+				},
+				default: {},
+				placeholder: 'Add Field',
+				options: productDetailsOptions,
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: '',
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: '',
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'Subject',
+				type: 'string',
+				default: '',
+				description: 'Subject or title of the invoice.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: '',
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the invoice.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/LeadDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/LeadDescription.ts
new file mode 100644
index 00000000000..1f26dd04e72
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/LeadDescription.ts
@@ -0,0 +1,694 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	address,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+} from './SharedFields';
+
+export const leadOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a lead',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a lead',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a lead',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all leads',
+			},
+			{
+				name: 'Get Fields',
+				value: 'getFields',
+				description: 'Get lead fields',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a lead',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const leadFields = [
+	// ----------------------------------------
+	//             lead: create
+	// ----------------------------------------
+	{
+		displayName: 'Company',
+		name: 'Company',
+		description: 'Company at which the lead works.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+				description: 'Annual revenue of the lead’s company.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('lead'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Designation',
+				name: 'Designation',
+				type: 'string',
+				default: '',
+				description: 'Position of the lead at their company.',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email Opt Out',
+				name: 'Email_Opt_Out',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+				description: 'Industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Industry Type',
+				name: 'Industry_Type',
+				type: 'string',
+				default: '',
+				description: 'Type of industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Lead Source',
+				name: 'Lead_Source',
+				type: 'string',
+				default: '',
+				description: 'Source from which the lead was created.',
+			},
+			{
+				displayName: 'Lead Status',
+				name: 'Lead_Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Number of Employees',
+				name: 'No_of_Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the lead’s company.',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Secondary Email',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             lead: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Company',
+		name: 'Company',
+		description: 'Company at which the lead works.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+				description: 'Annual revenue of the lead’s company.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('lead'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Designation',
+				name: 'Designation',
+				type: 'string',
+				default: '',
+				description: 'Position of the lead at their company.',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+				description: 'Email of the lead. If a record with this email exists it will be updated, otherwise a new one will be created.',
+			},
+			{
+				displayName: 'Email Opt Out',
+				name: 'Email_Opt_Out',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+				description: 'Industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Industry Type',
+				name: 'Industry_Type',
+				type: 'string',
+				default: '',
+				description: 'Type of industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Lead Source',
+				name: 'Lead_Source',
+				type: 'string',
+				default: '',
+				description: 'Source from which the lead was created.',
+			},
+			{
+				displayName: 'Lead Status',
+				name: 'Lead_Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Number of Employees',
+				name: 'No_of_Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the lead’s company.',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Secondary Email',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//               lead: delete
+	// ----------------------------------------
+	{
+		displayName: 'Lead ID',
+		name: 'leadId',
+		description: 'ID of the lead to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                lead: get
+	// ----------------------------------------
+	{
+		displayName: 'Lead ID',
+		name: 'leadId',
+		description: 'ID of the lead to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               lead: getAll
+	// ----------------------------------------
+	...makeGetAllFields('lead'),
+
+	// ----------------------------------------
+	//               lead: update
+	// ----------------------------------------
+	{
+		displayName: 'Lead ID',
+		name: 'leadId',
+		description: 'ID of the lead to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+				description: 'Annual revenue of the lead’s company.',
+			},
+			{
+				displayName: 'Company',
+				name: 'Company',
+				type: 'string',
+				default: '',
+				description: 'Company at which the lead works.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('lead'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Designation',
+				name: 'Designation',
+				type: 'string',
+				default: '',
+				description: 'Position of the lead at their company.',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email Opt Out',
+				name: 'Email_Opt_Out',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+				description: 'Industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Industry Type',
+				name: 'Industry_Type',
+				type: 'string',
+				default: '',
+				description: 'Type of industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'Last_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Lead Source',
+				name: 'Lead_Source',
+				type: 'string',
+				default: '',
+				description: 'Source from which the lead was created.',
+			},
+			{
+				displayName: 'Lead Status',
+				name: 'Lead_Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Number of Employees',
+				name: 'No_of_Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the lead’s company.',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Secondary Email',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/ProductDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/ProductDescription.ts
new file mode 100644
index 00000000000..19b6f880c6c
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/ProductDescription.ts
@@ -0,0 +1,352 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+} from './SharedFields';
+
+export const productOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a product',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a product',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a product',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all products',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a product',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const productFields = [
+	// ----------------------------------------
+	//           product: create
+	// ----------------------------------------
+	{
+		displayName: 'Product Name',
+		name: 'productName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            product: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Product Name',
+		name: 'productName',
+		description: 'Name of the product. If a record with this product name exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//         product: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Commission Rate',
+				name: 'Commission_Rate',
+				type: 'number',
+				description: 'Commission rate for the product. For example, enter 12 for 12%.',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			makeCustomFieldsFixedCollection('product'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Manufacturer',
+				name: 'Manufacturer',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Product Active',
+				name: 'Product_Active',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Product Category',
+				name: 'Product_Category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Quantity in Demand',
+				name: 'Qty_in_Demand',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Quantity in Stock',
+				name: 'Qty_in_Stock',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Taxable',
+				name: 'Taxable',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Unit Price',
+				name: 'Unit_Price',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             product: delete
+	// ----------------------------------------
+	{
+		displayName: 'Product ID',
+		name: 'productId',
+		description: 'ID of the product to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               product: get
+	// ----------------------------------------
+	{
+		displayName: 'Product ID',
+		name: 'productId',
+		description: 'ID of the product to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             product: getAll
+	// ----------------------------------------
+	...makeGetAllFields('product'),
+
+	// ----------------------------------------
+	//             product: update
+	// ----------------------------------------
+	{
+		displayName: 'Product ID',
+		name: 'productId',
+		description: 'ID of the product to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Commission Rate',
+				name: 'Commission_Rate',
+				type: 'number',
+				description: 'Commission rate for the product. For example, enter 12 for 12%.',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			makeCustomFieldsFixedCollection('product'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Manufacturer',
+				name: 'Manufacturer',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Product Active',
+				name: 'Product_Active',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Product Category',
+				name: 'Product_Category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Quantity in Demand',
+				name: 'Qty_in_Demand',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Quantity in Stock',
+				name: 'Qty_in_Stock',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Taxable',
+				name: 'Taxable',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Unit Price',
+				name: 'Unit_Price',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/PurchaseOrderDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/PurchaseOrderDescription.ts
new file mode 100644
index 00000000000..2ef0b573f8d
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/PurchaseOrderDescription.ts
@@ -0,0 +1,590 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	productDetailsOptions,
+	shippingAddress,
+} from './SharedFields';
+
+export const purchaseOrderOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a purchase order',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a purchase order',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a purchase order',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all purchase orders',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a purchase order',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const purchaseOrderFields = [
+	// ----------------------------------------
+	//         purchaseOrder: create
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the purchase order.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//         purchaseOrder: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the purchase order. If a record with this subject exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//      purchaseOrder: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Vendor ID',
+		name: 'vendorId',
+		type: 'options',
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getVendors',
+		},
+		description: 'ID of the vendor associated with the purchase order.',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Products',
+		name: 'Product_Details',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Product',
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: productDetailsOptions,
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			{
+				displayName: 'Billing Address',
+				name: 'Billing_Address',
+				type: 'fixedCollection',
+				default: {},
+				placeholder: 'Add Billing Address Field',
+				options: [
+					{
+						displayName: 'Billing Address Fields',
+						name: 'billing_address_fields',
+						values: [
+							{
+								displayName: 'Billing City',
+								name: 'Billing_City',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Billing Code',
+								name: 'Billing_Code',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Billing Country',
+								name: 'Billing_Country',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Billing State',
+								name: 'Billing_State',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Billing Street',
+								name: 'Billing_Street',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+				description: 'Name of the carrier.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('purchaseOrder'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Discount',
+				name: 'Discount',
+				type: 'number',
+				description: 'Discount applied to the purchase order. For example, enter 12 for 12%.',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'PO Date',
+				name: 'PO_Date',
+				type: 'dateTime',
+				default: '',
+				description: 'Date on which the purchase order was issued.',
+			},
+			{
+				displayName: 'PO Number',
+				name: 'PO_Number',
+				type: 'string',
+				default: '',
+				description: 'ID of the purchase order after creating a case.',
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getPurchaseOrderStatus',
+				},
+				description: 'Status of the purchase order.',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the purchase order.',
+			},
+			{
+				displayName: 'Tracking Number',
+				name: 'Tracking_Number',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//          purchaseOrder: delete
+	// ----------------------------------------
+	{
+		displayName: 'Purchase Order ID',
+		name: 'purchaseOrderId',
+		description: 'ID of the purchase order to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            purchaseOrder: get
+	// ----------------------------------------
+	{
+		displayName: 'Purchase Order ID',
+		name: 'purchaseOrderId',
+		description: 'ID of the purchase order to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//          purchaseOrder: getAll
+	// ----------------------------------------
+	...makeGetAllFields('purchaseOrder'),
+
+	// ----------------------------------------
+	//          purchaseOrder: update
+	// ----------------------------------------
+	{
+		displayName: 'Purchase Order ID',
+		name: 'purchaseOrderId',
+		description: 'ID of the purchase order to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+				description: 'Name of the carrier.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('purchaseOrder'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Discount',
+				name: 'Discount',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'PO Date',
+				name: 'PO_Date',
+				type: 'dateTime',
+				default: '',
+				description: 'Date on which the purchase order was issued.',
+			},
+			{
+				displayName: 'PO Number',
+				name: 'PO_Number',
+				type: 'string',
+				default: '',
+				description: 'ID of the purchase order after creating a case.',
+			},
+			// productDetails('purchaseOrder', 'update'),
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getPurchaseOrderStatus',
+				},
+				description: 'Status of the purchase order.',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'Subject',
+				type: 'string',
+				default: '',
+				description: 'Subject or title of the purchase order.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the purchase order.',
+			},
+			{
+				displayName: 'Tracking Number',
+				name: 'Tracking_Number',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/QuoteDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/QuoteDescription.ts
new file mode 100644
index 00000000000..0ecf64adaf8
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/QuoteDescription.ts
@@ -0,0 +1,459 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	productDetailsOptions,
+	shippingAddress,
+} from './SharedFields';
+
+export const quoteOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a quote',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a quote',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a quote',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all quotes',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a quote',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const quoteFields = [
+	// ----------------------------------------
+	//            quote: create
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the quote.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            quote: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the quote. If a record with this subject exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//          quote: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Products',
+		name: 'Product_Details',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Product',
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: productDetailsOptions,
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('quote'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Quote Stage',
+				name: 'Quote_Stage',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getQuoteStage',
+				},
+				description: 'Stage of the quote.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Team',
+				name: 'Team',
+				type: 'string',
+				default: '',
+				description: 'Team for whom the quote is created.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the quote.',
+			},
+			{
+				displayName: 'Valid Till',
+				name: 'Valid_Till',
+				type: 'dateTime',
+				default: '',
+				description: 'Date until when the quote is valid.',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//              quote: delete
+	// ----------------------------------------
+	{
+		displayName: 'Quote ID',
+		name: 'quoteId',
+		description: 'ID of the quote to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                quote: get
+	// ----------------------------------------
+	{
+		displayName: 'Quote ID',
+		name: 'quoteId',
+		description: 'ID of the quote to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//              quote: getAll
+	// ----------------------------------------
+	...makeGetAllFields('quote'),
+
+	// ----------------------------------------
+	//              quote: update
+	// ----------------------------------------
+	{
+		displayName: 'Quote ID',
+		name: 'quoteId',
+		description: 'ID of the quote to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('quote'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Quote Stage',
+				name: 'Quote_Stage',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getQuoteStage',
+				},
+				description: 'Stage of the quote.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'Subject',
+				type: 'string',
+				default: '',
+				description: 'Subject or title of the quote.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Team',
+				name: 'Team',
+				type: 'string',
+				default: '',
+				description: 'Team for whom the quote is created.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the quote.',
+			},
+			{
+				displayName: 'Valid Till',
+				name: 'Valid_Till',
+				type: 'dateTime',
+				default: '',
+				description: 'Date until when the quote is valid.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/SalesOrderDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/SalesOrderDescription.ts
new file mode 100644
index 00000000000..35547664cf8
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/SalesOrderDescription.ts
@@ -0,0 +1,569 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	productDetailsOptions,
+	shippingAddress,
+} from './SharedFields';
+
+export const salesOrderOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a sales order',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a sales order',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a sales order',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all sales orders',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a sales order',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const salesOrderFields = [
+	// ----------------------------------------
+	//       salesOrder: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		required: true,
+		type: 'options',
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getAccounts',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//           salesOrder: create
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the sales order.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//           salesOrder: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the sales order. If a record with this subject exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//       salesOrder: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Products',
+		name: 'Product_Details',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Product',
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: productDetailsOptions,
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+				description: 'Name of the carrier.',
+			},
+			{
+				displayName: 'Contact ID',
+				name: 'contactId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getContacts',
+				},
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('salesOrder'),
+			{
+				displayName: 'Deal ID',
+				name: 'dealId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getDeals',
+				},
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Discount',
+				name: 'Discount',
+				type: 'number',
+				description: 'Discount applied to the sales order. For example, enter 12 for 12%.',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Sales Order Number',
+				name: 'SO_Number',
+				type: 'string',
+				default: '',
+				description: 'ID of the sales order after creating a case.',
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getSalesOrderStatus',
+				},
+				description: 'Status of the sales order.',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the purchase order.',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//            salesOrder: delete
+	// ----------------------------------------
+	{
+		displayName: 'Sales Order ID',
+		name: 'salesOrderId',
+		description: 'ID of the sales order to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             salesOrder: get
+	// ----------------------------------------
+	{
+		displayName: 'Sales Order ID',
+		name: 'salesOrderId',
+		description: 'ID of the sales order to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            salesOrder: getAll
+	// ----------------------------------------
+	...makeGetAllFields('salesOrder'),
+
+	// ----------------------------------------
+	//            salesOrder: update
+	// ----------------------------------------
+	{
+		displayName: 'Sales Order ID',
+		name: 'salesOrderId',
+		description: 'ID of the sales order to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account ID',
+				name: 'accountId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getAccounts',
+				},
+				description: 'ID of the account associated with this invoice.',
+			},
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+				description: 'Name of the carrier.',
+			},
+			{
+				displayName: 'Contact ID',
+				name: 'contactId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getContacts',
+				},
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('salesOrder'),
+			{
+				displayName: 'Deal ID',
+				name: 'dealId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getDeals',
+				},
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Discount',
+				name: 'Discount',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Sales Order Number',
+				name: 'SO_Number',
+				type: 'string',
+				default: '',
+				description: 'ID of the sales order after creating a case.',
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getSalesOrderStatus',
+				},
+				description: 'Status of the sales order.',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'Subject',
+				type: 'string',
+				default: '',
+				description: 'Subject or title of the sales order.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the purchase order.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
new file mode 100644
index 00000000000..e7030ba28f1
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
@@ -0,0 +1,577 @@
+import { capitalizeInitial } from '../GenericFunctions';
+import { CamelCaseResource } from '../types';
+
+export const billingAddress = {
+	displayName: 'Billing Address',
+	name: 'Billing_Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Billing Address Field',
+	options: [
+		{
+			displayName: 'Billing Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Billing_Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'Billing_City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'Billing_State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Country',
+					name: 'Billing_Country',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Billing_Code',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export const shippingAddress = {
+	displayName: 'Shipping Address',
+	name: 'Shipping_Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Shipping Address Field',
+	options: [
+		{
+			displayName: 'Shipping Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Shipping_Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'Shipping_City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'Shipping_State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Country',
+					name: 'Shipping_Country',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Shipping_Code',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export const mailingAddress = {
+	displayName: 'Mailing Address',
+	name: 'Mailing_Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Mailing Address Field',
+	options: [
+		{
+			displayName: 'Mailing Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Mailing_Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'Mailing_City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'Mailing_State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Country',
+					name: 'Mailing_Country',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Mailing_Zip',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export const otherAddress = {
+	displayName: 'Other Address',
+	name: 'Other_Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Other Address Field',
+	options: [
+		{
+			displayName: 'Other Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Other_Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'Other_City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'Other_State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Other_Zip',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export const address = {
+	displayName: 'Address',
+	name: 'Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Address Field',
+	options: [
+		{
+			displayName: 'Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Country',
+					name: 'Country',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Zip_Code',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+// displayName: 'Products',
+// name: 'Product_Details',
+// type: 'collection',
+// typeOptions: {
+// 	multipleValues: true,
+// 	multipleValueButtonText: 'Add Product',
+// },
+// default: {},
+// placeholder: 'Add Field',
+// displayOptions: {
+// 	show: {
+// 		resource: [
+// 			resource,
+// 		],
+// 		operation: [
+// 			operation,
+// 		],
+// 	},
+// },
+
+export const productDetailsOptions = [
+	{
+		displayName: 'List Price',
+		name: 'list_price',
+		type: 'number',
+		default: '',
+	},
+	{
+		displayName: 'Product ID',
+		name: 'id',
+		type: 'options',
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getProducts',
+		},
+	},
+	{
+		displayName: 'Product Description',
+		name: 'product_description',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Quantity',
+		name: 'quantity',
+		type: 'number',
+		default: 1,
+	},
+	{
+		displayName: 'Quantity in Stock',
+		name: 'quantity_in_stock',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Tax',
+		name: 'Tax',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Total',
+		name: 'total',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Total After Discount',
+		name: 'total_after_discount',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Total (Net)',
+		name: 'net_total',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Unit Price',
+		name: 'unit_price',
+		type: 'number',
+		default: 0,
+	},
+];
+
+export const makeGetAllFields = (resource: CamelCaseResource) => {
+	const loadOptionsMethod = `get${capitalizeInitial(resource)}Fields`;
+
+	return [
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			default: false,
+			description: 'Return all results.',
+			displayOptions: {
+				show: {
+					resource: [
+						resource,
+					],
+					operation: [
+						'getAll',
+					],
+				},
+			},
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			default: 5,
+			description: 'The number of results to return.',
+			typeOptions: {
+				minValue: 1,
+				maxValue: 1000,
+			},
+			displayOptions: {
+				show: {
+					resource: [
+						resource,
+					],
+					operation: [
+						'getAll',
+					],
+					returnAll: [
+						false,
+					],
+				},
+			},
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					resource: [
+						resource,
+					],
+					operation: [
+						'getAll',
+					],
+				},
+			},
+			options: [
+				{
+					displayName: 'Approved',
+					name: 'approved',
+					type: 'boolean',
+					default: true,
+					description: 'Retrieve only approved records. Defaults to true.',
+				},
+				{
+					displayName: 'Converted',
+					name: 'converted',
+					type: 'boolean',
+					default: false,
+					description: 'Retrieve only converted records. Defaults to false.',
+				},
+				{
+					displayName: 'Fields',
+					name: 'fields',
+					type: 'multiOptions',
+					typeOptions: {
+						loadOptionsMethod,
+					},
+					default: [],
+					description: 'Return only these fields.',
+				},
+				{
+					displayName: 'Include Child',
+					name: 'include_child',
+					type: 'boolean',
+					default: false,
+					description: 'Retrieve only records from child territories.',
+				},
+				{
+					displayName: 'Sort By',
+					name: 'sort_by',
+					type: 'options',
+					typeOptions: {
+						loadOptionsMethod,
+					},
+					default: [],
+					description: 'Field to sort records by.',
+				},
+				{
+					displayName: 'Sort Order',
+					name: 'sort_order',
+					type: 'options',
+					options: [
+						{
+							name: 'Ascending',
+							value: 'asc',
+						},
+						{
+							name: 'Descending',
+							value: 'desc',
+						},
+					],
+					default: 'desc',
+					description: 'Ascending or descending order sort order.',
+				},
+				{
+					displayName: 'Territory ID',
+					name: 'territory_id',
+					type: 'string',
+					default: '',
+					description: 'Retrieve only records from this territory.',
+				},
+			],
+		},
+	];
+};
+
+export const makeCustomFieldsFixedCollection = (resource: CamelCaseResource) => {
+	const loadOptionsMethod = `getCustom${capitalizeInitial(resource)}Fields`;
+
+	return {
+		displayName: 'Custom Fields',
+		name: 'customFields',
+		placeholder: 'Add Custom Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		description: 'Filter by custom fields.',
+		default: {},
+		options: [
+			{
+				name: 'customFields',
+				displayName: 'Custom Field',
+				values: [
+					{
+						displayName: 'Field ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod,
+						},
+						default: '',
+						description: 'Custom field to set a value to.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value to set on custom field.',
+					},
+				],
+			},
+		],
+	};
+};
+
+// https://www.zoho.com/subscriptions/help/supported-currencies.html
+
+export const currencies = [
+	{ name: 'US Dollar', value: 'USD' },
+	{ name: 'Euro', value: 'EUR' },
+	{ name: 'UAE Dirham', value: 'AED' },
+	{ name: 'Afghani', value: 'AFN' },
+	{ name: 'Lek', value: 'ALL' },
+	{ name: 'Argentine Peso', value: 'ARS' },
+	{ name: 'Australian Dollar', value: 'AUD' },
+	{ name: 'Azerbaijan Manat', value: 'AZN' },
+	{ name: 'Barbados Dollar', value: 'BBD' },
+	{ name: 'Taka', value: 'BDT' },
+	{ name: 'Bulgarian Lev', value: 'BGN' },
+	{ name: 'Bermudian Dollar', value: 'BMD' },
+	{ name: 'Brunei Dollar', value: 'BND' },
+	{ name: 'Boliviano', value: 'BOB' },
+	{ name: 'Brazilian Real', value: 'BRL' },
+	{ name: 'Bahamian Dollar', value: 'BSD' },
+	{ name: 'Pula', value: 'BWP' },
+	{ name: 'Belize Dollar', value: 'BZD' },
+	{ name: 'Canadian Dollar', value: 'CAD' },
+	{ name: 'Swiss Franc', value: 'CHF' },
+	{ name: 'Chilean Peso', value: 'CLP' },
+	{ name: 'Yuan Renminbi', value: 'CNY' },
+	{ name: 'Colombian Peso', value: 'COP' },
+	{ name: 'Costa Rican Colon', value: 'CRC' },
+	{ name: 'Czech Koruna', value: 'CZK' },
+	{ name: 'Danish Krone', value: 'DKK' },
+	{ name: 'Dominican Peso', value: 'DOP' },
+	{ name: 'Algerian Dinar', value: 'DZD' },
+	{ name: 'Egyptian Pound', value: 'EGP' },
+	{ name: 'Fiji Dollar', value: 'FJD' },
+	{ name: 'Pound Sterling', value: 'GBP' },
+	{ name: 'Quetzal', value: 'GTQ' },
+	{ name: 'Hong Kong Dollar', value: 'HKD' },
+	{ name: 'Lempira', value: 'HNL' },
+	{ name: 'Kuna', value: 'HRK' },
+	{ name: 'Forint', value: 'HUF' },
+	{ name: 'Rupiah', value: 'IDR' },
+	{ name: 'New Israeli Sheqel', value: 'ILS' },
+	{ name: 'Indian Rupee', value: 'INR' },
+	{ name: 'Jamaican Dollar', value: 'JMD' },
+	{ name: 'Yen', value: 'JPY' },
+	{ name: 'Kenyan Shilling', value: 'KES' },
+	{ name: 'Won', value: 'KRW' },
+	{ name: 'Tenge', value: 'KZT' },
+	{ name: 'Lao Kip', value: 'LAK' },
+	{ name: 'Lebanese Pound', value: 'LBP' },
+	{ name: 'Sri Lanka Rupee', value: 'LKR' },
+	{ name: 'Liberian Dollar', value: 'LRD' },
+	{ name: 'Moroccan Dirham', value: 'MAD' },
+	{ name: 'Kyat', value: 'MMK' },
+	{ name: 'Pataca', value: 'MOP' },
+	{ name: 'Ouguiya', value: 'MRO' },
+	{ name: 'Mauritius Rupee', value: 'MUR' },
+	{ name: 'Rufiyaa', value: 'MVR' },
+	{ name: 'Mexican Peso', value: 'MXN' },
+	{ name: 'Malaysian Ringgit', value: 'MYR' },
+	{ name: 'Cordoba Oro', value: 'NIO' },
+	{ name: 'Norwegian Krone', value: 'NOK' },
+	{ name: 'Nepalese Rupee', value: 'NPR' },
+	{ name: 'New Zealand Dollar', value: 'NZD' },
+	{ name: 'Sol', value: 'PEN' },
+	{ name: 'Kina', value: 'PGK' },
+	{ name: 'Philippine Peso', value: 'PHP' },
+	{ name: 'Pakistan Rupee', value: 'PKR' },
+	{ name: 'Zloty', value: 'PLN' },
+	{ name: 'Qatari Rial', value: 'QAR' },
+	{ name: 'Romanian Leu', value: 'RON' },
+	{ name: 'Russian Ruble', value: 'RUB' },
+	{ name: 'Saudi Riyal', value: 'SAR' },
+	{ name: 'Solomon Islands Dollar	', value: 'SBD' },
+	{ name: 'Seychelles Rupee', value: 'SCR' },
+	{ name: 'Swedish Krona', value: 'SEK' },
+	{ name: 'Singapore Dollar', value: 'SGD' },
+	{ name: 'Syrian Pound', value: 'SYP' },
+	{ name: 'Baht', value: 'THB' },
+	{ name: 'Pa’anga', value: 'TOP' },
+	{ name: 'Turkish Lira', value: 'TRY' },
+	{ name: 'Trinidad and Tobago Dollar', value: 'TTD' },
+	{ name: 'New Taiwan Dollar', value: 'TWD' },
+	{ name: 'Hryvnia', value: 'UAH' },
+	{ name: 'Dong', value: 'VND' },
+	{ name: 'Vatu', value: 'VUV' },
+	{ name: 'Tala', value: 'WST' },
+	{ name: 'East Caribbean Dollar', value: 'XCD' },
+	{ name: 'West African CFA Franc', value: 'XOF' },
+	{ name: 'Yemeni Rial', value: 'YER' },
+	{ name: 'Rand', value: 'ZAR' },
+];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/VendorDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/VendorDescription.ts
new file mode 100644
index 00000000000..ff15df5ea72
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/VendorDescription.ts
@@ -0,0 +1,301 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	address,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+} from './SharedFields';
+
+export const vendorOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a vendor',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a vendor',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a vendor',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all vendors',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a vendor',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const vendorFields = [
+	// ----------------------------------------
+	//            vendor: create
+	// ----------------------------------------
+	{
+		displayName: 'Vendor Name',
+		name: 'vendorName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//           vendor: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Vendor Name',
+		name: 'vendorName',
+		description: 'Name of the vendor. If a record with this vendor name exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//         vendor: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Category',
+				name: 'Category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('vendor'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             vendor: delete
+	// ----------------------------------------
+	{
+		displayName: 'Vendor ID',
+		name: 'vendorId',
+		description: 'ID of the vendor to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               vendor: get
+	// ----------------------------------------
+	{
+		displayName: 'Vendor ID',
+		name: 'vendorId',
+		description: 'ID of the vendor to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             vendor: getAll
+	// ----------------------------------------
+	...makeGetAllFields('vendor'),
+
+	// ----------------------------------------
+	//             vendor: update
+	// ----------------------------------------
+	{
+		displayName: 'Vendor ID',
+		name: 'vendorId',
+		description: 'ID of the vendor to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Category',
+				name: 'Category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'string',
+				default: '',
+			},
+			makeCustomFieldsFixedCollection('vendor'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Vendor Name',
+				name: 'Vendor_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/index.ts b/packages/nodes-base/nodes/Zoho/descriptions/index.ts
new file mode 100644
index 00000000000..152b54ef2b0
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/index.ts
@@ -0,0 +1,10 @@
+export * from './AccountDescription';
+export * from './ContactDescription';
+export * from './DealDescription';
+export * from './InvoiceDescription';
+export * from './LeadDescription';
+export * from './ProductDescription';
+export * from './PurchaseOrderDescription';
+export * from './QuoteDescription';
+export * from './SalesOrderDescription';
+export * from './VendorDescription';
diff --git a/packages/nodes-base/nodes/Zoho/types.d.ts b/packages/nodes-base/nodes/Zoho/types.d.ts
new file mode 100644
index 00000000000..46da58379c7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/types.d.ts
@@ -0,0 +1,103 @@
+import { IDataObject } from "n8n-workflow";
+
+// ----------------------------------------
+//          for generic functions
+// ----------------------------------------
+
+type Resource = 'account' | 'contact' | 'deal' | 'invoice' | 'lead' | 'product' | 'quote' | 'vendor';
+
+export type CamelCaseResource = Resource | 'purchaseOrder' | 'salesOrder';
+
+export type SnakeCaseResource = Resource | 'purchase_order' | 'sales_order';
+
+export type GetAllFilterOptions = {
+	fields: string[],
+	[otherOptions: string]: unknown;
+};
+
+// ----------------------------------------
+//               for auth
+// ----------------------------------------
+
+export type ZohoOAuth2ApiCredentials = {
+	oauthTokenData: {
+		api_domain: string;
+	};
+};
+
+// ----------------------------------------
+//         for field adjusters
+// ----------------------------------------
+
+export type IdType = 'accountId' | 'contactId' | 'dealId' | 'purchaseOrderId';
+
+export type NameType = 'Account_Name' | 'Full_Name' | 'Deal_Name' | 'Product_Name' | 'Vendor_Name';
+
+type LocationType = 'Address' | 'Billing_Address' | 'Mailing_Address' | 'Shipping_Address' | 'Other_Address';
+
+type DateType = 'Date_of_Birth' | 'Closing_Date' | 'Due_Date' | 'Invoice_Date' | 'PO_Date' | 'Valid_Till';
+
+export type AllFields =
+	{ [Date in DateType]?: string } &
+	{ [Location in LocationType]?: { address_fields: { [key: string]: string } } } &
+	{ Account?: { subfields: { id: string; name: string; } } } &
+	{ [key in 'accountId' | 'contactId' | 'dealId']?: string } &
+	{ customFields?: { customFields: Array<{ fieldId: string; value: string; }> } } &
+	{ Product_Details?: ProductDetails } &
+	IDataObject;
+
+export type ProductDetails = Array<{ id: string, quantity: number }>;
+
+export type ResourceItems = Array<{ [key: string]: string }>;
+
+// ----------------------------------------
+//         for resource loaders
+// ----------------------------------------
+
+export type LoadedAccounts = Array<{
+	Account_Name: string;
+	id: string;
+}>;
+
+export type LoadedContacts = Array<{
+	Full_Name: string;
+	id: string;
+}>;
+
+export type LoadedDeals = Array<{
+	Deal_Name: string;
+	id: string;
+}>;
+
+export type LoadedFields = {
+	fields: Array<{
+		field_label: string;
+		api_name: string;
+		custom_field: boolean;
+	}>
+};
+
+export type LoadedVendors = Array<{
+	Vendor_Name: string;
+	id: string;
+}>;
+
+export type LoadedProducts = Array<{
+	Product_Name: string;
+	id: string;
+}>;
+
+export type LoadedLayouts = {
+	layouts: Array<{
+		sections: Array<{
+			api_name: string;
+			fields: Array<{
+				api_name: string;
+				pick_list_values: Array<{
+					display_value: string;
+					actual_value: string;
+				}>
+			}>
+		}>
+	}>
+}
diff --git a/packages/nodes-base/nodes/Zoho/zoho.svg b/packages/nodes-base/nodes/Zoho/zoho.svg
index 9fc31419780..203761c2702 100644
--- a/packages/nodes-base/nodes/Zoho/zoho.svg
+++ b/packages/nodes-base/nodes/Zoho/zoho.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 -30 100 100" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><defs><linearGradient x1="50%" y1="1.43%" x2="50%" y2="96.98%" id="b"><stop stop-color="#ffe513" offset=".562%"/><stop stop-color="#fdb924" offset="100%"/></linearGradient><linearGradient x1="4.51%" y1="13.49%" x2="95.67%" y2="87.06%" id="c"><stop stop-color="#008cd2" offset=".562%"/><stop stop-color="#00649d" offset="100%"/></linearGradient><linearGradient x1="50%" y1="27.78%" x2="50%" y2="97.53%" id="d"><stop stop-color="#26a146" offset="0%"/><stop stop-color="#008a52" offset="100%"/></linearGradient><linearGradient x1="43.73%" y1="8.21%" x2="57.54%" y2="93.2%" id="e"><stop stop-color="#d92231" offset="0%"/><stop stop-color="#ba2234" offset="100%"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M102.964 7.581v24.414l-3.379 3.298V11.402z" fill="#e79225"/><path d="M80.822 7.601l-3.499 3.801.181.241 21.94-.08.201-.161 3.318-3.821z" fill="#fff16d"/><path d="M77.323 11.402h22.322v23.911H77.323z" fill="url(#b)"/><path d="M96.246 20.009a8.84 8.84 0 00-1.971-2.976c-.825-.845-1.749-1.488-2.795-1.91-1.026-.422-2.132-.643-3.338-.643s-2.333.221-3.358.643c-1.046.422-1.971 1.066-2.795 1.91-.865.865-1.508 1.87-1.951 2.976s-.644 2.313-.644 3.64a9.8 9.8 0 00.664 3.62 8.95 8.95 0 001.951 3.017c.804.825 1.73 1.448 2.755 1.87s2.172.644 3.399.644c1.186 0 2.293-.221 3.318-.644s1.971-1.046 2.795-1.87c.865-.885 1.528-1.89 1.971-2.996s.664-2.333.664-3.62c0-1.347-.221-2.554-.664-3.66zm-4.605 7.883c-.865 1.026-2.011 1.549-3.499 1.549s-2.655-.523-3.519-1.549-1.287-2.453-1.287-4.263c0-1.85.442-3.278 1.287-4.324.865-1.046 2.011-1.549 3.519-1.549 1.488 0 2.634.523 3.499 1.549.845 1.046 1.287 2.474 1.287 4.324 0 1.81-.422 3.238-1.287 4.263z"/><path d="M75.131 5.591v.121l2.856 21.94-1.669 4.625-.221-.161-2.936-21.035.06-.281 1.83-5.088z" fill="#009ada"/><path d="M53.151 8.648l21.98-3.057-1.85 5.269-.261.282-20.552 3.017.101-3.761z" fill="#91c9ed"/><path d="M73.281 10.859l3.037 21.417-21.659 3.037-2.916-20.693 1.267-.985z" fill="url(#c)"/><path d="M69.601 14.962c-.101-.664-.322-1.166-.684-1.508a1.61 1.61 0 00-1.086-.402c-.1 0-.221 0-.342.02-.563.081-.985.342-1.247.764-.201.302-.281.684-.281 1.126 0 .161.02.342.04.523l.784 5.57-6.234.925-.784-5.57c-.1-.644-.322-1.146-.684-1.488a1.52 1.52 0 00-1.066-.422c-.101 0-.201 0-.302.02-.583.081-1.026.342-1.307.764-.201.302-.282.684-.282 1.126 0 .161.02.342.04.543l2.132 14.499c.1.664.322 1.166.724 1.508.302.261.664.382 1.106.382.121 0 .241 0 .362-.02.543-.081.945-.342 1.207-.764.181-.302.261-.664.261-1.086 0-.161-.02-.342-.04-.523l-.865-5.731 6.234-.925.865 5.731c.1.664.322 1.166.704 1.488a1.61 1.61 0 001.086.402c.101 0 .221 0 .342-.02.563-.081.985-.342 1.247-.764.181-.302.282-.664.282-1.106 0-.161-.02-.342-.04-.523z"/><path d="M32.578 0l-7.823 18.582 1.066 8.165.06-.02 8.788-19.768-.04-.422-1.89-6.274z" fill="#66bf6b"/><path d="M32.578 0l2.071 6.958 19.346 8.667.06-.04-1.649-6.516z" fill="#98d0a0"/><path d="M34.609 6.817l19.446 8.768-8.788 19.929-19.446-8.768z" fill="url(#d)"/><path d="M48.164 17.194c-.422-1.126-1.005-2.091-1.77-2.896a8.24 8.24 0 00-2.775-1.911 8.257 8.257 0 00-3.278-.684h-.06c-1.126 0-2.232.261-3.318.744a8.883 8.883 0 00-2.976 2.091c-.845.885-1.528 1.971-2.051 3.218a10.783 10.783 0 00-.865 3.7v.422a9.24 9.24 0 00.563 3.197c.402 1.106.985 2.051 1.75 2.856s1.709 1.448 2.836 1.91a8.1 8.1 0 003.258.684h.02c1.106 0 2.212-.241 3.298-.704a9.018 9.018 0 002.996-2.111c.845-.885 1.548-1.951 2.071-3.198s.804-2.474.865-3.7v-.362a8.7 8.7 0 00-.563-3.258zm-3.881 5.792c-.724 1.73-1.709 2.916-2.896 3.56-.644.342-1.307.523-1.971.523-.583 0-1.206-.141-1.83-.402-1.367-.583-2.212-1.508-2.574-2.835a5.25 5.25 0 01-.181-1.388c0-.965.241-2.031.724-3.177.744-1.77 1.73-2.976 2.916-3.64a3.968 3.968 0 011.971-.523c.603 0 1.207.141 1.85.402 1.347.583 2.192 1.508 2.554 2.835.121.422.181.885.181 1.367 0 1.006-.241 2.091-.744 3.278z"/><path d="M23.207 3.157l3.177 21.276-1.448 7.481-.201-.261-3.097-20.552v-.402l1.367-7.179z" fill="#760d16"/><path d="M0 14.157l1.508-7.521 21.699-3.479-1.468 7.662v.503L.261 14.358z" fill="#ef463e"/><path d="M21.739 10.819l3.197 21.095-21.477 3.358L0 14.157z" fill="url(#e)"/><path d="M19.427 28.556c-.161-.201-.402-.342-.684-.442s-.623-.141-1.046-.141c-.382 0-.824.04-1.307.121l-5.671.965c.06-.443.282-1.006.664-1.709.422-.784 1.066-1.73 1.89-2.815l.664-.865.463-.583c1.307-1.709 2.091-3.097 2.413-4.183a8.663 8.663 0 00.322-1.87c.02-.181.02-.342.02-.503a7.4 7.4 0 00-.121-1.327c-.06-.402-.161-.724-.302-.985s-.302-.463-.503-.583c-.221-.141-.563-.201-.985-.201-.342 0-.764.04-1.267.121L7.421 14.68c-.784.141-1.388.362-1.75.724a1.38 1.38 0 00-.442 1.046 2.07 2.07 0 00.02.342c.101.563.382.965.845 1.166.282.121.603.181 1.005.181.261 0 .563-.02.885-.08l5.47-.965c0 .101.02.201.02.282a2.87 2.87 0 01-.181 1.005c-.161.463-.563 1.106-1.227 1.931l-.845 1.046c-1.488 1.79-2.534 3.318-3.177 4.585a9.917 9.917 0 00-.945 2.594 7.23 7.23 0 00-.161 1.428c0 .322.02.643.081.945.08.442.181.804.322 1.086s.342.503.563.623.523.161.965.161c.543 0 1.287-.08 2.232-.241l5.953-1.026c1.046-.181 1.79-.442 2.212-.784a1.39 1.39 0 00.523-1.106c0-.121-.02-.241-.04-.362a1.333 1.333 0 00-.322-.704z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 -30 100 100" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><defs><linearGradient x1="50%" y1="1.43%" x2="50%" y2="96.98%" id="b"><stop stop-color="#ffe513" offset=".562%"/><stop stop-color="#fdb924" offset="100%"/></linearGradient><linearGradient x1="4.51%" y1="13.49%" x2="95.67%" y2="87.06%" id="c"><stop stop-color="#008cd2" offset=".562%"/><stop stop-color="#00649d" offset="100%"/></linearGradient><linearGradient x1="50%" y1="27.78%" x2="50%" y2="97.53%" id="d"><stop stop-color="#26a146" offset="0%"/><stop stop-color="#008a52" offset="100%"/></linearGradient><linearGradient x1="43.73%" y1="8.21%" x2="57.54%" y2="93.2%" id="e"><stop stop-color="#d92231" offset="0%"/><stop stop-color="#ba2234" offset="100%"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M102.964 7.581v24.414l-3.379 3.298V11.402z" fill="#e79225"/><path d="M80.822 7.601l-3.499 3.801.181.241 21.94-.08.201-.161 3.318-3.821z" fill="#fff16d"/><path d="M77.323 11.402h22.322v23.911H77.323z" fill="url(#b)"/><path d="M96.246 20.009a8.84 8.84 0 00-1.971-2.976c-.825-.845-1.749-1.488-2.795-1.91-1.026-.422-2.132-.643-3.338-.643s-2.333.221-3.358.643c-1.046.422-1.971 1.066-2.795 1.91-.865.865-1.508 1.87-1.951 2.976s-.644 2.313-.644 3.64a9.8 9.8 0 00.664 3.62 8.95 8.95 0 001.951 3.017c.804.825 1.73 1.448 2.755 1.87s2.172.644 3.399.644c1.186 0 2.293-.221 3.318-.644s1.971-1.046 2.795-1.87c.865-.885 1.528-1.89 1.971-2.996s.664-2.333.664-3.62c0-1.347-.221-2.554-.664-3.66zm-4.605 7.883c-.865 1.026-2.011 1.549-3.499 1.549s-2.655-.523-3.519-1.549-1.287-2.453-1.287-4.263c0-1.85.442-3.278 1.287-4.324.865-1.046 2.011-1.549 3.519-1.549 1.488 0 2.634.523 3.499 1.549.845 1.046 1.287 2.474 1.287 4.324 0 1.81-.422 3.238-1.287 4.263z"/><path d="M75.131 5.591v.121l2.856 21.94-1.669 4.625-.221-.161-2.936-21.035.06-.281 1.83-5.088z" fill="#009ada"/><path d="M53.151 8.648l21.98-3.057-1.85 5.269-.261.282-20.552 3.017.101-3.761z" fill="#91c9ed"/><path d="M73.281 10.859l3.037 21.417-21.659 3.037-2.916-20.693 1.267-.985z" fill="url(#c)"/><path d="M69.601 14.962c-.101-.664-.322-1.166-.684-1.508a1.61 1.61 0 00-1.086-.402c-.1 0-.221 0-.342.02-.563.081-.985.342-1.247.764-.201.302-.281.684-.281 1.126 0 .161.02.342.04.523l.784 5.57-6.234.925-.784-5.57c-.1-.644-.322-1.146-.684-1.488a1.52 1.52 0 00-1.066-.422c-.101 0-.201 0-.302.02-.583.081-1.026.342-1.307.764-.201.302-.282.684-.282 1.126 0 .161.02.342.04.543l2.132 14.499c.1.664.322 1.166.724 1.508.302.261.664.382 1.106.382.121 0 .241 0 .362-.02.543-.081.945-.342 1.207-.764.181-.302.261-.664.261-1.086 0-.161-.02-.342-.04-.523l-.865-5.731 6.234-.925.865 5.731c.1.664.322 1.166.704 1.488a1.61 1.61 0 001.086.402c.101 0 .221 0 .342-.02.563-.081.985-.342 1.247-.764.181-.302.282-.664.282-1.106 0-.161-.02-.342-.04-.523z"/><path d="M32.578 0l-7.823 18.582 1.066 8.165.06-.02 8.788-19.768-.04-.422-1.89-6.274z" fill="#66bf6b"/><path d="M32.578 0l2.071 6.958 19.346 8.667.06-.04-1.649-6.516z" fill="#98d0a0"/><path d="M34.609 6.817l19.446 8.768-8.788 19.929-19.446-8.768z" fill="url(#d)"/><path d="M48.164 17.194c-.422-1.126-1.005-2.091-1.77-2.896a8.24 8.24 0 00-2.775-1.911 8.257 8.257 0 00-3.278-.684h-.06c-1.126 0-2.232.261-3.318.744a8.883 8.883 0 00-2.976 2.091c-.845.885-1.528 1.971-2.051 3.218a10.783 10.783 0 00-.865 3.7v.422a9.24 9.24 0 00.563 3.197c.402 1.106.985 2.051 1.75 2.856s1.709 1.448 2.836 1.91a8.1 8.1 0 003.258.684h.02c1.106 0 2.212-.241 3.298-.704a9.018 9.018 0 002.996-2.111c.845-.885 1.548-1.951 2.071-3.198s.804-2.474.865-3.7v-.362a8.7 8.7 0 00-.563-3.258zm-3.881 5.792c-.724 1.73-1.709 2.916-2.896 3.56-.644.342-1.307.523-1.971.523-.583 0-1.206-.141-1.83-.402-1.367-.583-2.212-1.508-2.574-2.835a5.25 5.25 0 01-.181-1.388c0-.965.241-2.031.724-3.177.744-1.77 1.73-2.976 2.916-3.64a3.968 3.968 0 011.971-.523c.603 0 1.207.141 1.85.402 1.347.583 2.192 1.508 2.554 2.835.121.422.181.885.181 1.367 0 1.006-.241 2.091-.744 3.278z"/><path d="M23.207 3.157l3.177 21.276-1.448 7.481-.201-.261-3.097-20.552v-.402l1.367-7.179z" fill="#760d16"/><path d="M0 14.157l1.508-7.521 21.699-3.479-1.468 7.662v.503L.261 14.358z" fill="#ef463e"/><path d="M21.739 10.819l3.197 21.095-21.477 3.358L0 14.157z" fill="url(#e)"/><path d="M19.427 28.556c-.161-.201-.402-.342-.684-.442s-.623-.141-1.046-.141c-.382 0-.824.04-1.307.121l-5.671.965c.06-.443.282-1.006.664-1.709.422-.784 1.066-1.73 1.89-2.815l.664-.865.463-.583c1.307-1.709 2.091-3.097 2.413-4.183a8.663 8.663 0 00.322-1.87c.02-.181.02-.342.02-.503a7.4 7.4 0 00-.121-1.327c-.06-.402-.161-.724-.302-.985s-.302-.463-.503-.583c-.221-.141-.563-.201-.985-.201-.342 0-.764.04-1.267.121L7.421 14.68c-.784.141-1.388.362-1.75.724a1.38 1.38 0 00-.442 1.046 2.07 2.07 0 00.02.342c.101.563.382.965.845 1.166.282.121.603.181 1.005.181.261 0 .563-.02.885-.08l5.47-.965c0 .101.02.201.02.282a2.87 2.87 0 01-.181 1.005c-.161.463-.563 1.106-1.227 1.931l-.845 1.046c-1.488 1.79-2.534 3.318-3.177 4.585a9.917 9.917 0 00-.945 2.594 7.23 7.23 0 00-.161 1.428c0 .322.02.643.081.945.08.442.181.804.322 1.086s.342.503.563.623.523.161.965.161c.543 0 1.287-.08 2.232-.241l5.953-1.026c1.046-.181 1.79-.442 2.212-.784a1.39 1.39 0 00.523-1.106c0-.121-.02-.241-.04-.362a1.333 1.333 0 00-.322-.704z"/></g></symbol></svg>
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 5be403bb31b..3c42c04fd18 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.123.1",
+  "version": "0.124.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -611,7 +611,7 @@
     "@types/xml2js": "^0.4.3",
     "gulp": "^4.0.0",
     "jest": "^26.4.2",
-    "n8n-workflow": "~0.62.0",
+    "n8n-workflow": "~0.63.0",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
     "typescript": "~3.9.7"
@@ -627,7 +627,7 @@
     "cheerio": "1.0.0-rc.6",
     "cron": "^1.7.2",
     "eventsource": "^1.0.7",
-    "fflate": "^0.6.9",
+    "fflate": "^0.7.0",
     "formidable": "^1.2.1",
     "get-system-fonts": "^2.0.2",
     "glob-promise": "^3.4.0",
@@ -649,7 +649,7 @@
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.75.0",
+    "n8n-core": "~0.76.0",
     "node-ssh": "^11.0.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 0adc605196b..0fa3d4943d0 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.62.0",
+  "version": "0.63.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index e76da5fb2ce..f48d605e2d7 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -348,6 +348,7 @@ export interface INode {
 	type: string;
 	position: [number, number];
 	disabled?: boolean;
+	notes?: string;
 	notesInFlow?: boolean;
 	retryOnFail?: boolean;
 	maxTries?: number;