diff --git a/LICENSE.md b/LICENSE.md
index 24a7d38fc..3dd835dee 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -19,7 +19,7 @@ Condition notice.
 
 Software: n8n
 
-License: Apache 2.0
+License: Apache 2.0 with Commons Clause
 
 Licensor: n8n GmbH
 
diff --git a/docker/compose/withMongo/.env b/docker/compose/withMongo/.env
deleted file mode 100644
index a1141f23f..000000000
--- a/docker/compose/withMongo/.env
+++ /dev/null
@@ -1,9 +0,0 @@
-MONGO_INITDB_ROOT_USERNAME=changeUser
-MONGO_INITDB_ROOT_PASSWORD=changePassword
-MONGO_INITDB_DATABASE=n8n
-
-MONGO_NON_ROOT_USERNAME=changeUser
-MONGO_NON_ROOT_PASSWORD=changePassword
-
-N8N_BASIC_AUTH_USER=changeUser
-N8N_BASIC_AUTH_PASSWORD=changePassword
diff --git a/docker/compose/withMongo/README.md b/docker/compose/withMongo/README.md
deleted file mode 100644
index bfb4b0f64..000000000
--- a/docker/compose/withMongo/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# n8n with MongoDB
-
-Starts n8n with MongoDB as database.
-
-
-## Start
-
-To start n8n with MongoDB simply start docker-compose by executing the following
-command in the current folder.
-
-
-**IMPORTANT:** But before you do that change the default users and passwords in the `.env` file!
-
-```
-docker-compose up -d
-```
-
-To stop it execute:
-
-```
-docker-compose stop
-```
-
-## Configuration
-
-The default name of the database, user and password for MongoDB can be changed in the `.env` file in the current directory.
diff --git a/docker/compose/withMongo/docker-compose.yml b/docker/compose/withMongo/docker-compose.yml
deleted file mode 100644
index 67cfcf001..000000000
--- a/docker/compose/withMongo/docker-compose.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: '3.1'
-
-services:
-
-  mongo:
-    image: mongo:4.0
-    restart: always
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME
-      - MONGO_INITDB_ROOT_PASSWORD
-      - MONGO_INITDB_DATABASE
-      - MONGO_NON_ROOT_USERNAME
-      - MONGO_NON_ROOT_PASSWORD
-    volumes:
-      - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
-
-  n8n:
-    image: n8nio/n8n
-    restart: always
-    environment:
-      - DB_TYPE=mongodb
-      - DB_MONGODB_CONNECTION_URL=mongodb://${MONGO_NON_ROOT_USERNAME}:${MONGO_NON_ROOT_PASSWORD}@mongo:27017/${MONGO_INITDB_DATABASE}
-      - N8N_BASIC_AUTH_ACTIVE=true
-      - N8N_BASIC_AUTH_USER
-      - N8N_BASIC_AUTH_PASSWORD
-    ports:
-      - 5678:5678
-    links:
-      - mongo
-    volumes:
-      - ~/.n8n:/root/.n8n
-    # Wait 5 seconds to start n8n to make sure that MongoDB is ready
-    # when n8n tries to connect to it
-    command: /bin/sh -c "sleep 5; n8n start"
diff --git a/docker/compose/withMongo/init-data.sh b/docker/compose/withMongo/init-data.sh
deleted file mode 100755
index bf5c10c84..000000000
--- a/docker/compose/withMongo/init-data.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e;
-
-# Create a default non-root role
-MONGO_NON_ROOT_ROLE="${MONGO_NON_ROOT_ROLE:-readWrite}"
-
-if [ -n "${MONGO_NON_ROOT_USERNAME:-}" ] && [ -n "${MONGO_NON_ROOT_PASSWORD:-}" ]; then
-	"${mongo[@]}" "$MONGO_INITDB_DATABASE" <<-EOJS
-		db.createUser({
-			user: $(_js_escape "$MONGO_NON_ROOT_USERNAME"),
-			pwd: $(_js_escape "$MONGO_NON_ROOT_PASSWORD"),
-			roles: [ { role: $(_js_escape "$MONGO_NON_ROOT_ROLE"), db: $(_js_escape "$MONGO_INITDB_DATABASE") } ]
-			})
-	EOJS
-else
-	echo "SETUP INFO: No Environment variables given!"
-fi
diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 9269427ae..849e5f26b 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,43 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 0.87.0
+
+### What changed?
+
+The link.fish node got removed because the service is shutting down.
+
+### When is action necessary?
+
+If you are are actively using the link.fish node.
+
+### How to upgrade:
+
+Unfortunately, that's not possible. We'd recommend you to look for an alternative service.
+
+
+## 0.83.0
+
+### What changed?
+
+In the Active Campaign Node, we have changed how the `getAll` operation works with various resources for the sake of consistency. To achieve this, a new parameter called 'Simple' has been added.
+
+### When is action necessary?
+
+When one of the following resources/operations is used:
+
+| Resource | Operation |
+|--|--|
+| Deal | Get All |
+| Connector | Get All |
+|  E-commerce Order | Get All |
+|  E-commerce Customer | Get All |
+|  E-commerce Order Products | Get All |
+
+### How to upgrade:
+
+Open the affected resource/operation and set the parameter `Simple` to false.
+
 ## 0.79.0
 
 ### What changed?
diff --git a/packages/cli/LICENSE.md b/packages/cli/LICENSE.md
index 24a7d38fc..3dd835dee 100644
--- a/packages/cli/LICENSE.md
+++ b/packages/cli/LICENSE.md
@@ -19,7 +19,7 @@ Condition notice.
 
 Software: n8n
 
-License: Apache 2.0
+License: Apache 2.0 with Commons Clause
 
 Licensor: n8n GmbH
 
diff --git a/packages/cli/bin/n8n b/packages/cli/bin/n8n
index 7f02bd1a7..583dfa5bf 100755
--- a/packages/cli/bin/n8n
+++ b/packages/cli/bin/n8n
@@ -10,7 +10,7 @@ process.env.NODE_CONFIG_DIR = process.env.NODE_CONFIG_DIR || path.join(__dirname
 var versionFlags = [ // tslint:disable-line:no-var-keyword
 	'-v',
 	'-V',
-	'--version'
+	'--version',
 ];
 if (versionFlags.includes(process.argv.slice(-1)[0])) {
 	console.log(require('../package').version);
@@ -22,23 +22,10 @@ if (process.argv.length === 2) {
 	process.argv.push('start');
 }
 
-var command = process.argv[2]; // tslint:disable-line:no-var-keyword
+var nodeVersion = process.versions.node.split('.');
 
-// Check if the command the user did enter is supported else stop
-var supportedCommands = [ // tslint:disable-line:no-var-keyword
-	'execute',
-	'help',
-	'start',
-];
-
-if (!supportedCommands.includes(command)) {
-	console.log('\nThe command "' + command + '" is not known!\n');
-	process.argv.pop();
-	process.argv.push('--help');
-}
-
-if (parseInt(process.versions.node.split('.')[0], 10) < 10) {
-	console.log('\nThe Node.js version is too old to run n8n. Please use version 10 or later!\n');
+if (parseInt(nodeVersion[0], 10) < 12 || parseInt(nodeVersion[0], 10) === 12 && parseInt(nodeVersion[1], 10) < 9) {
+	console.log(`\nYour Node.js version (${process.versions.node}) is too old to run n8n.\nPlease update to version 12.9 or later!\n`);
 	process.exit(0);
 }
 
diff --git a/packages/cli/commands/config/workflow/deactivate.ts b/packages/cli/commands/config/workflow/deactivate.ts
new file mode 100644
index 000000000..8c76dcf79
--- /dev/null
+++ b/packages/cli/commands/config/workflow/deactivate.ts
@@ -0,0 +1,70 @@
+import {
+	Command, flags,
+} from '@oclif/command';
+
+import {
+	IDataObject
+} from 'n8n-workflow';
+
+import {
+	Db,
+	GenericHelpers,
+} from "../../../src";
+
+
+export class DeactivateCommand extends Command {
+	static description = '\nDeactivates workflows';
+
+	static examples = [
+		`$ n8n config:workflow:deactivate --all`,
+		`$ n8n config:workflow:deactivate --id=5`,
+	];
+
+	static flags = {
+		help: flags.help({ char: 'h' }),
+		all: flags.boolean({
+			description: 'Deactivates all workflows',
+		}),
+		id: flags.string({
+			description: 'Deactivats the workflow with the given ID',
+		}),
+	};
+
+	async run() {
+		const { flags } = this.parse(DeactivateCommand);
+
+		if (!flags.all && !flags.id) {
+			GenericHelpers.logOutput(`Either option "--all" or "--id" have to be set!`);
+			return;
+		}
+
+		if (flags.all && flags.id) {
+			GenericHelpers.logOutput(`Either "--all" or "--id" can be set never both!`);
+			return;
+		}
+
+		try {
+			await Db.init();
+
+			const findQuery: IDataObject = {};
+			if (flags.id) {
+				console.log(`Deactivating workflow with ID: ${flags.id}`);
+				findQuery.id = flags.id;
+			} else {
+				console.log('Deactivating all workflows');
+				findQuery.active = true;
+			}
+
+			await Db.collections.Workflow!.update(findQuery, { active: false });
+			console.log('Done');
+		} 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/commands/execute.ts b/packages/cli/commands/execute.ts
index 3eb5956e9..b3450e9ef 100644
--- a/packages/cli/commands/execute.ts
+++ b/packages/cli/commands/execute.ts
@@ -10,6 +10,7 @@ import {
 import {
 	ActiveExecutions,
 	CredentialsOverwrites,
+	CredentialTypes,
 	Db,
 	ExternalHooks,
 	GenericHelpers,
@@ -116,6 +117,8 @@ export class Execute extends Command {
 		// 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);
 
 		if (!WorkflowHelpers.isWorkflowIdValid(workflowId)) {
 			workflowId = undefined;
diff --git a/packages/cli/commands/start.ts b/packages/cli/commands/start.ts
index ef9170a92..8e14b98e2 100644
--- a/packages/cli/commands/start.ts
+++ b/packages/cli/commands/start.ts
@@ -8,12 +8,14 @@ const open = require('open');
 
 import * as config from '../config';
 import {
+	ActiveExecutions,
 	ActiveWorkflowRunner,
-	CredentialTypes,
 	CredentialsOverwrites,
+	CredentialTypes,
 	Db,
 	ExternalHooks,
 	GenericHelpers,
+	IExecutionsCurrentSummary,
 	LoadNodesAndCredentials,
 	NodeTypes,
 	Server,
@@ -68,23 +70,46 @@ export class Start extends Command {
 	static async stopProcess() {
 		console.log(`\nStopping n8n...`);
 
-		setTimeout(() => {
-			// In case that something goes wrong with shutdown we
-			// kill after max. 30 seconds no matter what
-			process.exit(processExistCode);
-		}, 30000);
+		try {
+			const externalHooks = ExternalHooks();
+			await externalHooks.run('n8n.stop', []);
 
-		const removePromises = [];
-		if (activeWorkflowRunner !== undefined) {
-			removePromises.push(activeWorkflowRunner.removeAll());
+			setTimeout(() => {
+				// In case that something goes wrong with shutdown we
+				// kill after max. 30 seconds no matter what
+				process.exit(processExistCode);
+			}, 30000);
+
+			const removePromises = [];
+			if (activeWorkflowRunner !== undefined) {
+				removePromises.push(activeWorkflowRunner.removeAll());
+			}
+
+			// Remove all test webhooks
+			const testWebhooks = TestWebhooks.getInstance();
+			removePromises.push(testWebhooks.removeAll());
+
+			await Promise.all(removePromises);
+
+			// Wait for active workflow executions to finish
+			const activeExecutionsInstance = ActiveExecutions.getInstance();
+			let executingWorkflows = activeExecutionsInstance.getActiveExecutions();
+
+			let count = 0;
+			while (executingWorkflows.length !== 0) {
+				if (count++ % 4 === 0) {
+					console.log(`Waiting for ${executingWorkflows.length} active executions to finish...`);
+				}
+				await new Promise((resolve) => {
+					setTimeout(resolve, 500);
+				});
+				executingWorkflows = activeExecutionsInstance.getActiveExecutions();
+			}
+
+		} catch (error) {
+			console.error('There was an error shutting down n8n.', error);
 		}
 
-		// Remove all test webhooks
-		const testWebhooks = TestWebhooks.getInstance();
-		removePromises.push(testWebhooks.removeAll());
-
-		await Promise.all(removePromises);
-
 		process.exit(processExistCode);
 	}
 
diff --git a/packages/cli/config/index.ts b/packages/cli/config/index.ts
index 32dec2438..e654b50d0 100644
--- a/packages/cli/config/index.ts
+++ b/packages/cli/config/index.ts
@@ -10,58 +10,58 @@ const config = convict({
 			doc: 'Type of database to use',
 			format: ['sqlite', 'mariadb', 'mongodb', 'mysqldb', 'postgresdb'],
 			default: 'sqlite',
-			env: 'DB_TYPE'
+			env: 'DB_TYPE',
 		},
 		mongodb: {
 			connectionUrl: {
 				doc: 'MongoDB Connection URL',
 				format: '*',
 				default: 'mongodb://user:password@localhost:27017/database',
-				env: 'DB_MONGODB_CONNECTION_URL'
-			}
+				env: 'DB_MONGODB_CONNECTION_URL',
+			},
 		},
 		tablePrefix: {
 			doc: 'Prefix for table names',
 			format: '*',
 			default: '',
-			env: 'DB_TABLE_PREFIX'
+			env: 'DB_TABLE_PREFIX',
 		},
 		postgresdb: {
 			database: {
 				doc: 'PostgresDB Database',
 				format: String,
 				default: 'n8n',
-				env: 'DB_POSTGRESDB_DATABASE'
+				env: 'DB_POSTGRESDB_DATABASE',
 			},
 			host: {
 				doc: 'PostgresDB Host',
 				format: String,
 				default: 'localhost',
-				env: 'DB_POSTGRESDB_HOST'
+				env: 'DB_POSTGRESDB_HOST',
 			},
 			password: {
 				doc: 'PostgresDB Password',
 				format: String,
 				default: '',
-				env: 'DB_POSTGRESDB_PASSWORD'
+				env: 'DB_POSTGRESDB_PASSWORD',
 			},
 			port: {
 				doc: 'PostgresDB Port',
 				format: Number,
 				default: 5432,
-				env: 'DB_POSTGRESDB_PORT'
+				env: 'DB_POSTGRESDB_PORT',
 			},
 			user: {
 				doc: 'PostgresDB User',
 				format: String,
 				default: 'root',
-				env: 'DB_POSTGRESDB_USER'
+				env: 'DB_POSTGRESDB_USER',
 			},
 			schema: {
 				doc: 'PostgresDB Schema',
 				format: String,
 				default: 'public',
-				env: 'DB_POSTGRESDB_SCHEMA'
+				env: 'DB_POSTGRESDB_SCHEMA',
 			},
 
 			ssl: {
@@ -89,7 +89,7 @@ const config = convict({
 					default: true,
 					env: 'DB_POSTGRESDB_SSL_REJECT_UNAUTHORIZED',
 				},
-			}
+			},
 
 		},
 		mysqldb: {
@@ -97,31 +97,31 @@ const config = convict({
 				doc: 'MySQL Database',
 				format: String,
 				default: 'n8n',
-				env: 'DB_MYSQLDB_DATABASE'
+				env: 'DB_MYSQLDB_DATABASE',
 			},
 			host: {
 				doc: 'MySQL Host',
 				format: String,
 				default: 'localhost',
-				env: 'DB_MYSQLDB_HOST'
+				env: 'DB_MYSQLDB_HOST',
 			},
 			password: {
 				doc: 'MySQL Password',
 				format: String,
 				default: '',
-				env: 'DB_MYSQLDB_PASSWORD'
+				env: 'DB_MYSQLDB_PASSWORD',
 			},
 			port: {
 				doc: 'MySQL Port',
 				format: Number,
 				default: 3306,
-				env: 'DB_MYSQLDB_PORT'
+				env: 'DB_MYSQLDB_PORT',
 			},
 			user: {
 				doc: 'MySQL User',
 				format: String,
 				default: 'root',
-				env: 'DB_MYSQLDB_USER'
+				env: 'DB_MYSQLDB_USER',
 			},
 		},
 	},
@@ -136,7 +136,7 @@ const config = convict({
 				doc: 'Overwrites for credentials',
 				format: '*',
 				default: '{}',
-				env: 'CREDENTIALS_OVERWRITE_DATA'
+				env: 'CREDENTIALS_OVERWRITE_DATA',
 			},
 			endpoint: {
 				doc: 'Fetch credentials from API',
@@ -156,7 +156,7 @@ const config = convict({
 			doc: 'In what process workflows should be executed',
 			format: ['main', 'own'],
 			default: 'own',
-			env: 'EXECUTIONS_PROCESS'
+			env: 'EXECUTIONS_PROCESS',
 		},
 
 		// A Workflow times out and gets canceled after this time (seconds).
@@ -174,13 +174,13 @@ const config = convict({
 			doc: 'Max run time (seconds) before stopping the workflow execution',
 			format: Number,
 			default: -1,
-			env: 'EXECUTIONS_TIMEOUT'
+			env: 'EXECUTIONS_TIMEOUT',
 		},
 		maxTimeout: {
 			doc: 'Max execution time (seconds) that can be set for a workflow individually',
 			format: Number,
 			default: 3600,
-			env: 'EXECUTIONS_TIMEOUT_MAX'
+			env: 'EXECUTIONS_TIMEOUT_MAX',
 		},
 
 		// If a workflow executes all the data gets saved by default. This
@@ -193,13 +193,13 @@ const config = convict({
 			doc: 'What workflow execution data to save on error',
 			format: ['all', 'none'],
 			default: 'all',
-			env: 'EXECUTIONS_DATA_SAVE_ON_ERROR'
+			env: 'EXECUTIONS_DATA_SAVE_ON_ERROR',
 		},
 		saveDataOnSuccess: {
 			doc: 'What workflow execution data to save on success',
 			format: ['all', 'none'],
 			default: 'all',
-			env: 'EXECUTIONS_DATA_SAVE_ON_SUCCESS'
+			env: 'EXECUTIONS_DATA_SAVE_ON_SUCCESS',
 		},
 
 		// If the executions of workflows which got started via the editor
@@ -211,7 +211,7 @@ const config = convict({
 			doc: 'Save data of executions when started manually via editor',
 			format: 'Boolean',
 			default: false,
-			env: 'EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS'
+			env: 'EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS',
 		},
 
 		// To not exceed the database's capacity and keep its size moderate
@@ -223,19 +223,19 @@ const config = convict({
 			doc: 'Delete data of past executions on a rolling basis',
 			format: 'Boolean',
 			default: false,
-			env: 'EXECUTIONS_DATA_PRUNE'
+			env: 'EXECUTIONS_DATA_PRUNE',
 		},
 		pruneDataMaxAge: {
 			doc: 'How old (hours) the execution data has to be to get deleted',
 			format: Number,
 			default: 336,
-			env: 'EXECUTIONS_DATA_MAX_AGE'
+			env: 'EXECUTIONS_DATA_MAX_AGE',
 		},
 		pruneDataTimeout: {
 			doc: 'Timeout (seconds) after execution data has been pruned',
 			format: Number,
 			default: 3600,
-			env: 'EXECUTIONS_DATA_PRUNE_TIMEOUT'
+			env: 'EXECUTIONS_DATA_PRUNE_TIMEOUT',
 		},
 	},
 
@@ -248,7 +248,7 @@ const config = convict({
 			doc: 'The timezone to use',
 			format: '*',
 			default: 'America/New_York',
-			env: 'GENERIC_TIMEZONE'
+			env: 'GENERIC_TIMEZONE',
 		},
 	},
 
@@ -258,66 +258,78 @@ const config = convict({
 		default: '/',
 		arg: 'path',
 		env: 'N8N_PATH',
-		doc: 'Path n8n is deployed to'
+		doc: 'Path n8n is deployed to',
 	},
 	host: {
 		format: String,
 		default: 'localhost',
 		arg: 'host',
 		env: 'N8N_HOST',
-		doc: 'Host name n8n can be reached'
+		doc: 'Host name n8n can be reached',
 	},
 	port: {
 		format: Number,
 		default: 5678,
 		arg: 'port',
 		env: 'N8N_PORT',
-		doc: 'HTTP port n8n can be reached'
+		doc: 'HTTP port n8n can be reached',
 	},
 	listen_address: {
 		format: String,
 		default: '0.0.0.0',
 		env: 'N8N_LISTEN_ADDRESS',
-		doc: 'IP address n8n should listen on'
+		doc: 'IP address n8n should listen on',
 	},
 	protocol: {
 		format: ['http', 'https'],
 		default: 'http',
 		env: 'N8N_PROTOCOL',
-		doc: 'HTTP Protocol via which n8n can be reached'
+		doc: 'HTTP Protocol via which n8n can be reached',
 	},
 	ssl_key: {
 		format: String,
 		default: '',
 		env: 'N8N_SSL_KEY',
-		doc: 'SSL Key for HTTPS Protocol'
+		doc: 'SSL Key for HTTPS Protocol',
 	},
 	ssl_cert: {
 		format: String,
 		default: '',
 		env: 'N8N_SSL_CERT',
-		doc: 'SSL Cert for HTTPS Protocol'
+		doc: 'SSL Cert for HTTPS Protocol',
 	},
 
 	security: {
+		excludeEndpoints: {
+			doc: 'Additional endpoints to exclude auth checks. Multiple endpoints can be separated by colon (":")',
+			format: String,
+			default: '',
+			env: 'N8N_AUTH_EXCLUDE_ENDPOINTS',
+		},
 		basicAuth: {
 			active: {
 				format: 'Boolean',
 				default: false,
 				env: 'N8N_BASIC_AUTH_ACTIVE',
-				doc: 'If basic auth should be activated for editor and REST-API'
+				doc: 'If basic auth should be activated for editor and REST-API',
 			},
 			user: {
 				format: String,
 				default: '',
 				env: 'N8N_BASIC_AUTH_USER',
-				doc: 'The name of the basic auth user'
+				doc: 'The name of the basic auth user',
 			},
 			password: {
 				format: String,
 				default: '',
 				env: 'N8N_BASIC_AUTH_PASSWORD',
-				doc: 'The password of the basic auth user'
+				doc: 'The password of the basic auth user',
+			},
+			hash: {
+				format: 'Boolean',
+				default: false,
+				env: 'N8N_BASIC_AUTH_HASH',
+				doc: 'If password for basic auth is hashed',
 			},
 		},
 		jwtAuth: {
@@ -325,49 +337,49 @@ const config = convict({
 				format: 'Boolean',
 				default: false,
 				env: 'N8N_JWT_AUTH_ACTIVE',
-				doc: 'If JWT auth should be activated for editor and REST-API'
+				doc: 'If JWT auth should be activated for editor and REST-API',
 			},
 			jwtHeader: {
 				format: String,
 				default: '',
 				env: 'N8N_JWT_AUTH_HEADER',
-				doc: 'The request header containing a signed JWT'
+				doc: 'The request header containing a signed JWT',
 			},
 			jwtHeaderValuePrefix: {
 				format: String,
 				default: '',
 				env: 'N8N_JWT_AUTH_HEADER_VALUE_PREFIX',
-				doc: 'The request header value prefix to strip (optional)'
+				doc: 'The request header value prefix to strip (optional)',
 			},
 			jwksUri: {
 				format: String,
 				default: '',
 				env: 'N8N_JWKS_URI',
-				doc: 'The URI to fetch JWK Set for JWT authentication'
+				doc: 'The URI to fetch JWK Set for JWT authentication',
 			},
 			jwtIssuer: {
 				format: String,
 				default: '',
 				env: 'N8N_JWT_ISSUER',
-				doc: 'JWT issuer to expect (optional)'
+				doc: 'JWT issuer to expect (optional)',
 			},
 			jwtNamespace: {
 				format: String,
 				default: '',
 				env: 'N8N_JWT_NAMESPACE',
-				doc: 'JWT namespace to expect (optional)'
+				doc: 'JWT namespace to expect (optional)',
 			},
 			jwtAllowedTenantKey: {
 				format: String,
 				default: '',
 				env: 'N8N_JWT_ALLOWED_TENANT_KEY',
-				doc: 'JWT tenant key name to inspect within JWT namespace (optional)'
+				doc: 'JWT tenant key name to inspect within JWT namespace (optional)',
 			},
 			jwtAllowedTenant: {
 				format: String,
 				default: '',
 				env: 'N8N_JWT_ALLOWED_TENANT',
-				doc: 'JWT tenant to allow (optional)'
+				doc: 'JWT tenant to allow (optional)',
 			},
 		},
 	},
@@ -377,19 +389,19 @@ const config = convict({
 			format: String,
 			default: 'rest',
 			env: 'N8N_ENDPOINT_REST',
-			doc: 'Path for rest endpoint'
+			doc: 'Path for rest endpoint',
 		},
 		webhook: {
 			format: String,
 			default: 'webhook',
 			env: 'N8N_ENDPOINT_WEBHOOK',
-			doc: 'Path for webhook endpoint'
+			doc: 'Path for webhook endpoint',
 		},
 		webhookTest: {
 			format: String,
 			default: 'webhook-test',
 			env: 'N8N_ENDPOINT_WEBHOOK_TEST',
-			doc: 'Path for test-webhook endpoint'
+			doc: 'Path for test-webhook endpoint',
 		},
 	},
 
@@ -397,7 +409,7 @@ const config = convict({
 		doc: 'Files containing external hooks. Multiple files can be separated by colon (":")',
 		format: String,
 		default: '',
-		env: 'EXTERNAL_HOOK_FILES'
+		env: 'EXTERNAL_HOOK_FILES',
 	},
 
 	nodes: {
@@ -421,13 +433,13 @@ const config = convict({
 				}
 			},
 			default: '[]',
-			env: 'NODES_EXCLUDE'
+			env: 'NODES_EXCLUDE',
 		},
 		errorTriggerType: {
 			doc: 'Node Type to use as Error Trigger',
 			format: String,
 			default: 'n8n-nodes-base.errorTrigger',
-			env: 'NODES_ERROR_TRIGGER_TYPE'
+			env: 'NODES_ERROR_TRIGGER_TYPE',
 		},
 	},
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 049af1d77..580994fa9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "n8n",
-    "version": "0.80.0",
+    "version": "0.89.2",
     "description": "n8n Workflow Automation Tool",
     "license": "SEE LICENSE IN LICENSE.md",
     "homepage": "https://n8n.io",
@@ -28,6 +28,7 @@
         "start:windows": "cd bin && n8n",
         "test": "jest",
         "tslint": "tslint -p tsconfig.json -c tslint.json",
+        "tslintfix": "tslint --fix -p tsconfig.json -c tslint.json",
         "watch": "tsc --watch",
         "typeorm": "ts-node ./node_modules/typeorm/cli.js"
     },
@@ -54,33 +55,35 @@
     "devDependencies": {
         "@oclif/dev-cli": "^1.22.2",
         "@types/basic-auth": "^1.1.2",
+        "@types/bcryptjs": "^2.4.1",
         "@types/compression": "1.0.1",
         "@types/connect-history-api-fallback": "^1.3.1",
         "@types/convict": "^4.2.1",
         "@types/dotenv": "^8.2.0",
         "@types/express": "^4.17.6",
-        "@types/jest": "^25.2.1",
+        "@types/jest": "^26.0.13",
         "@types/localtunnel": "^1.9.0",
         "@types/lodash.get": "^4.4.6",
-        "@types/node": "^14.0.27",
+        "@types/node": "14.0.27",
         "@types/open": "^6.1.0",
         "@types/parseurl": "^1.3.1",
         "@types/request-promise-native": "~1.0.15",
         "concurrently": "^5.1.0",
-        "jest": "^24.9.0",
+        "jest": "^26.4.2",
         "nodemon": "^2.0.2",
         "p-cancelable": "^2.0.0",
         "run-script-os": "^1.0.7",
-        "ts-jest": "^25.4.0",
+        "ts-jest": "^26.3.0",
+        "ts-node": "^8.9.1",
         "tslint": "^6.1.2",
-        "typescript": "~3.7.4",
-        "ts-node": "^8.9.1"
+        "typescript": "~3.9.7"
     },
     "dependencies": {
         "@oclif/command": "^1.5.18",
         "@oclif/errors": "^1.2.2",
         "@types/jsonwebtoken": "^8.3.4",
         "basic-auth": "^2.0.1",
+        "bcryptjs": "^2.4.3",
         "body-parser": "^1.18.3",
         "body-parser-xml": "^1.1.0",
         "client-oauth2": "^4.2.5",
@@ -95,15 +98,15 @@
         "google-timezones-json": "^1.0.2",
         "inquirer": "^7.0.1",
         "jsonwebtoken": "^8.5.1",
-        "jwks-rsa": "^1.6.0",
+        "jwks-rsa": "~1.9.0",
         "localtunnel": "^2.0.0",
         "lodash.get": "^4.4.2",
         "mongodb": "^3.5.5",
-        "mysql2": "^2.0.1",
-        "n8n-core": "~0.44.0",
-        "n8n-editor-ui": "~0.55.0",
-        "n8n-nodes-base": "~0.75.0",
-        "n8n-workflow": "~0.39.0",
+        "mysql2": "~2.1.0",
+        "n8n-core": "~0.48.0",
+        "n8n-editor-ui": "~0.60.0",
+        "n8n-nodes-base": "~0.85.0",
+        "n8n-workflow": "~0.42.0",
         "oauth-1.0a": "^2.2.6",
         "open": "^7.0.0",
         "pg": "^8.3.0",
diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
index 8d7c73dd0..e6ed0fa58 100644
--- a/packages/cli/src/ActiveExecutions.ts
+++ b/packages/cli/src/ActiveExecutions.ts
@@ -7,8 +7,8 @@ import {
 } from 'n8n-core';
 
 import {
-	IExecutionsCurrentSummary,
 	IExecutingWorkflowData,
+	IExecutionsCurrentSummary,
 	IWorkflowExecutionDataProcess,
 } from '.';
 
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 0d2e9bad3..6a955969a 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -1,17 +1,17 @@
 import {
-	IActivationError,
 	Db,
-	NodeTypes,
+	IActivationError,
 	IResponseCallbackData,
+	IWebhookDb,
 	IWorkflowDb,
 	IWorkflowExecutionDataProcess,
+	NodeTypes,
 	ResponseHelper,
 	WebhookHelpers,
 	WorkflowCredentials,
+	WorkflowExecuteAdditionalData,
 	WorkflowHelpers,
 	WorkflowRunner,
-	WorkflowExecuteAdditionalData,
-	IWebhookDb,
 } from './';
 
 import {
@@ -26,8 +26,8 @@ import {
 	INode,
 	INodeExecutionData,
 	IRunExecutionData,
-	NodeHelpers,
 	IWorkflowExecuteAdditionalData as IWorkflowExecuteAdditionalDataWorkflow,
+	NodeHelpers,
 	WebhookHttpMethod,
 	Workflow,
 	WorkflowExecuteMode,
@@ -181,8 +181,9 @@ export class ActiveWorkflowRunner {
 	 * @returns {string[]}
 	 * @memberof ActiveWorkflowRunner
 	 */
-	getActiveWorkflows(): Promise<IWorkflowDb[]> {
-		return Db.collections.Workflow?.find({ where: { active: true }, select: ['id'] }) as Promise<IWorkflowDb[]>;
+	async getActiveWorkflows(): Promise<IWorkflowDb[]> {
+		const activeWorkflows = await Db.collections.Workflow?.find({ where: { active: true }, select: ['id'] }) as IWorkflowDb[];
+		return activeWorkflows.filter(workflow => this.activationErrors[workflow.id.toString()] === undefined);
 	}
 
 
@@ -234,7 +235,7 @@ export class ActiveWorkflowRunner {
 			path = node.parameters.path as string;
 
 			if (node.parameters.path === undefined) {
-				path = workflow.getSimpleParameterValue(node, webhookData.webhookDescription['path']) as string | undefined;
+				path = workflow.expression.getSimpleParameterValue(node, webhookData.webhookDescription['path']) as string | undefined;
 
 				if (path === undefined) {
 					// TODO: Use a proper logger
@@ -243,7 +244,7 @@ export class ActiveWorkflowRunner {
 				}
 			}
 
-			const isFullPath: boolean = workflow.getSimpleParameterValue(node, webhookData.webhookDescription['isFullPath'], false) as boolean;
+			const isFullPath: boolean = workflow.expression.getSimpleParameterValue(node, webhookData.webhookDescription['isFullPath'], false) as boolean;
 
 			const webhook = {
 				workflowId: webhookData.workflowId,
@@ -257,17 +258,20 @@ export class ActiveWorkflowRunner {
 				await Db.collections.Webhook?.insert(webhook);
 
 				const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, false);
-				if (webhookExists === false) {
+				if (webhookExists !== true) {
 					// If webhook does not exist yet create it
 					await workflow.runWebhookMethod('create', webhookData, NodeExecuteFunctions, mode, false);
 				}
 
 			} catch (error) {
+				try {
+					await this.removeWorkflowWebhooks(workflow.id as string);
+				} catch (error) {
+					console.error(`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error.message}"`);
+				}
 
 				let errorMessage = '';
 
-				await Db.collections.Webhook?.delete({ workflowId: workflow.id });
-
 				// if it's a workflow from the the insert
 				// TODO check if there is standard error code for deplicate key violation that works
 				// with all databases
@@ -317,6 +321,8 @@ export class ActiveWorkflowRunner {
 			await workflow.runWebhookMethod('delete', webhookData, NodeExecuteFunctions, mode, false);
 		}
 
+		await WorkflowHelpers.saveStaticData(workflow);
+
 		// if it's a mongo objectId convert it to string
 		if (typeof workflowData.id === 'object') {
 			workflowData.id = workflowData.id.toString();
@@ -346,8 +352,8 @@ export class ActiveWorkflowRunner {
 				node,
 				data: {
 					main: data,
-				}
-			}
+				},
+			},
 		];
 
 		const executionData: IRunExecutionData = {
@@ -411,7 +417,7 @@ export class ActiveWorkflowRunner {
 			const returnFunctions = NodeExecuteFunctions.getExecuteTriggerFunctions(workflow, node, additionalData, mode);
 			returnFunctions.emit = (data: INodeExecutionData[][]): void => {
 				WorkflowHelpers.saveStaticData(workflow);
-				this.runWorkflow(workflowData, node, data, additionalData, mode);
+				this.runWorkflow(workflowData, node, data, additionalData, mode).catch((err) => console.error(err));
 			};
 			return returnFunctions;
 		});
@@ -495,7 +501,11 @@ export class ActiveWorkflowRunner {
 
 		if (this.activeWorkflows !== null) {
 			// Remove all the webhooks of the workflow
-			await this.removeWorkflowWebhooks(workflowId);
+			try {
+				await this.removeWorkflowWebhooks(workflowId);
+			} catch (error) {
+				console.error(`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`);
+			}
 
 			if (this.activationErrors[workflowId] !== undefined) {
 				// If there were any activation errors delete them
diff --git a/packages/cli/src/CredentialsHelper.ts b/packages/cli/src/CredentialsHelper.ts
index 84e368adf..4eae7932c 100644
--- a/packages/cli/src/CredentialsHelper.ts
+++ b/packages/cli/src/CredentialsHelper.ts
@@ -5,9 +5,14 @@ import {
 import {
 	ICredentialDataDecryptedObject,
 	ICredentialsHelper,
+	INode,
 	INodeParameters,
 	INodeProperties,
+	INodeType,
+	INodeTypeData,
+	INodeTypes,
 	NodeHelpers,
+	Workflow,
 } from 'n8n-workflow';
 
 import {
@@ -18,6 +23,19 @@ import {
 } from './';
 
 
+const mockNodeTypes: INodeTypes = {
+	nodeTypes: {},
+	init: async (nodeTypes?: INodeTypeData): Promise<void> => { },
+	getAll: (): INodeType[] => {
+		// Does not get used in Workflow so no need to return it
+		return [];
+	},
+	getByName: (nodeType: string): INodeType | undefined => {
+		return undefined;
+	},
+};
+
+
 export class CredentialsHelper extends ICredentialsHelper {
 
 	/**
@@ -107,7 +125,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 		const credentialsProperties = this.getCredentialsProperties(type);
 
 		// Add the default credential values
-		const decryptedData = NodeHelpers.getNodeParameters(credentialsProperties, decryptedDataOriginal as INodeParameters, true, false) as ICredentialDataDecryptedObject;
+		let decryptedData = NodeHelpers.getNodeParameters(credentialsProperties, decryptedDataOriginal as INodeParameters, true, false) as ICredentialDataDecryptedObject;
 
 		if (decryptedDataOriginal.oauthTokenData !== undefined) {
 			// The OAuth data gets removed as it is not defined specifically as a parameter
@@ -115,6 +133,18 @@ export class CredentialsHelper extends ICredentialsHelper {
 			decryptedData.oauthTokenData = decryptedDataOriginal.oauthTokenData;
 		}
 
+		const mockNode: INode = {
+			name: '',
+			typeVersion: 1,
+			type: 'mock',
+			position: [0, 0],
+			parameters: decryptedData as INodeParameters,
+		};
+
+		const workflow = new Workflow({ nodes: [mockNode], connections: {}, active: false, nodeTypes: mockNodeTypes});
+		// Resolve expressions if any are set
+		decryptedData = workflow.expression.getComplexParameterValue(mockNode, decryptedData as INodeParameters, undefined) as ICredentialDataDecryptedObject;
+
 		// Load and apply the credentials overwrites if any exist
 		const credentialsOverwrites = CredentialsOverwrites();
 		return credentialsOverwrites.applyOverwrite(type, decryptedData);
diff --git a/packages/cli/src/CredentialsOverwrites.ts b/packages/cli/src/CredentialsOverwrites.ts
index 40b6419da..5d202ce6b 100644
--- a/packages/cli/src/CredentialsOverwrites.ts
+++ b/packages/cli/src/CredentialsOverwrites.ts
@@ -3,32 +3,53 @@ import {
 } from 'n8n-workflow';
 
 import {
-	ICredentialsOverwrite,
+	CredentialTypes,
 	GenericHelpers,
+	ICredentialsOverwrite,
 } from './';
 
 
 class CredentialsOverwritesClass {
 
+	private credentialTypes = CredentialTypes();
 	private overwriteData: ICredentialsOverwrite = {};
+	private resolvedTypes: string[] = [];
+
 
 	async init(overwriteData?: ICredentialsOverwrite) {
 		if (overwriteData !== undefined) {
 			// If data is already given it can directly be set instead of
 			// loaded from environment
-			this.overwriteData = overwriteData;
+			this.__setData(JSON.parse(JSON.stringify(overwriteData)));
 			return;
 		}
 
 		const data = await GenericHelpers.getConfigValue('credentials.overwrite.data') as string;
 
 		try {
-			this.overwriteData = JSON.parse(data);
+			const overwriteData = JSON.parse(data);
+			this.__setData(overwriteData);
 		} catch (error) {
 			throw new Error(`The credentials-overwrite is not valid JSON.`);
 		}
 	}
 
+
+	__setData(overwriteData: ICredentialsOverwrite) {
+		this.overwriteData = overwriteData;
+
+		for (const credentialTypeData of this.credentialTypes.getAll()) {
+			const type = credentialTypeData.name;
+
+			const overwrites = this.__getExtended(type);
+
+			if (overwrites && Object.keys(overwrites).length) {
+				this.overwriteData[type] = overwrites;
+			}
+		}
+	}
+
+
 	applyOverwrite(type: string, data: ICredentialDataDecryptedObject) {
 
 		const overwrites = this.get(type);
@@ -48,10 +69,45 @@ class CredentialsOverwritesClass {
 		return returnData;
 	}
 
+
+	__getExtended(type: string): ICredentialDataDecryptedObject | undefined {
+
+		if (this.resolvedTypes.includes(type)) {
+			// Type got already resolved and can so returned directly
+			return this.overwriteData[type];
+		}
+
+		const credentialTypeData = this.credentialTypes.getByName(type);
+
+		if (credentialTypeData === undefined) {
+			throw new Error(`The credentials of type "${type}" are not known.`);
+		}
+
+		if (credentialTypeData.extends === undefined) {
+			this.resolvedTypes.push(type);
+			return this.overwriteData[type];
+		}
+
+		const overwrites: ICredentialDataDecryptedObject = {};
+		for (const credentialsTypeName of credentialTypeData.extends) {
+			Object.assign(overwrites, this.__getExtended(credentialsTypeName));
+		}
+
+		if (this.overwriteData[type] !== undefined) {
+			Object.assign(overwrites, this.overwriteData[type]);
+		}
+
+		this.resolvedTypes.push(type);
+
+		return overwrites;
+	}
+
+
 	get(type: string): ICredentialDataDecryptedObject | undefined {
 		return this.overwriteData[type];
 	}
 
+
 	getAll(): ICredentialsOverwrite {
 		return this.overwriteData;
 	}
diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index 06eeca797..f4522e52e 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -33,27 +33,27 @@ export let collections: IDatabaseCollections = {
 };
 
 import {
+	CreateIndexStoppedAt1594828256133,
 	InitialMigration1587669153312,
 	WebhookModel1589476000887,
-	CreateIndexStoppedAt1594828256133,
 } from './databases/postgresdb/migrations';
 
 import {
+	CreateIndexStoppedAt1594910478695,
 	InitialMigration1587563438936,
 	WebhookModel1592679094242,
-	CreateIndexStoppedAt1594910478695,
 } from './databases/mongodb/migrations';
 
 import {
+	CreateIndexStoppedAt1594902918301,
 	InitialMigration1588157391238,
 	WebhookModel1592447867632,
-	CreateIndexStoppedAt1594902918301,
 } from './databases/mysqldb/migrations';
 
 import {
+	CreateIndexStoppedAt1594825041918,
 	InitialMigration1588102412422,
 	WebhookModel1592445003908,
-	CreateIndexStoppedAt1594825041918,
 } from './databases/sqlite/migrations';
 
 import * as path from 'path';
@@ -154,7 +154,7 @@ export async function init(): Promise<IDatabaseCollections> {
 				migrations: [
 					InitialMigration1588102412422,
 					WebhookModel1592445003908,
-					CreateIndexStoppedAt1594825041918
+					CreateIndexStoppedAt1594825041918,
 				],
 				migrationsRun: true,
 				migrationsTableName: `${entityPrefix}migrations`,
diff --git a/packages/cli/src/ExternalHooks.ts b/packages/cli/src/ExternalHooks.ts
index 355415158..acdae264a 100644
--- a/packages/cli/src/ExternalHooks.ts
+++ b/packages/cli/src/ExternalHooks.ts
@@ -1,7 +1,7 @@
 import {
 	Db,
-	IExternalHooksFunctions,
 	IExternalHooksClass,
+	IExternalHooksFunctions,
 } from './';
 
 import * as config from '../config';
@@ -64,6 +64,10 @@ class ExternalHooksClass implements IExternalHooksClass {
 		}
 	}
 
+	exists(hookName: string): boolean {
+		return !!this.externalHooks[hookName];
+	}
+
 }
 
 
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index bef98af6f..b808a7356 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -288,6 +288,10 @@ export interface IN8nUISettings {
 	saveManualExecutions: boolean;
 	executionTimeout: number;
 	maxExecutionTimeout: number;
+	oauthCallbackUrls: {
+		oauth1: string;
+		oauth2: string;
+	};
 	timezone: string;
 	urlBaseWebhook: string;
 	versionCli: string;
diff --git a/packages/cli/src/NodeTypes.ts b/packages/cli/src/NodeTypes.ts
index 5f37a3376..0901ab7ed 100644
--- a/packages/cli/src/NodeTypes.ts
+++ b/packages/cli/src/NodeTypes.ts
@@ -1,7 +1,7 @@
 import {
 	INodeType,
-	INodeTypes,
 	INodeTypeData,
+	INodeTypes,
 	NodeHelpers,
 } from 'n8n-workflow';
 
diff --git a/packages/cli/src/ResponseHelper.ts b/packages/cli/src/ResponseHelper.ts
index c71647036..d09011eac 100644
--- a/packages/cli/src/ResponseHelper.ts
+++ b/packages/cli/src/ResponseHelper.ts
@@ -67,7 +67,7 @@ export function sendSuccessResponse(res: Response, data: any, raw?: boolean, res
 		res.json(data);
 	} else {
 		res.json({
-			data
+			data,
 		});
 	}
 }
@@ -183,7 +183,7 @@ export function unflattenExecutionData(fullExecutionData: IExecutionFlattedDb):
 		mode: fullExecutionData.mode,
 		startedAt: fullExecutionData.startedAt,
 		stoppedAt: fullExecutionData.stoppedAt,
-		finished: fullExecutionData.finished ? fullExecutionData.finished : false
+		finished: fullExecutionData.finished ? fullExecutionData.finished : false,
 	});
 
 	return returnData;
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 43886323a..df7dbdaf8 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -20,20 +20,24 @@ import { RequestOptions } from 'oauth-1.0a';
 import * as csrf from 'csrf';
 import * as requestPromise from 'request-promise-native';
 import { createHmac } from 'crypto';
+import { compare } from 'bcryptjs';
 
 import {
 	ActiveExecutions,
 	ActiveWorkflowRunner,
 	CredentialsHelper,
+	CredentialsOverwrites,
 	CredentialTypes,
 	Db,
 	ExternalHooks,
+	GenericHelpers,
 	IActivationError,
-	ICustomRequest,
 	ICredentialsDb,
 	ICredentialsDecryptedDb,
 	ICredentialsDecryptedResponse,
+	ICredentialsOverwrite,
 	ICredentialsResponse,
+	ICustomRequest,
 	IExecutionDeleteFilter,
 	IExecutionFlatted,
 	IExecutionFlattedDb,
@@ -46,21 +50,18 @@ import {
 	IN8nUISettings,
 	IPackageVersions,
 	IWorkflowBase,
-	IWorkflowShortResponse,
-	IWorkflowResponse,
 	IWorkflowExecutionDataProcess,
+	IWorkflowResponse,
+	IWorkflowShortResponse,
+	LoadNodesAndCredentials,
 	NodeTypes,
 	Push,
 	ResponseHelper,
 	TestWebhooks,
-	WorkflowCredentials,
 	WebhookHelpers,
+	WorkflowCredentials,
 	WorkflowExecuteAdditionalData,
 	WorkflowRunner,
-	GenericHelpers,
-	CredentialsOverwrites,
-	ICredentialsOverwrite,
-	LoadNodesAndCredentials,
 } from './';
 
 import {
@@ -74,9 +75,9 @@ import {
 	ICredentialType,
 	IDataObject,
 	INodeCredentials,
-	INodeTypeDescription,
 	INodeParameters,
 	INodePropertyOptions,
+	INodeTypeDescription,
 	IRunData,
 	IWorkflowCredentials,
 	Workflow,
@@ -120,7 +121,7 @@ class App {
 	push: Push.Push;
 	versions: IPackageVersions | undefined;
 	restEndpoint: string;
-
+	frontendSettings: IN8nUISettings;
 	protocol: string;
 	sslKey: string;
 	sslCert: string;
@@ -154,6 +155,25 @@ class App {
 
 		this.presetCredentialsLoaded = false;
 		this.endpointPresetCredentials = config.get('credentials.overwrite.endpoint') as string;
+
+		const urlBaseWebhook = WebhookHelpers.getWebhookBaseUrl();
+
+		this.frontendSettings = {
+			endpointWebhook: this.endpointWebhook,
+			endpointWebhookTest: this.endpointWebhookTest,
+			saveDataErrorExecution: this.saveDataErrorExecution,
+			saveDataSuccessExecution: this.saveDataSuccessExecution,
+			saveManualExecutions: this.saveManualExecutions,
+			executionTimeout: this.executionTimeout,
+			maxExecutionTimeout: this.maxExecutionTimeout,
+			timezone: this.timezone,
+			urlBaseWebhook,
+			versionCli: '',
+			oauthCallbackUrls: {
+				'oauth1': urlBaseWebhook + `${this.restEndpoint}/oauth1-credential/callback`,
+				'oauth2': urlBaseWebhook + `${this.restEndpoint}/oauth2-credential/callback`,
+			},
+		};
 	}
 
 
@@ -171,7 +191,16 @@ class App {
 	async config(): Promise<void> {
 
 		this.versions = await GenericHelpers.getVersions();
-		const authIgnoreRegex = new RegExp(`^\/(healthz|${this.endpointWebhook}|${this.endpointWebhookTest})\/?.*$`);
+		this.frontendSettings.versionCli = this.versions.cli;
+
+		await this.externalHooks.run('frontend.settings', [this.frontendSettings]);
+
+		const excludeEndpoints = config.get('security.excludeEndpoints') as string;
+
+		const ignoredEndpoints = ['healthz', this.endpointWebhook, this.endpointWebhookTest, this.endpointPresetCredentials];
+		ignoredEndpoints.push.apply(ignoredEndpoints, excludeEndpoints.split(':'));
+
+		const authIgnoreRegex = new RegExp(`^\/(${_(ignoredEndpoints).compact().join('|')})\/?.*$`);
 
 		// Check for basic auth credentials if activated
 		const basicAuthActive = config.get('security.basicAuth.active') as boolean;
@@ -186,7 +215,11 @@ class App {
 				throw new Error('Basic auth is activated but no password got defined. Please set one!');
 			}
 
-			this.app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {
+			const basicAuthHashEnabled = await GenericHelpers.getConfigValue('security.basicAuth.hash') as boolean;
+
+			let validPassword: null | string = null;
+
+			this.app.use(async (req: express.Request, res: express.Response, next: express.NextFunction) => {
 				if (req.url.match(authIgnoreRegex)) {
 					return next();
 				}
@@ -198,12 +231,27 @@ class App {
 					return ResponseHelper.basicAuthAuthorizationError(res, realm, 'Authorization is required!');
 				}
 
-				if (basicAuthData.name !== basicAuthUser || basicAuthData.pass !== basicAuthPassword) {
-					// Provided authentication data is wrong
-					return ResponseHelper.basicAuthAuthorizationError(res, realm, 'Authorization data is wrong!');
+				if (basicAuthData.name === basicAuthUser) {
+					if (basicAuthHashEnabled === true) {
+						if (validPassword === null && await compare(basicAuthData.pass, basicAuthPassword)) {
+							// Password is valid so save for future requests
+							validPassword = basicAuthData.pass;
+						}
+
+						if (validPassword === basicAuthData.pass && validPassword !== null) {
+							// Provided hash is correct
+							return next();
+						}
+					} else {
+						if (basicAuthData.pass === basicAuthPassword) {
+							// Provided password is correct
+							return next();
+						}
+					}
 				}
 
-				next();
+				// Provided authentication data is wrong
+				return ResponseHelper.basicAuthAuthorizationError(res, realm, 'Authorization data is wrong!');
 			});
 		}
 
@@ -265,7 +313,7 @@ class App {
 
 				const jwtVerifyOptions: jwt.VerifyOptions = {
 					issuer: jwtIssuer !== '' ? jwtIssuer : undefined,
-					ignoreExpiration: false
+					ignoreExpiration: false,
 				};
 
 				jwt.verify(token, getKey, jwtVerifyOptions, (err: jwt.VerifyErrors, decoded: object) => {
@@ -307,7 +355,7 @@ class App {
 			limit: '16mb', verify: (req, res, buf) => {
 				// @ts-ignore
 				req.rawBody = buf;
-			}
+			},
 		}));
 
 		// Support application/xml type post data
@@ -317,14 +365,14 @@ class App {
 				normalize: true,     // Trim whitespace inside text nodes
 				normalizeTags: true, // Transform tags to lowercase
 				explicitArray: false, // Only put properties in array if length > 1
-			}
+			},
 		}));
 
 		this.app.use(bodyParser.text({
 			limit: '16mb', verify: (req, res, buf) => {
 				// @ts-ignore
 				req.rawBody = buf;
-			}
+			},
 		}));
 
 		// Make sure that Vue history mode works properly
@@ -334,9 +382,9 @@ class App {
 					from: new RegExp(`^\/(${this.restEndpoint}|healthz|css|js|${this.endpointWebhook}|${this.endpointWebhookTest})\/?.*$`),
 					to: (context) => {
 						return context.parsedUrl!.pathname!.toString();
-					}
-				}
-			]
+					},
+				},
+			],
 		}));
 
 		//support application/x-www-form-urlencoded post data
@@ -344,7 +392,7 @@ class App {
 			verify: (req, res, buf) => {
 				// @ts-ignore
 				req.rawBody = buf;
-			}
+			},
 		}));
 
 		if (process.env['NODE_ENV'] !== 'production') {
@@ -532,6 +580,7 @@ class App {
 			newWorkflowData.updatedAt = this.getCurrentDate();
 
 			await Db.collections.Workflow!.update(id, newWorkflowData);
+			await this.externalHooks.run('workflow.afterUpdate', [newWorkflowData]);
 
 			// We sadly get nothing back from "update". Neither if it updated a record
 			// nor the new value. So query now the hopefully updated entry.
@@ -580,6 +629,7 @@ class App {
 			}
 
 			await Db.collections.Workflow!.delete(id);
+			await this.externalHooks.run('workflow.afterDelete', [id]);
 
 			return true;
 		}));
@@ -665,13 +715,36 @@ class App {
 			const allNodes = nodeTypes.getAll();
 
 			allNodes.forEach((nodeData) => {
-				returnData.push(nodeData.description);
+				// Make a copy of the object. If we don't do this, then when
+				// The method below is called the properties are removed for good
+				// This happens because nodes are returned as reference.
+				const nodeInfo: INodeTypeDescription = {...nodeData.description};
+				if (req.query.includeProperties !== 'true') {
+					// @ts-ignore
+					delete nodeInfo.properties;
+				}
+				returnData.push(nodeInfo);
 			});
 
 			return returnData;
 		}));
 
 
+		// Returns node information baesd on namese
+		this.app.post(`/${this.restEndpoint}/node-types`, ResponseHelper.send(async (req: express.Request, res: express.Response): Promise<INodeTypeDescription[]> => {
+			const nodeNames = _.get(req, 'body.nodeNames', []) as string[];
+			const nodeTypes = NodeTypes();
+
+			return nodeNames.map(name => {
+				try {
+					return nodeTypes.getByName(name);
+				} catch (e) {
+					return undefined;
+				}
+			}).filter(nodeData => !!nodeData).map(nodeData => nodeData!.description);
+		}));
+
+
 
 		// ----------------------------------------
 		// Node-Types
@@ -1009,7 +1082,7 @@ class App {
 
 			const signatureMethod = _.get(oauthCredentials, 'signatureMethod') as string;
 
-			const oauth = new clientOAuth1({
+			const oAuthOptions: clientOAuth1.Options = {
 				consumer: {
 					key: _.get(oauthCredentials, 'consumerKey') as string,
 					secret: _.get(oauthCredentials, 'consumerSecret') as string,
@@ -1021,16 +1094,20 @@ class App {
 						.update(base)
 						.digest('base64');
 				},
-			});
+			};
 
-			const callback = `${WebhookHelpers.getWebhookBaseUrl()}${this.restEndpoint}/oauth1-credential/callback?cid=${req.query.id}`;
+			const oauthRequestData = {
+				oauth_callback: `${WebhookHelpers.getWebhookBaseUrl()}${this.restEndpoint}/oauth1-credential/callback?cid=${req.query.id}`,
+			};
+
+			await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
+
+			const oauth = new clientOAuth1(oAuthOptions);
 
 			const options: RequestOptions = {
 				method: 'POST',
 				url: (_.get(oauthCredentials, 'requestTokenUrl') as string),
-				data: {
-					oauth_callback: callback,
-				},
+				data: oauthRequestData,
 			};
 
 			const data = oauth.toHeader(oauth.authorize(options as RequestOptions));
@@ -1099,7 +1176,7 @@ class App {
 				qs: {
 					oauth_token,
 					oauth_verifier,
-				}
+				},
 			};
 
 			let oauthToken;
@@ -1169,11 +1246,11 @@ class App {
 			const csrfSecret = token.secretSync();
 			const state = {
 				token: token.create(csrfSecret),
-				cid: req.query.id
+				cid: req.query.id,
 			};
 			const stateEncodedStr = Buffer.from(JSON.stringify(state)).toString('base64') as string;
 
-			const oAuthObj = new clientOAuth2({
+			const oAuthOptions: clientOAuth2.Options = {
 				clientId: _.get(oauthCredentials, 'clientId') as string,
 				clientSecret: _.get(oauthCredentials, 'clientSecret', '') as string,
 				accessTokenUri: _.get(oauthCredentials, 'accessTokenUrl', '') as string,
@@ -1181,7 +1258,11 @@ class App {
 				redirectUri: `${WebhookHelpers.getWebhookBaseUrl()}${this.restEndpoint}/oauth2-credential/callback`,
 				scopes: _.split(_.get(oauthCredentials, 'scope', 'openid,') as string, ','),
 				state: stateEncodedStr,
-			});
+			};
+
+			await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
+
+			const oAuthObj = new clientOAuth2(oAuthOptions);
 
 			// Encrypt the data
 			const credentials = new Credentials(result.name, result.type, result.nodesAccess);
@@ -1267,11 +1348,11 @@ class App {
 
 			const oAuth2Parameters = {
 				clientId: _.get(oauthCredentials, 'clientId') as string,
-				clientSecret: _.get(oauthCredentials, 'clientSecret', '') as string,
+				clientSecret: _.get(oauthCredentials, 'clientSecret', '') as string | undefined,
 				accessTokenUri: _.get(oauthCredentials, 'accessTokenUrl', '') as string,
 				authorizationUri: _.get(oauthCredentials, 'authUrl', '') as string,
 				redirectUri: `${WebhookHelpers.getWebhookBaseUrl()}${this.restEndpoint}/oauth2-credential/callback`,
-				scopes: _.split(_.get(oauthCredentials, 'scope', 'openid,') as string, ',')
+				scopes: _.split(_.get(oauthCredentials, 'scope', 'openid,') as string, ','),
 			};
 
 			if (_.get(oauthCredentials, 'authentication', 'header') as string === 'body') {
@@ -1283,13 +1364,14 @@ class App {
 				};
 				delete oAuth2Parameters.clientSecret;
 			}
-			const redirectUri = `${WebhookHelpers.getWebhookBaseUrl()}${this.restEndpoint}/oauth2-credential/callback`;
+
+			await this.externalHooks.run('oauth2.callback', [oAuth2Parameters]);
 
 			const oAuthObj = new clientOAuth2(oAuth2Parameters);
 
 			const queryParameters = req.originalUrl.split('?').splice(1, 1).join('');
 
-			const oauthToken = await oAuthObj.code.getToken(`${redirectUri}?${queryParameters}`, options);
+			const oauthToken = await oAuthObj.code.getToken(`${oAuth2Parameters.redirectUri}?${queryParameters}`, options);
 
 			if (oauthToken === undefined) {
 				const errorResponse = new ResponseHelper.ResponseError('Unable to get access tokens!', undefined, 404);
@@ -1582,18 +1664,7 @@ class App {
 
 		// Returns the settings which are needed in the UI
 		this.app.get(`/${this.restEndpoint}/settings`, ResponseHelper.send(async (req: express.Request, res: express.Response): Promise<IN8nUISettings> => {
-			return {
-				endpointWebhook: this.endpointWebhook,
-				endpointWebhookTest: this.endpointWebhookTest,
-				saveDataErrorExecution: this.saveDataErrorExecution,
-				saveDataSuccessExecution: this.saveDataSuccessExecution,
-				saveManualExecutions: this.saveManualExecutions,
-				executionTimeout: this.executionTimeout,
-				maxExecutionTimeout: this.maxExecutionTimeout,
-				timezone: this.timezone,
-				urlBaseWebhook: WebhookHelpers.getWebhookBaseUrl(),
-				versionCli: this.versions!.cli,
-			};
+			return this.frontendSettings;
 		}));
 
 
@@ -1829,7 +1900,7 @@ class App {
 					// got used
 					res.setHeader('Last-Modified', startTime);
 				}
-			}
+			},
 		}));
 	}
 
@@ -1860,5 +1931,7 @@ export async function start(): Promise<void> {
 		const versions = await GenericHelpers.getVersions();
 		console.log(`n8n ready on ${ADDRESS}, port ${PORT}`);
 		console.log(`Version: ${versions.cli}`);
+
+		await app.externalHooks.run('n8n.ready', [app]);
 	});
 }
diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/TestWebhooks.ts
index 129425854..5d81b8dd1 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/TestWebhooks.ts
@@ -3,11 +3,9 @@ import * as express from 'express';
 import {
 	IResponseCallbackData,
 	IWorkflowDb,
-	NodeTypes,
 	Push,
 	ResponseHelper,
 	WebhookHelpers,
-	WorkflowHelpers,
 } from './';
 
 import {
@@ -31,6 +29,7 @@ export class TestWebhooks {
 			sessionId?: string;
 			timeout: NodeJS.Timeout,
 			workflowData: IWorkflowDb;
+			workflow: Workflow;
 		};
 	} = {};
 	private activeWebhooks: ActiveWebhooks | null = null;
@@ -64,10 +63,13 @@ export class TestWebhooks {
 
 		const webhookKey = this.activeWebhooks!.getWebhookKey(webhookData.httpMethod, webhookData.path);
 
-		const workflowData = this.testWebhookData[webhookKey].workflowData;
+		// TODO: Clean that duplication up one day and improve code generally
+		if (this.testWebhookData[webhookKey] === undefined) {
+			// The requested webhook is not registered
+			throw new ResponseHelper.ResponseError(`The requested webhook "${httpMethod} ${path}" is not registered.`, 404, 404);
+		}
 
-		const nodeTypes = NodeTypes();
-		const workflow = new Workflow({ id: webhookData.workflowId, name: workflowData.name, nodes: workflowData.nodes, connections: workflowData.connections, active: workflowData.active, nodeTypes, staticData: workflowData.staticData, settings: workflowData.settings});
+		const workflow = this.testWebhookData[webhookKey].workflow;
 
 		// Get the node which has the webhook defined to know where to start from and to
 		// get additional data
@@ -154,19 +156,26 @@ export class TestWebhooks {
 		}, 120000);
 
 		let key: string;
+		const activatedKey: string[] = [];
 		for (const webhookData of webhooks) {
 			key = this.activeWebhooks!.getWebhookKey(webhookData.httpMethod, webhookData.path);
 
-			await this.activeWebhooks!.add(workflow, webhookData, mode);
+			activatedKey.push(key);
 
 			this.testWebhookData[key] = {
 				sessionId,
 				timeout,
+				workflow,
 				workflowData,
 			};
 
-			// Save static data!
-			this.testWebhookData[key].workflowData.staticData = workflow.staticData;
+			try {
+				await this.activeWebhooks!.add(workflow, webhookData, mode);
+			} catch (error) {
+				activatedKey.forEach(deleteKey => delete this.testWebhookData[deleteKey] );
+				await this.activeWebhooks!.removeWorkflow(workflow);
+				throw error;
+			}
 		}
 
 		return true;
@@ -181,8 +190,6 @@ export class TestWebhooks {
 	 * @memberof TestWebhooks
 	 */
 	cancelTestWebhook(workflowId: string): boolean {
-		const nodeTypes = NodeTypes();
-
 		let foundWebhook = false;
 		for (const webhookKey of Object.keys(this.testWebhookData)) {
 			const webhookData = this.testWebhookData[webhookKey];
@@ -191,8 +198,6 @@ export class TestWebhooks {
 				continue;
 			}
 
-			foundWebhook = true;
-
 			clearTimeout(this.testWebhookData[webhookKey].timeout);
 
 			// Inform editor-ui that webhook got received
@@ -205,12 +210,17 @@ export class TestWebhooks {
 				}
 			}
 
-			const workflowData = webhookData.workflowData;
-			const workflow = new Workflow({ id: workflowData.id.toString(), name: workflowData.name, nodes: workflowData.nodes, connections: workflowData.connections, active: workflowData.active, nodeTypes, staticData: workflowData.staticData, settings: workflowData.settings });
+			const workflow = this.testWebhookData[webhookKey].workflow;
 
 			// Remove the webhook
 			delete this.testWebhookData[webhookKey];
-			this.activeWebhooks!.removeWorkflow(workflow);
+
+			if (foundWebhook === false) {
+				// As it removes all webhooks of the workflow execute only once
+				this.activeWebhooks!.removeWorkflow(workflow);
+			}
+
+			foundWebhook = true;
 		}
 
 		return foundWebhook;
@@ -225,14 +235,10 @@ export class TestWebhooks {
 			return;
 		}
 
-		const nodeTypes = NodeTypes();
-
-		let workflowData: IWorkflowDb;
 		let workflow: Workflow;
 		const workflows: Workflow[] = [];
 		for (const webhookKey of Object.keys(this.testWebhookData)) {
-			workflowData = this.testWebhookData[webhookKey].workflowData;
-			workflow = new Workflow({ id: workflowData.id.toString(), name: workflowData.name, nodes: workflowData.nodes, connections: workflowData.connections, active: workflowData.active, nodeTypes, staticData: workflowData.staticData, settings: workflowData.settings });
+			workflow = this.testWebhookData[webhookKey].workflow;
 			workflows.push(workflow);
 		}
 
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index ffb544989..114111a82 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -3,16 +3,17 @@ import { get } from 'lodash';
 
 import {
 	ActiveExecutions,
+	ExternalHooks,
 	GenericHelpers,
 	IExecutionDb,
 	IResponseCallbackData,
 	IWorkflowDb,
 	IWorkflowExecutionDataProcess,
 	ResponseHelper,
-	WorkflowHelpers,
-	WorkflowRunner,
 	WorkflowCredentials,
 	WorkflowExecuteAdditionalData,
+	WorkflowHelpers,
+	WorkflowRunner,
 } from './';
 
 import {
@@ -114,8 +115,8 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 	}
 
 	// Get the responseMode
-	const responseMode = workflow.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseMode'], 'onReceived');
-	const responseCode = workflow.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseCode'], 200) as number;
+	const responseMode = workflow.expression.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseMode'], 'onReceived');
+	 const responseCode = workflow.expression.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseCode'], 200) as number;
 
 	if (!['onReceived', 'lastNode'].includes(responseMode as string)) {
 		// If the mode is not known we error. Is probably best like that instead of using
@@ -173,7 +174,7 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 		await WorkflowHelpers.saveStaticData(workflow);
 
 		if (webhookData.webhookDescription['responseHeaders'] !== undefined) {
-			const responseHeaders = workflow.getComplexParameterValue(workflowStartNode, webhookData.webhookDescription['responseHeaders'], undefined) as {
+			const responseHeaders = workflow.expression.getComplexParameterValue(workflowStartNode, webhookData.webhookDescription['responseHeaders'], undefined) as {
 				entries?: Array<{
 					name: string;
 					value: string;
@@ -251,7 +252,7 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 				data: {
 					main: webhookResultData.workflowData,
 				},
-			},
+			}
 		);
 
 		const runExecutionData: IRunExecutionData = {
@@ -325,7 +326,7 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 				return data;
 			}
 
-			const responseData = workflow.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseData'], 'firstEntryJson');
+			const responseData = workflow.expression.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseData'], 'firstEntryJson');
 
 			if (didSendResponse === false) {
 				let data: IDataObject | IDataObject[];
@@ -340,13 +341,13 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 
 					data = returnData.data!.main[0]![0].json;
 
-					const responsePropertyName = workflow.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responsePropertyName'], undefined);
+					const responsePropertyName = workflow.expression.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responsePropertyName'], undefined);
 
 					if (responsePropertyName !== undefined) {
 						data = get(data, responsePropertyName as string) as IDataObject;
 					}
 
-					const responseContentType = workflow.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseContentType'], undefined);
+					const responseContentType = workflow.expression.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseContentType'], undefined);
 
 					if (responseContentType !== undefined) {
 						// Send the webhook response manually to be able to set the content-type
@@ -379,7 +380,7 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 						didSendResponse = true;
 					}
 
-					const responseBinaryPropertyName = workflow.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseBinaryPropertyName'], 'data');
+					const responseBinaryPropertyName = workflow.expression.getSimpleParameterValue(workflowStartNode, webhookData.webhookDescription['responseBinaryPropertyName'], 'data');
 
 					if (responseBinaryPropertyName === undefined && didSendResponse === false) {
 						responseCallback(new Error('No "responseBinaryPropertyName" is set.'), {});
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 4230e79f5..11c15aee8 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -25,8 +25,8 @@ import {
 	IExecuteData,
 	IExecuteWorkflowInfo,
 	INode,
-	INodeParameters,
 	INodeExecutionData,
+	INodeParameters,
 	IRun,
 	IRunExecutionData,
 	ITaskData,
@@ -74,7 +74,7 @@ function executeErrorWorkflow(workflowData: IWorkflowBase, fullRunData: IRun, mo
 			workflow: {
 				id: workflowData.id !== undefined ? workflowData.id.toString() as string : undefined,
 				name: workflowData.name,
-			}
+			},
 		};
 		// Run the error workflow
 		WorkflowHelpers.executeErrorWorkflow(workflowData.settings.errorWorkflow as string, workflowErrorData);
@@ -191,13 +191,13 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id as string,
 					workflowName: this.workflowData.name,
 				});
-			}
+			},
 		],
 		workflowExecuteAfter: [
 			async function (this: WorkflowHooks, fullRunData: IRun, newStaticData: IDataObject): Promise<void> {
 				pushExecutionFinished(this.mode, fullRunData, this.executionId, undefined, this.retryOf);
 			},
-		]
+		],
 	};
 }
 
@@ -298,7 +298,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 					}
 				}
 			},
-		]
+		],
 	};
 }
 
@@ -374,8 +374,8 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 	// Always start with empty data if no inputData got supplied
 	inputData = inputData || [
 		{
-			json: {}
-		}
+			json: {},
+		},
 	];
 
 	// Initialize the incoming data
@@ -386,7 +386,7 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 			data: {
 				main: [inputData],
 			},
-		},
+		}
 	);
 
 	const runExecutionData: IRunExecutionData = {
@@ -406,6 +406,8 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 	const workflowExecute = new WorkflowExecute(additionalDataIntegrated, mode, runExecutionData);
 	const data = await workflowExecute.processRunExecutionData(workflow);
 
+	await externalHooks.run('workflow.postExecute', [data, workflowData]);
+
 	if (data.finished === true) {
 		// Workflow did finish successfully
 		const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
diff --git a/packages/cli/src/WorkflowHelpers.ts b/packages/cli/src/WorkflowHelpers.ts
index 0f824398f..7071c1b71 100644
--- a/packages/cli/src/WorkflowHelpers.ts
+++ b/packages/cli/src/WorkflowHelpers.ts
@@ -3,8 +3,8 @@ import {
 	Db,
 	ICredentialsTypeData,
 	ITransferNodeTypes,
-	IWorkflowExecutionDataProcess,
 	IWorkflowErrorData,
+	IWorkflowExecutionDataProcess,
 	NodeTypes,
 	WorkflowCredentials,
 	WorkflowRunner,
@@ -120,12 +120,12 @@ export async function executeErrorWorkflow(workflowId: string, workflowErrorData
 					main: [
 						[
 							{
-								json: workflowErrorData
-							}
-						]
+								json: workflowErrorData,
+							},
+						],
 					],
 				},
-			},
+			}
 		);
 
 		const runExecutionData: IRunExecutionData = {
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 0eb4f7a01..3a5e197f1 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -24,8 +24,8 @@ import {
 	IExecutionError,
 	IRun,
 	Workflow,
-	WorkflowHooks,
 	WorkflowExecuteMode,
+	WorkflowHooks,
 } from 'n8n-workflow';
 
 import * as config from '../config';
@@ -104,11 +104,25 @@ export class WorkflowRunner {
 		await externalHooks.run('workflow.execute', [data.workflowData, data.executionMode]);
 
 		const executionsProcess = config.get('executions.process') as string;
+
+		let executionId: string;
 		if (executionsProcess === 'main') {
-			return this.runMainProcess(data, loadStaticData);
+			executionId = await this.runMainProcess(data, loadStaticData);
+		} else {
+			executionId = await this.runSubprocess(data, loadStaticData);
 		}
 
-		return this.runSubprocess(data, loadStaticData);
+		if (externalHooks.exists('workflow.postExecute')) {
+			this.activeExecutions.getPostExecutePromise(executionId)
+				.then(async (executionData) => {
+					await externalHooks.run('workflow.postExecute', [executionData, data.workflowData]);
+				})
+				.catch(error => {
+					console.error('There was a problem running hook "workflow.postExecute"', error);
+				});
+		}
+
+		return executionId;
 	}
 
 
@@ -212,6 +226,7 @@ export class WorkflowRunner {
 
 		let nodeTypeData: ITransferNodeTypes;
 		let credentialTypeData: ICredentialsTypeData;
+		let credentialsOverwrites = this.credentialsOverwrites;
 
 		if (loadAllNodeTypes === true) {
 			// Supply all nodeTypes and credentialTypes
@@ -219,15 +234,22 @@ export class WorkflowRunner {
 			const credentialTypes = CredentialTypes();
 			credentialTypeData = credentialTypes.credentialTypes;
 		} else {
-			// Supply only nodeTypes and credentialTypes which the workflow needs
+			// Supply only nodeTypes, credentialTypes and overwrites that the workflow needs
 			nodeTypeData = WorkflowHelpers.getNodeTypeData(data.workflowData.nodes);
 			credentialTypeData = WorkflowHelpers.getCredentialsData(data.credentials);
+
+			credentialsOverwrites = {};
+			for (const credentialName of Object.keys(credentialTypeData)) {
+				if (this.credentialsOverwrites[credentialName] !== undefined) {
+					credentialsOverwrites[credentialName] = this.credentialsOverwrites[credentialName];
+				}
+			}
 		}
 
 
 		(data as unknown as IWorkflowExecutionDataProcessWithExecution).executionId = executionId;
 		(data as unknown as IWorkflowExecutionDataProcessWithExecution).nodeTypeData = nodeTypeData;
-		(data as unknown as IWorkflowExecutionDataProcessWithExecution).credentialsOverwrite = this.credentialsOverwrites;
+		(data as unknown as IWorkflowExecutionDataProcessWithExecution).credentialsOverwrite = credentialsOverwrites;
 		(data as unknown as IWorkflowExecutionDataProcessWithExecution).credentialsTypeData = credentialTypeData; // TODO: Still needs correct value
 
 		const workflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 41f467a8f..894e11029 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -66,7 +66,7 @@ export class WorkflowRunnerProcess {
 
 		// Load the credentials overwrites if any exist
 		const credentialsOverwrites = CredentialsOverwrites();
-		await credentialsOverwrites.init();
+		await credentialsOverwrites.init(inputData.credentialsOverwrite);
 
 		this.workflow = new Workflow({ id: this.data.workflowData.id as string | undefined, name: this.data.workflowData.name, nodes: this.data.workflowData!.nodes, connections: this.data.workflowData!.connections, active: this.data.workflowData!.active, nodeTypes, staticData: this.data.workflowData!.staticData, settings: this.data.workflowData!.settings});
 		const additionalData = await WorkflowExecuteAdditionalData.getBase(this.data.credentials);
@@ -135,13 +135,13 @@ export class WorkflowRunnerProcess {
 			workflowExecuteBefore: [
 				async (): Promise<void> => {
 					this.sendHookToParentProcess('workflowExecuteBefore', []);
-				}
+				},
 			],
 			workflowExecuteAfter: [
 				async (fullRunData: IRun, newStaticData?: IDataObject): Promise<void> => {
 					this.sendHookToParentProcess('workflowExecuteAfter', [fullRunData, newStaticData]);
 				},
-			]
+			],
 		};
 
 		return new WorkflowHooks(hookFunctions, this.data!.executionMode, this.data!.executionId, this.data!.workflowData, { sessionId: this.data!.sessionId, retryOf: this.data!.retryOf as string });
diff --git a/packages/cli/src/databases/mysqldb/CredentialsEntity.ts b/packages/cli/src/databases/mysqldb/CredentialsEntity.ts
index 5654581ff..037835fcf 100644
--- a/packages/cli/src/databases/mysqldb/CredentialsEntity.ts
+++ b/packages/cli/src/databases/mysqldb/CredentialsEntity.ts
@@ -20,7 +20,7 @@ export class CredentialsEntity implements ICredentialsDb {
 	id: number;
 
 	@Column({
-		length: 128
+		length: 128,
 	})
 	name: string;
 
@@ -29,7 +29,7 @@ export class CredentialsEntity implements ICredentialsDb {
 
 	@Index()
 	@Column({
-		length: 32
+		length: 32,
 	})
 	type: string;
 
diff --git a/packages/cli/src/databases/mysqldb/WorkflowEntity.ts b/packages/cli/src/databases/mysqldb/WorkflowEntity.ts
index 4cca4e62a..ea96195ca 100644
--- a/packages/cli/src/databases/mysqldb/WorkflowEntity.ts
+++ b/packages/cli/src/databases/mysqldb/WorkflowEntity.ts
@@ -22,7 +22,7 @@ export class WorkflowEntity implements IWorkflowDb {
 	id: number;
 
 	@Column({
-		length: 128
+		length: 128,
 	})
 	name: string;
 
diff --git a/packages/cli/src/databases/postgresdb/CredentialsEntity.ts b/packages/cli/src/databases/postgresdb/CredentialsEntity.ts
index cddaf7559..d2a3f7871 100644
--- a/packages/cli/src/databases/postgresdb/CredentialsEntity.ts
+++ b/packages/cli/src/databases/postgresdb/CredentialsEntity.ts
@@ -20,7 +20,7 @@ export class CredentialsEntity implements ICredentialsDb {
 	id: number;
 
 	@Column({
-		length: 128
+		length: 128,
 	})
 	name: string;
 
@@ -29,7 +29,7 @@ export class CredentialsEntity implements ICredentialsDb {
 
 	@Index()
 	@Column({
-		length: 32
+		length: 32,
 	})
 	type: string;
 
diff --git a/packages/cli/src/databases/postgresdb/WorkflowEntity.ts b/packages/cli/src/databases/postgresdb/WorkflowEntity.ts
index 3f870b929..d6d097ef8 100644
--- a/packages/cli/src/databases/postgresdb/WorkflowEntity.ts
+++ b/packages/cli/src/databases/postgresdb/WorkflowEntity.ts
@@ -22,7 +22,7 @@ export class WorkflowEntity implements IWorkflowDb {
 	id: number;
 
 	@Column({
-		length: 128
+		length: 128,
 	})
 	name: string;
 
diff --git a/packages/cli/src/databases/sqlite/CredentialsEntity.ts b/packages/cli/src/databases/sqlite/CredentialsEntity.ts
index 6974b6b05..8b49d779d 100644
--- a/packages/cli/src/databases/sqlite/CredentialsEntity.ts
+++ b/packages/cli/src/databases/sqlite/CredentialsEntity.ts
@@ -20,7 +20,7 @@ export class CredentialsEntity implements ICredentialsDb {
 	id: number;
 
 	@Column({
-		length: 128
+		length: 128,
 	})
 	name: string;
 
@@ -29,7 +29,7 @@ export class CredentialsEntity implements ICredentialsDb {
 
 	@Index()
 	@Column({
-		length: 32
+		length: 32,
 	})
 	type: string;
 
diff --git a/packages/cli/src/databases/sqlite/WorkflowEntity.ts b/packages/cli/src/databases/sqlite/WorkflowEntity.ts
index 486dcbbb5..933a146ca 100644
--- a/packages/cli/src/databases/sqlite/WorkflowEntity.ts
+++ b/packages/cli/src/databases/sqlite/WorkflowEntity.ts
@@ -22,7 +22,7 @@ export class WorkflowEntity implements IWorkflowDb {
 	id: number;
 
 	@Column({
-		length: 128
+		length: 128,
 	})
 	name: string;
 
diff --git a/packages/cli/templates/oauth-callback.html b/packages/cli/templates/oauth-callback.html
index e479c5ea9..5f7b736d9 100644
--- a/packages/cli/templates/oauth-callback.html
+++ b/packages/cli/templates/oauth-callback.html
@@ -1,9 +1,9 @@
 <html>
-<script>
-	(function messageParent() {
-		window.opener.postMessage('success', '*');
-	}());
-</script>
+	<script>
+		(function messageParent() {
+			window.opener.postMessage('success', '*');
+		}());
+	</script>
 
-Got connected. The window can be closed now.
+	Got connected. The window can be closed now.
 </html>
diff --git a/packages/cli/tslint.json b/packages/cli/tslint.json
index 7eb9d0110..9b5a55973 100644
--- a/packages/cli/tslint.json
+++ b/packages/cli/tslint.json
@@ -46,6 +46,11 @@
 		"forin": true,
 		"jsdoc-format": true,
 		"label-position": true,
+		"indent": [
+			true,
+			"tabs",
+			2
+		],
 		"member-access": [
 			true,
 			"no-public"
@@ -60,6 +65,13 @@
 		"no-default-export": true,
 		"no-duplicate-variable": true,
 		"no-inferrable-types": true,
+		"ordered-imports": [
+			true,
+			{
+				"import-sources-order": "any",
+				"named-imports-order": "case-insensitive"
+			}
+		],
 		"no-namespace": [
 			true,
 			"allow-declarations"
@@ -82,6 +94,18 @@
 			"ignore-bound-class-methods"
 		],
 		"switch-default": true,
+		"trailing-comma": [
+			true,
+			{
+				"multiline": {
+					"objects": "always",
+					"arrays": "always",
+					"functions": "never",
+					"typeLiterals": "ignore"
+				},
+				"esSpecCompliant": true
+			}
+		],
 		"triple-equals": [
 			true,
 			"allow-null-check"
diff --git a/packages/core/LICENSE.md b/packages/core/LICENSE.md
index 24a7d38fc..3dd835dee 100644
--- a/packages/core/LICENSE.md
+++ b/packages/core/LICENSE.md
@@ -19,7 +19,7 @@ Condition notice.
 
 Software: n8n
 
-License: Apache 2.0
+License: Apache 2.0 with Commons Clause
 
 Licensor: n8n GmbH
 
diff --git a/packages/core/package.json b/packages/core/package.json
index 1c8a6b67d..4138b503a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "n8n-core",
-    "version": "0.44.0",
+    "version": "0.48.1",
     "description": "Core functionality of n8n",
     "license": "SEE LICENSE IN LICENSE.md",
     "homepage": "https://n8n.io",
@@ -18,6 +18,7 @@
         "build": "tsc",
         "dev": "npm run watch",
         "tslint": "tslint -p tsconfig.json -c tslint.json",
+        "tslintfix": "tslint --fix -p tsconfig.json -c tslint.json",
         "watch": "tsc --watch",
         "test": "jest"
     },
@@ -26,27 +27,28 @@
     ],
     "devDependencies": {
         "@types/cron": "^1.7.1",
-        "@types/crypto-js": "^3.1.43",
+        "@types/crypto-js": "^4.0.1",
         "@types/express": "^4.17.6",
-        "@types/jest": "^25.2.1",
+        "@types/jest": "^26.0.13",
         "@types/lodash.get": "^4.4.6",
         "@types/mime-types": "^2.1.0",
-        "@types/node": "^14.0.27",
+        "@types/node": "14.0.27",
         "@types/request-promise-native": "~1.0.15",
-        "jest": "^24.9.0",
+        "jest": "^26.4.2",
         "source-map-support": "^0.5.9",
-        "ts-jest": "^25.4.0",
+        "ts-jest": "^26.3.0",
         "tslint": "^6.1.2",
-        "typescript": "~3.7.4"
+        "typescript": "~3.9.7"
     },
     "dependencies": {
         "client-oauth2": "^4.2.5",
         "cron": "^1.7.2",
-        "crypto-js": "3.1.9-1",
+        "crypto-js": "4.0.0",
         "file-type": "^14.6.2",
         "lodash.get": "^4.4.2",
         "mime-types": "^2.1.27",
-        "n8n-workflow": "~0.39.0",
+        "n8n-workflow": "~0.42.0",
+        "oauth-1.0a": "^2.2.6",
         "p-cancelable": "^2.0.0",
         "request": "^2.88.2",
         "request-promise-native": "^1.0.7"
diff --git a/packages/core/src/ActiveWebhooks.ts b/packages/core/src/ActiveWebhooks.ts
index 5b69fab24..f4b1f1f86 100644
--- a/packages/core/src/ActiveWebhooks.ts
+++ b/packages/core/src/ActiveWebhooks.ts
@@ -52,7 +52,7 @@ export class ActiveWebhooks {
 
 		try {
 			const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, this.testWebhooks);
-			if (webhookExists === false) {
+			if (webhookExists !== true) {
 				// If webhook does not exist yet create it
 				await workflow.runWebhookMethod('create', webhookData, NodeExecuteFunctions, mode, this.testWebhooks);
 
@@ -60,7 +60,6 @@ export class ActiveWebhooks {
 		} catch (error) {
 			// If there was a problem unregister the webhook again
 			delete this.webhookUrls[webhookKey];
-			delete this.workflowWebhooks[webhookData.workflowId];
 
 			throw error;
 		}
@@ -159,7 +158,7 @@ export class ActiveWebhooks {
 
 
 	/**
-	 * Removes all the webhooks of the given workflow
+	 * Removes all the webhooks of the given workflows
 	 */
 	async removeAll(workflows: Workflow[]): Promise<void> {
 		const removePromises = [];
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
index 5576aeed3..2e3b6d7c1 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/ActiveWorkflows.ts
@@ -67,8 +67,6 @@ export class ActiveWorkflows {
 	 * @memberof ActiveWorkflows
 	 */
 	async add(id: string, workflow: Workflow, additionalData: IWorkflowExecuteAdditionalData, getTriggerFunctions: IGetExecuteTriggerFunctions, getPollFunctions: IGetExecutePollFunctions): Promise<void> {
-		console.log('ADD ID (active): ' + id);
-
 		this.workflowData[id] = {};
 		const triggerNodes = workflow.getTriggerNodes();
 
@@ -204,8 +202,6 @@ export class ActiveWorkflows {
 	 * @memberof ActiveWorkflows
 	 */
 	async remove(id: string): Promise<void> {
-		console.log('REMOVE ID (active): ' + id);
-
 		if (!this.isActive(id)) {
 			// Workflow is currently not registered
 			throw new Error(`The workflow with the id "${id}" is currently not active and can so not be removed`);
diff --git a/packages/core/src/Credentials.ts b/packages/core/src/Credentials.ts
index e692f597c..b8c4d337f 100644
--- a/packages/core/src/Credentials.ts
+++ b/packages/core/src/Credentials.ts
@@ -5,7 +5,7 @@ import {
 	ICredentialsEncrypted,
 } from 'n8n-workflow';
 
-import { enc, AES } from 'crypto-js';
+import { AES, enc } from 'crypto-js';
 
 
 export class Credentials extends ICredentials {
diff --git a/packages/core/src/Interfaces.ts b/packages/core/src/Interfaces.ts
index 483cc1c0c..b67d1ccfc 100644
--- a/packages/core/src/Interfaces.ts
+++ b/packages/core/src/Interfaces.ts
@@ -9,13 +9,13 @@ import {
 	ILoadOptionsFunctions as ILoadOptionsFunctionsBase,
 	INodeExecutionData,
 	INodeType,
+	IOAuth2Options,
 	IPollFunctions as IPollFunctionsBase,
 	IPollResponse,
 	ITriggerFunctions as ITriggerFunctionsBase,
 	ITriggerResponse,
 	IWebhookFunctions as IWebhookFunctionsBase,
 	IWorkflowSettings as IWorkflowSettingsWorkflow,
-	IOAuth2Options,
  } from 'n8n-workflow';
 
 
diff --git a/packages/core/src/LoadNodeParameterOptions.ts b/packages/core/src/LoadNodeParameterOptions.ts
index e56121606..6a9b45750 100644
--- a/packages/core/src/LoadNodeParameterOptions.ts
+++ b/packages/core/src/LoadNodeParameterOptions.ts
@@ -36,7 +36,7 @@ export class LoadNodeParameterOptions {
 			position: [
 				0,
 				0,
-			]
+			],
 		};
 
 		if (credentials) {
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index be0cf6497..bf7a6cd7c 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -1,9 +1,9 @@
 import {
+	BINARY_ENCODING,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IResponseError,
 	IWorkflowSettings,
-	BINARY_ENCODING,
 } from './';
 
 import {
@@ -19,6 +19,7 @@ import {
 	INodeExecutionData,
 	INodeParameters,
 	INodeType,
+	IOAuth2Options,
 	IPollFunctions,
 	IRunExecutionData,
 	ITaskDataConnections,
@@ -34,7 +35,6 @@ import {
 	Workflow,
 	WorkflowDataProxy,
 	WorkflowExecuteMode,
-	IOAuth2Options,
 } from 'n8n-workflow';
 
 import * as clientOAuth1 from 'oauth-1.0a';
@@ -43,7 +43,7 @@ import * as clientOAuth2 from 'client-oauth2';
 import { get } from 'lodash';
 import * as express from 'express';
 import * as path from 'path';
-import { OptionsWithUrl, OptionsWithUri } from 'request';
+import { OptionsWithUri, OptionsWithUrl } from 'request';
 import * as requestPromise from 'request-promise-native';
 import { createHmac } from 'crypto';
 import { fromBuffer } from 'file-type';
@@ -91,7 +91,7 @@ export async function prepareBinaryData(binaryData: Buffer, filePath?: string, m
 		// TODO: Should program it in a way that it does not have to converted to base64
 		//       It should only convert to and from base64 when saved in database because
 		//       of for example an error or when there is a wait node.
-		data: binaryData.toString(BINARY_ENCODING)
+		data: binaryData.toString(BINARY_ENCODING),
 	};
 
 	if (filePath) {
@@ -152,11 +152,16 @@ export function requestOAuth2(this: IAllExecuteFunctions, credentialsType: strin
 	// on the token-type used.
 	const newRequestOptions = token.sign(requestOptions as clientOAuth2.RequestObject);
 
+	// If keep bearer is false remove the it from the authorization header
+	if (oAuth2Options?.keepBearer === false) {
+		//@ts-ignore
+		newRequestOptions?.headers?.Authorization = newRequestOptions?.headers?.Authorization.split(' ')[1];
+	}
+
 	return this.helpers.request!(newRequestOptions)
 		.catch(async (error: IResponseError) => {
 			// TODO: Check if also other codes are possible
 			if (error.statusCode === 401) {
-				// TODO: Whole refresh process is not tested yet
 				// Token is probably not valid anymore. So try refresh it.
 
 				const tokenRefreshOptions: IDataObject = {};
@@ -388,7 +393,7 @@ export function getNodeParameter(workflow: Workflow, runExecutionData: IRunExecu
 
 	let returnData;
 	try {
-		returnData = workflow.getParameterValue(value, runExecutionData, runIndex, itemIndex, node.name, connectionInputData);
+		returnData = workflow.expression.getParameterValue(value, runExecutionData, runIndex, itemIndex, node.name, connectionInputData);
 	} catch (e) {
 		e.message += ` [Error in parameter: "${parameterName}"]`;
 		throw e;
@@ -434,12 +439,12 @@ export function getNodeWebhookUrl(name: string, workflow: Workflow, node: INode,
 		return undefined;
 	}
 
-	const path = workflow.getSimpleParameterValue(node, webhookDescription['path']);
+	const path = workflow.expression.getSimpleParameterValue(node, webhookDescription['path']);
 	if (path === undefined) {
 		return undefined;
 	}
 
-	const isFullPath: boolean = workflow.getSimpleParameterValue(node, webhookDescription['isFullPath'], false) as boolean;
+	const isFullPath: boolean = workflow.expression.getSimpleParameterValue(node, webhookDescription['isFullPath'], false) as boolean;
 	return NodeHelpers.getNodeWebhookUrl(baseUrl, workflow.id!, node, path.toString(), isFullPath);
 }
 
@@ -654,7 +659,7 @@ export function getExecuteFunctions(workflow: Workflow, runExecutionData: IRunEx
 				return continueOnFail(node);
 			},
 			evaluateExpression: (expression: string, itemIndex: number) => {
-				return workflow.resolveSimpleParameterValue('=' + expression, runExecutionData, runIndex, itemIndex, node.name, connectionInputData);
+				return workflow.expression.resolveSimpleParameterValue('=' + expression, runExecutionData, runIndex, itemIndex, node.name, connectionInputData);
 			},
 			async executeWorkflow(workflowInfo: IExecuteWorkflowInfo, inputData?: INodeExecutionData[]): Promise<any> { // tslint:disable-line:no-any
 				return additionalData.executeWorkflow(workflowInfo, additionalData, inputData);
@@ -752,7 +757,7 @@ export function getExecuteSingleFunctions(workflow: Workflow, runExecutionData:
 			},
 			evaluateExpression: (expression: string, evaluateItemIndex: number | undefined) => {
 				evaluateItemIndex = evaluateItemIndex === undefined ? itemIndex : evaluateItemIndex;
-				return workflow.resolveSimpleParameterValue('=' + expression, runExecutionData, runIndex, evaluateItemIndex, node.name, connectionInputData);
+				return workflow.expression.resolveSimpleParameterValue('=' + expression, runExecutionData, runIndex, evaluateItemIndex, node.name, connectionInputData);
 			},
 			getContext(type: string): IContextObject {
 				return NodeHelpers.getContext(runExecutionData, type, node);
diff --git a/packages/core/src/UserSettings.ts b/packages/core/src/UserSettings.ts
index fb38fc779..83fba72d6 100644
--- a/packages/core/src/UserSettings.ts
+++ b/packages/core/src/UserSettings.ts
@@ -1,10 +1,10 @@
 import {
 	ENCRYPTION_KEY_ENV_OVERWRITE,
 	EXTENSIONS_SUBDIRECTORY,
+	IUserSettings,
 	USER_FOLDER_ENV_OVERWRITE,
 	USER_SETTINGS_FILE_NAME,
 	USER_SETTINGS_SUBFOLDER,
-	IUserSettings,
 } from '.';
 
 
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 072689acf..4133db0d9 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -15,8 +15,8 @@ import {
 	ITaskDataConnections,
 	IWaitingForExecution,
 	IWorkflowExecuteAdditionalData,
-	WorkflowExecuteMode,
 	Workflow,
+	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import {
 	NodeExecuteFunctions,
@@ -84,7 +84,7 @@ export class WorkflowExecute {
 						],
 					],
 				},
-			}
+			},
 		];
 
 		this.runExecutionData = {
@@ -137,8 +137,8 @@ export class WorkflowExecute {
 				// If it has no incoming data add the default empty data
 				incomingData.push([
 					{
-						json: {}
-					}
+						json: {},
+					},
 				]);
 			} else {
 				// Get the data of the incoming connections
@@ -156,7 +156,7 @@ export class WorkflowExecute {
 				node: workflow.getNode(startNode) as INode,
 				data: {
 					main: incomingData,
-				}
+				},
 			};
 
 			nodeExecutionStack.push(executeData);
@@ -252,7 +252,7 @@ export class WorkflowExecute {
 			if (this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex] === undefined) {
 				// Node does not have data for runIndex yet so create also empty one and init it
 				this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex] = {
-					main: []
+					main: [],
 				};
 				for (let i = 0; i < workflow.connectionsByDestinationNode[connectionData.node]['main'].length; i++) {
 					this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex].main.push(null);
@@ -282,7 +282,7 @@ export class WorkflowExecute {
 				// So add it to the execution stack
 				this.runExecutionData.executionData!.nodeExecutionStack.push({
 					node: workflow.nodes[connectionData.node],
-					data: this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex]
+					data: this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex],
 				});
 
 				// Remove the data from waiting
@@ -426,15 +426,15 @@ export class WorkflowExecute {
 				this.runExecutionData.executionData!.waitingExecution[connectionData.node] = {};
 			}
 			this.runExecutionData.executionData!.waitingExecution[connectionData.node][runIndex] = {
-				main: connectionDataArray
+				main: connectionDataArray,
 			};
 		} else {
 			// All data is there so add it directly to stack
 			this.runExecutionData.executionData!.nodeExecutionStack.push({
 				node: workflow.nodes[connectionData.node],
 				data: {
-					main: connectionDataArray
-				}
+					main: connectionDataArray,
+				},
 			});
 		}
 	}
@@ -608,7 +608,7 @@ export class WorkflowExecute {
 									nodeSuccessData[0] = [
 										{
 											json: {},
-										}
+										},
 									];
 								}
 							}
@@ -622,6 +622,8 @@ export class WorkflowExecute {
 
 							break;
 						} catch (error) {
+							this.runExecutionData.resultData.lastNodeExecuted = executionData.node.name;
+
 							executionError = {
 								message: error.message,
 								stack: error.stack,
@@ -637,7 +639,7 @@ export class WorkflowExecute {
 					}
 					taskData = {
 						startTime,
-						executionTime: (new Date().getTime()) - startTime
+						executionTime: (new Date().getTime()) - startTime,
 					};
 
 					if (executionError !== undefined) {
@@ -667,7 +669,7 @@ export class WorkflowExecute {
 
 					// Node executed successfully. So add data and go on.
 					taskData.data = ({
-						'main': nodeSuccessData
+						'main': nodeSuccessData,
 					} as ITaskDataConnections);
 
 					this.executeHook('nodeExecuteAfter', [executionNode.name, taskData]);
@@ -698,7 +700,10 @@ export class WorkflowExecute {
 										return Promise.reject(new Error(`The node "${executionNode.name}" connects to not found node "${connectionData.node}"`));
 									}
 
-									this.addNodeToBeExecuted(workflow, connectionData, parseInt(outputIndex, 10), executionNode.name, nodeSuccessData!, runIndex);
+									if (nodeSuccessData![outputIndex] && nodeSuccessData![outputIndex].length !== 0) {
+										// Add the node only if there is data for it to process
+										this.addNodeToBeExecuted(workflow, connectionData, parseInt(outputIndex, 10), executionNode.name, nodeSuccessData!, runIndex);
+									}
 								}
 							}
 						}
diff --git a/packages/core/test/Credentials.test.ts b/packages/core/test/Credentials.test.ts
index dc8e151b8..5fbcfc7be 100644
--- a/packages/core/test/Credentials.test.ts
+++ b/packages/core/test/Credentials.test.ts
@@ -3,86 +3,86 @@ import { Credentials } from '../src';
 
 describe('Credentials', () => {
 
-    describe('without nodeType set', () => {
+		describe('without nodeType set', () => {
 
-        test('should be able to set and read key data without initial data set', () => {
+				test('should be able to set and read key data without initial data set', () => {
 
-            const credentials = new Credentials('testName', 'testType', []);
+						const credentials = new Credentials('testName', 'testType', []);
 
-            const key = 'key1';
-            const password = 'password';
-            // const nodeType = 'base.noOp';
-            const newData = 1234;
+						const key = 'key1';
+						const password = 'password';
+						// const nodeType = 'base.noOp';
+						const newData = 1234;
 
-            credentials.setDataKey(key, newData, password);
+						credentials.setDataKey(key, newData, password);
 
-            expect(credentials.getDataKey(key, password)).toEqual(newData);
-        });
+						expect(credentials.getDataKey(key, password)).toEqual(newData);
+				});
 
-        test('should be able to set and read key data with initial data set', () => {
+				test('should be able to set and read key data with initial data set', () => {
 
-            const key = 'key2';
-            const password = 'password';
+						const key = 'key2';
+						const password = 'password';
 
-            // Saved under "key1"
-            const initialData = 4321;
-            const initialDataEncoded = 'U2FsdGVkX1+0baznXt+Ag/ub8A2kHLyoLxn/rR9h4XQ=';
+						// Saved under "key1"
+						const initialData = 4321;
+						const initialDataEncoded = 'U2FsdGVkX1+0baznXt+Ag/ub8A2kHLyoLxn/rR9h4XQ=';
 
-            const credentials = new Credentials('testName', 'testType', [], initialDataEncoded);
+						const credentials = new Credentials('testName', 'testType', [], initialDataEncoded);
 
-            const newData = 1234;
+						const newData = 1234;
 
-            // Set and read new data
-            credentials.setDataKey(key, newData, password);
-            expect(credentials.getDataKey(key, password)).toEqual(newData);
+						// Set and read new data
+						credentials.setDataKey(key, newData, password);
+						expect(credentials.getDataKey(key, password)).toEqual(newData);
 
-            // Read the data which got provided encrypted on init
-            expect(credentials.getDataKey('key1', password)).toEqual(initialData);
-        });
+						// Read the data which got provided encrypted on init
+						expect(credentials.getDataKey('key1', password)).toEqual(initialData);
+				});
 
-    });
+		});
 
-    describe('with nodeType set', () => {
+		describe('with nodeType set', () => {
 
-        test('should be able to set and read key data without initial data set', () => {
+				test('should be able to set and read key data without initial data set', () => {
 
-            const nodeAccess = [
-                {
-                    nodeType: 'base.noOp',
-                    user: 'userName',
-                    date: new Date(),
-                }
-            ];
+						const nodeAccess = [
+								{
+										nodeType: 'base.noOp',
+										user: 'userName',
+										date: new Date(),
+								},
+						];
 
-            const credentials = new Credentials('testName', 'testType', nodeAccess);
+						const credentials = new Credentials('testName', 'testType', nodeAccess);
 
-            const key = 'key1';
-            const password = 'password';
-            const nodeType = 'base.noOp';
-            const newData = 1234;
+						const key = 'key1';
+						const password = 'password';
+						const nodeType = 'base.noOp';
+						const newData = 1234;
 
-            credentials.setDataKey(key, newData, password);
+						credentials.setDataKey(key, newData, password);
 
-            // Should be able to read with nodeType which has access
-            expect(credentials.getDataKey(key, password, nodeType)).toEqual(newData);
+						// Should be able to read with nodeType which has access
+						expect(credentials.getDataKey(key, password, nodeType)).toEqual(newData);
 
-            // Should not be able to read with nodeType which does NOT have access
-            // expect(credentials.getDataKey(key, password, 'base.otherNode')).toThrowError(Error);
-            try {
-                credentials.getDataKey(key, password, 'base.otherNode');
-                expect(true).toBe(false);
-            } catch (e) {
-                expect(e.message).toBe('The node of type "base.otherNode" does not have access to credentials "testName" of type "testType".');
-            }
+						// Should not be able to read with nodeType which does NOT have access
+						// expect(credentials.getDataKey(key, password, 'base.otherNode')).toThrowError(Error);
+						try {
+								credentials.getDataKey(key, password, 'base.otherNode');
+								expect(true).toBe(false);
+						} catch (e) {
+								expect(e.message).toBe('The node of type "base.otherNode" does not have access to credentials "testName" of type "testType".');
+						}
 
-            // Get the data which will be saved in database
-            const dbData = credentials.getDataToSave();
-            expect(dbData.name).toEqual('testName');
-            expect(dbData.type).toEqual('testType');
-            expect(dbData.nodesAccess).toEqual(nodeAccess);
-            // Compare only the first 6 characters as the rest seems to change with each execution
-            expect(dbData.data!.slice(0, 6)).toEqual('U2FsdGVkX1+wpQWkj+YTzaPSNTFATjnlmFKIsUTZdhk='.slice(0, 6));
-        });
-    });
+						// Get the data which will be saved in database
+						const dbData = credentials.getDataToSave();
+						expect(dbData.name).toEqual('testName');
+						expect(dbData.type).toEqual('testType');
+						expect(dbData.nodesAccess).toEqual(nodeAccess);
+						// Compare only the first 6 characters as the rest seems to change with each execution
+						expect(dbData.data!.slice(0, 6)).toEqual('U2FsdGVkX1+wpQWkj+YTzaPSNTFATjnlmFKIsUTZdhk='.slice(0, 6));
+				});
+		});
 
 });
diff --git a/packages/core/test/Helpers.ts b/packages/core/test/Helpers.ts
index 790025dcd..b79270833 100644
--- a/packages/core/test/Helpers.ts
+++ b/packages/core/test/Helpers.ts
@@ -7,8 +7,8 @@ import {
 	INodeExecutionData,
 	INodeParameters,
 	INodeType,
-	INodeTypes,
 	INodeTypeData,
+	INodeTypes,
 	IRun,
 	ITaskData,
 	IWorkflowBase,
@@ -87,7 +87,7 @@ class NodeTypesClass implements INodeTypes {
 							displayOptions: {
 								show: {
 									mode: [
-										'passThrough'
+										'passThrough',
 									],
 								},
 							},
@@ -104,7 +104,7 @@ class NodeTypesClass implements INodeTypes {
 							default: 'input1',
 							description: 'Defines of which input the data should be used as output of node.',
 						},
-					]
+					],
 				},
 				async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 					// const itemsInput2 = this.getInputData(1);
@@ -131,7 +131,7 @@ class NodeTypesClass implements INodeTypes {
 					}
 
 					return [returnData];
-				}
+				},
 			},
 		},
 		'n8n-nodes-base.set': {
@@ -186,11 +186,11 @@ class NodeTypesClass implements INodeTypes {
 											default: 0,
 											description: 'The number value to write in the property.',
 										},
-									]
+									],
 								},
 							],
 						},
-					]
+					],
 				},
 				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 					const items = this.getInputData();
@@ -213,7 +213,7 @@ class NodeTypesClass implements INodeTypes {
 					}
 
 					return this.prepareOutputData(returnData);
-				}
+				},
 			},
 		},
 		'n8n-nodes-base.start': {
@@ -231,7 +231,7 @@ class NodeTypesClass implements INodeTypes {
 					},
 					inputs: [],
 					outputs: ['main'],
-					properties: []
+					properties: [],
 				},
 				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 					const items = this.getInputData();
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index 811b90cef..4213cba39 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -47,8 +47,8 @@ describe('WorkflowExecute', () => {
 								"typeVersion": 1,
 								"position": [
 									100,
-									300
-								]
+									300,
+								],
 							},
 							{
 								"parameters": {
@@ -56,19 +56,19 @@ describe('WorkflowExecute', () => {
 										"number": [
 											{
 												"name": "value1",
-												"value": 1
-											}
-										]
-									}
+												"value": 1,
+											},
+										],
+									},
 								},
 								"name": "Set",
 								"type": "n8n-nodes-base.set",
 								"typeVersion": 1,
 								"position": [
 									280,
-									300
-								]
-							}
+									300,
+								],
+							},
 						],
 						"connections": {
 							"Start": {
@@ -77,12 +77,12 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Set",
 											"type": "main",
-											"index": 0
-										}
-									]
-								]
-							}
-						}
+											"index": 0,
+										},
+									],
+								],
+							},
+						},
 					},
 				},
 				output: {
@@ -115,8 +115,8 @@ describe('WorkflowExecute', () => {
 								"typeVersion": 1,
 								"position": [
 									100,
-									300
-								]
+									300,
+								],
 							},
 							{
 								"parameters": {
@@ -124,18 +124,18 @@ describe('WorkflowExecute', () => {
 										"number": [
 											{
 												"name": "value1",
-												"value": 1
-											}
-										]
-									}
+												"value": 1,
+											},
+										],
+									},
 								},
 								"name": "Set1",
 								"type": "n8n-nodes-base.set",
 								"typeVersion": 1,
 								"position": [
 									300,
-									250
-								]
+									250,
+								],
 							},
 							{
 								"parameters": {
@@ -143,19 +143,19 @@ describe('WorkflowExecute', () => {
 										"number": [
 											{
 												"name": "value2",
-												"value": 2
-											}
-										]
-									}
+												"value": 2,
+											},
+										],
+									},
 								},
 								"name": "Set2",
 								"type": "n8n-nodes-base.set",
 								"typeVersion": 1,
 								"position": [
 									500,
-									400
-								]
-							}
+									400,
+								],
+							},
 						],
 						"connections": {
 							"Start": {
@@ -164,15 +164,15 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Set1",
 											"type": "main",
-											"index": 0
+											"index": 0,
 										},
 										{
 											"node": "Set2",
 											"type": "main",
-											"index": 0
-										}
-									]
-								]
+											"index": 0,
+										},
+									],
+								],
 							},
 							"Set1": {
 								"main": [
@@ -180,12 +180,12 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Set2",
 											"type": "main",
-											"index": 0
-										}
-									]
-								]
-							}
-						}
+											"index": 0,
+										},
+									],
+								],
+							},
+						},
 					},
 				},
 				output: {
@@ -201,7 +201,7 @@ describe('WorkflowExecute', () => {
 								{
 									value1: 1,
 								},
-							]
+							],
 						],
 						Set2: [
 							[
@@ -228,15 +228,15 @@ describe('WorkflowExecute', () => {
 						"nodes": [
 							{
 								"parameters": {
-									"mode": "passThrough"
+									"mode": "passThrough",
 								},
 								"name": "Merge4",
 								"type": "n8n-nodes-base.merge",
 								"typeVersion": 1,
 								"position": [
 									1150,
-									500
-								]
+									500,
+								],
 							},
 							{
 								"parameters": {
@@ -244,18 +244,18 @@ describe('WorkflowExecute', () => {
 										"number": [
 											{
 												"name": "value2",
-												"value": 2
-											}
-										]
-									}
+												"value": 2,
+											},
+										],
+									},
 								},
 								"name": "Set2",
 								"type": "n8n-nodes-base.set",
 								"typeVersion": 1,
 								"position": [
 									290,
-									400
-								]
+									400,
+								],
 							},
 							{
 								"parameters": {
@@ -263,18 +263,18 @@ describe('WorkflowExecute', () => {
 										"number": [
 											{
 												"name": "value4",
-												"value": 4
-											}
-										]
-									}
+												"value": 4,
+											},
+										],
+									},
 								},
 								"name": "Set4",
 								"type": "n8n-nodes-base.set",
 								"typeVersion": 1,
 								"position": [
 									850,
-									200
-								]
+									200,
+								],
 							},
 							{
 								"parameters": {
@@ -282,30 +282,30 @@ describe('WorkflowExecute', () => {
 										"number": [
 											{
 												"name": "value3",
-												"value": 3
-											}
-										]
-									}
+												"value": 3,
+											},
+										],
+									},
 								},
 								"name": "Set3",
 								"type": "n8n-nodes-base.set",
 								"typeVersion": 1,
 								"position": [
 									650,
-									200
-								]
+									200,
+								],
 							},
 							{
 								"parameters": {
-									"mode": "passThrough"
+									"mode": "passThrough",
 								},
 								"name": "Merge4",
 								"type": "n8n-nodes-base.merge",
 								"typeVersion": 1,
 								"position": [
 									1150,
-									500
-								]
+									500,
+								],
 							},
 							{
 								"parameters": {},
@@ -314,21 +314,21 @@ describe('WorkflowExecute', () => {
 								"typeVersion": 1,
 								"position": [
 									1000,
-									400
-								]
+									400,
+								],
 							},
 							{
 								"parameters": {
 									"mode": "passThrough",
-									"output": "input2"
+									"output": "input2",
 								},
 								"name": "Merge2",
 								"type": "n8n-nodes-base.merge",
 								"typeVersion": 1,
 								"position": [
 									700,
-									400
-								]
+									400,
+								],
 							},
 							{
 								"parameters": {},
@@ -337,8 +337,8 @@ describe('WorkflowExecute', () => {
 								"typeVersion": 1,
 								"position": [
 									500,
-									300
-								]
+									300,
+								],
 							},
 							{
 								"parameters": {
@@ -346,18 +346,18 @@ describe('WorkflowExecute', () => {
 										"number": [
 											{
 												"name": "value1",
-												"value": 1
-											}
-										]
-									}
+												"value": 1,
+											},
+										],
+									},
 								},
 								"name": "Set1",
 								"type": "n8n-nodes-base.set",
 								"typeVersion": 1,
 								"position": [
 									300,
-									200
-								]
+									200,
+								],
 							},
 							{
 								"parameters": {},
@@ -366,9 +366,9 @@ describe('WorkflowExecute', () => {
 								"typeVersion": 1,
 								"position": [
 									100,
-									300
-								]
-							}
+									300,
+								],
+							},
 						],
 						"connections": {
 							"Set2": {
@@ -377,15 +377,15 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Merge1",
 											"type": "main",
-											"index": 1
+											"index": 1,
 										},
 										{
 											"node": "Merge2",
 											"type": "main",
-											"index": 1
-										}
-									]
-								]
+											"index": 1,
+										},
+									],
+								],
 							},
 							"Set4": {
 								"main": [
@@ -393,10 +393,10 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Merge3",
 											"type": "main",
-											"index": 0
-										}
-									]
-								]
+											"index": 0,
+										},
+									],
+								],
 							},
 							"Set3": {
 								"main": [
@@ -404,10 +404,10 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Set4",
 											"type": "main",
-											"index": 0
-										}
-									]
-								]
+											"index": 0,
+										},
+									],
+								],
 							},
 							"Merge3": {
 								"main": [
@@ -415,10 +415,10 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Merge4",
 											"type": "main",
-											"index": 0
-										}
-									]
-								]
+											"index": 0,
+										},
+									],
+								],
 							},
 							"Merge2": {
 								"main": [
@@ -426,10 +426,10 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Merge3",
 											"type": "main",
-											"index": 1
-										}
-									]
-								]
+											"index": 1,
+										},
+									],
+								],
 							},
 							"Merge1": {
 								"main": [
@@ -437,10 +437,10 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Merge2",
 											"type": "main",
-											"index": 0
-										}
-									]
-								]
+											"index": 0,
+										},
+									],
+								],
 							},
 							"Set1": {
 								"main": [
@@ -448,15 +448,15 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Merge1",
 											"type": "main",
-											"index": 0
+											"index": 0,
 										},
 										{
 											"node": "Set3",
 											"type": "main",
-											"index": 0
-										}
-									]
-								]
+											"index": 0,
+										},
+									],
+								],
 							},
 							"Start": {
 								"main": [
@@ -464,22 +464,22 @@ describe('WorkflowExecute', () => {
 										{
 											"node": "Set1",
 											"type": "main",
-											"index": 0
+											"index": 0,
 										},
 										{
 											"node": "Set2",
 											"type": "main",
-											"index": 0
+											"index": 0,
 										},
 										{
 											"node": "Merge4",
 											"type": "main",
-											"index": 1
-										}
-									]
-								]
-							}
-						}
+											"index": 1,
+										},
+									],
+								],
+							},
+						},
 					},
 				},
 				output: {
@@ -534,14 +534,14 @@ describe('WorkflowExecute', () => {
 								{
 									value2: 2,
 								},
-							]
+							],
 						],
 						Merge2: [
 							[
 								{
 									value2: 2,
 								},
-							]
+							],
 						],
 						Merge3: [
 							[
@@ -553,7 +553,7 @@ describe('WorkflowExecute', () => {
 								{
 									value2: 2,
 								},
-							]
+							],
 						],
 						Merge4: [
 							[
@@ -565,7 +565,7 @@ describe('WorkflowExecute', () => {
 								{
 									value2: 2,
 								},
-							]
+							],
 						],
 					},
 				},
diff --git a/packages/core/tslint.json b/packages/core/tslint.json
index 7eb9d0110..f03bbfee3 100644
--- a/packages/core/tslint.json
+++ b/packages/core/tslint.json
@@ -46,6 +46,11 @@
 		"forin": true,
 		"jsdoc-format": true,
 		"label-position": true,
+		"indent": [
+			true,
+			"tabs",
+			2
+		],
 		"member-access": [
 			true,
 			"no-public"
@@ -60,6 +65,13 @@
 		"no-default-export": true,
 		"no-duplicate-variable": true,
 		"no-inferrable-types": true,
+		"ordered-imports": [
+			true,
+			{
+				"import-sources-order": "any",
+				"named-imports-order": "case-insensitive"
+			}
+		],
 		"no-namespace": [
 			true,
 			"allow-declarations"
@@ -82,6 +94,18 @@
 			"ignore-bound-class-methods"
 		],
 		"switch-default": true,
+		"trailing-comma": [
+			true,
+			{
+				"multiline": {
+					"objects": "always",
+					"arrays": "always",
+					"functions": "always",
+					"typeLiterals": "ignore"
+				},
+				"esSpecCompliant": true
+			}
+		],
 		"triple-equals": [
 			true,
 			"allow-null-check"
diff --git a/packages/editor-ui/LICENSE.md b/packages/editor-ui/LICENSE.md
index 24a7d38fc..3dd835dee 100644
--- a/packages/editor-ui/LICENSE.md
+++ b/packages/editor-ui/LICENSE.md
@@ -19,7 +19,7 @@ Condition notice.
 
 Software: n8n
 
-License: Apache 2.0
+License: Apache 2.0 with Commons Clause
 
 Licensor: n8n GmbH
 
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index a325c78ab..ae33f0e2e 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.55.0",
+  "version": "0.60.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -20,12 +20,11 @@
     "serve": "cross-env VUE_APP_URL_BASE_API=http://localhost:5678/ vue-cli-service serve",
     "test": "npm run test:unit",
     "tslint": "tslint -p tsconfig.json -c tslint.json",
+    "tslintfix": "tslint --fix -p tsconfig.json -c tslint.json",
     "test:e2e": "vue-cli-service test:e2e",
     "test:unit": "vue-cli-service test:unit"
   },
-  "dependencies": {
-    "uuid": "^8.1.0"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@beyonk/google-fonts-webpack-plugin": "^1.2.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.19",
@@ -34,16 +33,16 @@
     "@types/dateformat": "^3.0.0",
     "@types/express": "^4.17.6",
     "@types/file-saver": "^2.0.1",
-    "@types/jest": "^25.2.1",
+    "@types/jest": "^26.0.13",
     "@types/lodash.get": "^4.4.6",
     "@types/lodash.set": "^4.3.6",
-    "@types/node": "^14.0.27",
+    "@types/node": "14.0.27",
     "@types/quill": "^2.0.1",
     "@typescript-eslint/eslint-plugin": "^2.13.0",
     "@typescript-eslint/parser": "^2.13.0",
     "@vue/cli-plugin-babel": "^4.1.2",
     "@vue/cli-plugin-eslint": "^4.1.2",
-    "@vue/cli-plugin-typescript": "~4.1.2",
+    "@vue/cli-plugin-typescript": "~4.5.6",
     "@vue/cli-plugin-unit-jest": "^4.1.2",
     "@vue/cli-service": "^3.11.0",
     "@vue/eslint-config-standard": "^5.0.1",
@@ -66,16 +65,18 @@
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "n8n-workflow": "~0.39.0",
+    "n8n-workflow": "~0.42.0",
     "node-sass": "^4.12.0",
+    "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",
     "quill": "^2.0.0-dev.3",
     "quill-autoformat": "^0.1.1",
     "sass-loader": "^8.0.0",
     "string-template-parser": "^1.2.6",
-    "ts-jest": "^25.4.0",
+    "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
-    "typescript": "~3.7.4",
+    "typescript": "~3.9.7",
+    "uuid": "^8.1.0",
     "vue": "^2.6.9",
     "vue-cli-plugin-webpack-bundle-analyzer": "^2.0.0",
     "vue-json-tree": "^0.4.1",
@@ -83,6 +84,7 @@
     "vue-router": "^3.0.6",
     "vue-template-compiler": "^2.5.17",
     "vue-typed-mixins": "^0.2.0",
+    "vue2-touch-events": "^2.3.2",
     "vuex": "^3.1.1"
   }
 }
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 2f3973b84..5e2874577 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -126,6 +126,7 @@ export interface IRestApi {
 	makeRestApiRequest(method: string, endpoint: string, data?: any): Promise<any>; // tslint:disable-line:no-any
 	getSettings(): Promise<IN8nUISettings>;
 	getNodeTypes(): Promise<INodeTypeDescription[]>;
+	getNodesInformation(nodeList: string[]): Promise<INodeTypeDescription[]>;
 	getNodeParameterOptions(nodeType: string, methodName: string, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]>;
 	removeTestWebhook(workflowId: string): Promise<boolean>;
 	runWorkflow(runData: IStartRunData): Promise<IExecutionPushResponse>;
@@ -399,6 +400,10 @@ export interface IN8nUISettings {
 	timezone: string;
 	executionTimeout: number;
 	maxExecutionTimeout: number;
+	oauthCallbackUrls: {
+		oauth1: string;
+		oauth2: string;
+	};
 	urlBaseWebhook: string;
 	versionCli: string;
 }
diff --git a/packages/editor-ui/src/components/CredentialsEdit.vue b/packages/editor-ui/src/components/CredentialsEdit.vue
index 9ea199ef3..49e3a12ac 100644
--- a/packages/editor-ui/src/components/CredentialsEdit.vue
+++ b/packages/editor-ui/src/components/CredentialsEdit.vue
@@ -4,7 +4,7 @@
 			<div name="title" class="title-container" slot="title">
 				<div class="title-left">{{title}}</div>
 				<div class="title-right">
-					<div v-if="credentialType" class="docs-container">
+					<div v-if="credentialType && documentationUrl" class="docs-container">
 						<svg class="help-logo" target="_blank" width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 							<title>Node Documentation</title>
 							<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
@@ -20,7 +20,7 @@
 								</g>
 							</g>
 						</svg>
-						<span v-if="credentialType" class="doc-link-text">Need help? <a class="doc-hyperlink" :href="'https://docs.n8n.io/credentials/' + documentationUrl + '/?utm_source=n8n_app&utm_medium=left_nav_menu&utm_campaign=create_new_credentials_modal'" target="_blank">Open credential docs</a></span>
+						<span class="doc-link-text">Need help? <a class="doc-hyperlink" :href="'https://docs.n8n.io/credentials/' + documentationUrl + '/?utm_source=n8n_app&utm_medium=left_nav_menu&utm_campaign=create_new_credentials_modal'" target="_blank">Open credential docs</a></span>
 					</div>
 				</div>
 			</div>
@@ -109,27 +109,19 @@ export default mixins(
 				}
 			}
 		},
-		documentationUrl (): string {
+		documentationUrl (): string | undefined {
+			let credentialTypeName = '';
 			if (this.editCredentials) {
-				const credentialType = this.$store.getters.credentialType(this.editCredentials.type);
-				if (credentialType.documentationUrl === undefined) {
-					return credentialType.name;
-				} else {
-					return `${credentialType.documentationUrl}`;
-				}
+				credentialTypeName = this.editCredentials.type as string;
 			} else {
-				if (this.credentialType) {
-					const credentialType = this.$store.getters.credentialType(this.credentialType);
-
-					if (credentialType.documentationUrl === undefined) {
-						return credentialType.name;
-					} else {
-						return `${credentialType.documentationUrl}`;
-					}
-				} else {
-					return '';
-				}
+				credentialTypeName = this.credentialType as string;
 			}
+
+			const credentialType = this.$store.getters.credentialType(credentialTypeName);
+			if (credentialType.documentationUrl !== undefined) {
+				return `${credentialType.documentationUrl}`;
+			}
+			return undefined;
 		},
 		node (): INodeUi {
 			return this.$store.getters.activeNode;
diff --git a/packages/editor-ui/src/components/CredentialsInput.vue b/packages/editor-ui/src/components/CredentialsInput.vue
index 27a459733..ae678cb25 100644
--- a/packages/editor-ui/src/components/CredentialsInput.vue
+++ b/packages/editor-ui/src/components/CredentialsInput.vue
@@ -235,7 +235,7 @@ export default mixins(
 		oAuthCallbackUrl (): string {
 			const types = this.parentTypes(this.credentialTypeData.name);
 			const oauthType = (this.credentialTypeData.name === 'oAuth2Api' || types.includes('oAuth2Api')) ? 'oauth2' : 'oauth1';
-			return this.$store.getters.getWebhookBaseUrl + `rest/${oauthType}-credential/callback`;
+			return this.$store.getters.oauthCallbackUrls[oauthType];
 		},
 		requiredPropertiesFilled (): boolean {
 			for (const property of this.credentialProperties) {
@@ -404,10 +404,11 @@ export default mixins(
 						message: 'Connected successfully!',
 						type: 'success',
 					});
+
+					// Make sure that the event gets removed again
+					window.removeEventListener('message', receiveMessage, false);
 				}
 
-				// Make sure that the event gets removed again
-				window.removeEventListener('message', receiveMessage, false);
 			};
 
 			window.addEventListener('message', receiveMessage, false);
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 13c2fee62..d8af701f4 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="node-wrapper" :style="nodePosition">
-		<div class="node-default" :ref="data.name" :style="nodeStyle" :class="nodeClass" @dblclick="setNodeActive" @click.left="mouseLeftClick">
+		<div class="node-default" :ref="data.name" :style="nodeStyle" :class="nodeClass" @dblclick="setNodeActive" @click.left="mouseLeftClick" v-touch:start="touchStart" v-touch:end="touchEnd">
 			<div v-if="hasIssues" class="node-info-icon node-issues">
 				<el-tooltip placement="top" effect="light">
 					<div slot="content" v-html="nodeIssues"></div>
@@ -13,19 +13,19 @@
 				<font-awesome-icon icon="sync-alt" spin />
 			</div>
 			<div class="node-options" v-if="!isReadOnly">
-				<div @click.stop.left="deleteNode" class="option" title="Delete Node" >
+				<div v-touch:tap="deleteNode" class="option" title="Delete Node" >
 					<font-awesome-icon icon="trash" />
 				</div>
-				<div @click.stop.left="disableNode" class="option" title="Activate/Deactivate Node" >
+				<div v-touch:tap="disableNode" class="option" title="Activate/Deactivate Node" >
 					<font-awesome-icon :icon="nodeDisabledIcon" />
 				</div>
-				<div @click.stop.left="duplicateNode" class="option" title="Duplicate Node" >
+				<div v-touch:tap="duplicateNode" class="option" title="Duplicate Node" >
 					<font-awesome-icon icon="clone" />
 				</div>
-				<div @click.stop.left="setNodeActive" class="option touch" title="Edit Node" v-if="!isReadOnly">
+				<div v-touch:tap="setNodeActive" class="option touch" title="Edit Node" v-if="!isReadOnly">
 					<font-awesome-icon class="execute-icon" icon="cog" />
 				</div>
-				<div @click.stop.left="executeNode" class="option" title="Execute Node" v-if="!isReadOnly && !workflowRunning">
+				<div v-touch:tap="executeNode" class="option" title="Execute Node" v-if="!isReadOnly && !workflowRunning">
 					<font-awesome-icon class="execute-icon" icon="play-circle" />
 				</div>
 			</div>
@@ -110,6 +110,10 @@ export default mixins(nodeBase, workflowHelpers).extend({
 				classes.push('is-touch-device');
 			}
 
+			if (this.isTouchActive) {
+				classes.push('touch-active');
+			}
+
 			return classes;
 		},
 		nodeIssues (): string {
@@ -134,7 +138,7 @@ export default mixins(nodeBase, workflowHelpers).extend({
 			}
 
 			if (this.nodeType !== null && this.nodeType.subtitle !== undefined) {
-				return this.workflow.getSimpleParameterValue(this.data as INode, this.nodeType.subtitle) as string | undefined;
+				return this.workflow.expression.getSimpleParameterValue(this.data as INode, this.nodeType.subtitle) as string | undefined;
 			}
 
 			if (this.data.parameters.operation !== undefined) {
@@ -174,7 +178,7 @@ export default mixins(nodeBase, workflowHelpers).extend({
 	},
 	data () {
 		return {
-			isTouchDevice: 'ontouchstart' in window || navigator.msMaxTouchPoints,
+			isTouchActive: false,
 		};
 	},
 	methods: {
@@ -199,6 +203,14 @@ export default mixins(nodeBase, workflowHelpers).extend({
 		setNodeActive () {
 			this.$store.commit('setActiveNode', this.data.name);
 		},
+		touchStart () {
+			if (this.isTouchDevice === true && this.isMacOs === false && this.isTouchActive === false) {
+				this.isTouchActive = true;
+				setTimeout(() => {
+					this.isTouchActive = false;
+				}, 2000);
+			}
+		},
 	},
 });
 
@@ -268,6 +280,7 @@ export default mixins(nodeBase, workflowHelpers).extend({
 			}
 		}
 
+		&.touch-active,
 		&:hover {
 			.node-execute {
 				display: initial;
diff --git a/packages/editor-ui/src/components/NodeIcon.vue b/packages/editor-ui/src/components/NodeIcon.vue
index 4d7a95f47..d32a1a40e 100644
--- a/packages/editor-ui/src/components/NodeIcon.vue
+++ b/packages/editor-ui/src/components/NodeIcon.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="node-icon-wrapper" :style="iconStyleData">
+	<div class="node-icon-wrapper" :style="iconStyleData" :class="{full: isSvgIcon}">
 		<div v-if="nodeIconData !== null" class="icon">
 			<img :src="nodeIconData.path" style="width: 100%; height: 100%;" v-if="nodeIconData.type === 'file'"/>
 			<font-awesome-icon :icon="nodeIconData.path" v-else-if="nodeIconData.type === 'fa'" />
@@ -17,6 +17,7 @@ import Vue from 'vue';
 interface NodeIconData {
 	type: string;
 	path: string;
+	fileExtension?: string;
 }
 
 export default Vue.extend({
@@ -41,6 +42,12 @@ export default Vue.extend({
 				'border-radius': Math.ceil(size / 2) + 'px',
 			};
 		},
+		isSvgIcon (): boolean {
+			if (this.nodeIconData && this.nodeIconData.type === 'file' && this.nodeIconData.fileExtension === 'svg') {
+				return true;
+			}
+			return false;
+		},
 		nodeIconData (): null | NodeIconData {
 			if (this.nodeType === null) {
 				return null;
@@ -51,13 +58,14 @@ export default Vue.extend({
 			if (this.nodeType.icon) {
 				let type, path;
 				[type, path] = this.nodeType.icon.split(':');
-				const returnData = {
+				const returnData: NodeIconData = {
 					type,
 					path,
 				};
 
 				if (type === 'file') {
 					returnData.path = restUrl + '/node-icon/' + this.nodeType.name;
+					returnData.fileExtension = path.split('.').slice(-1).join();
 				}
 
 				return returnData;
@@ -83,6 +91,10 @@ export default Vue.extend({
 	font-weight: bold;
 	font-size: 20px;
 
+	&.full .icon {
+		margin: 0.24em;
+	}
+
 	.node-icon-placeholder {
 		text-align: center;
 	}
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 6808b8256..07f8ac7b2 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -248,7 +248,7 @@ export default mixins(
 						type: 'boolean',
 						default: false,
 						noDataExpression: true,
-						description: 'If active, the workflow continues even if this node\'s <br /execution fails. When this occurs, the node passes along input data from<br />previous nodes - so your workflow should account for unexpected output data.',
+						description: 'If active, the workflow continues even if this node\'s <br />execution fails. When this occurs, the node passes along input data from<br />previous nodes - so your workflow should account for unexpected output data.',
 					},
 				] as INodeProperties[],
 
diff --git a/packages/editor-ui/src/components/PageContentWrapper.vue b/packages/editor-ui/src/components/PageContentWrapper.vue
index 87fe95284..37731027a 100644
--- a/packages/editor-ui/src/components/PageContentWrapper.vue
+++ b/packages/editor-ui/src/components/PageContentWrapper.vue
@@ -15,7 +15,7 @@ import Vue from 'vue';
 export default Vue.extend(
 	{
 		name: 'PageContentWrapper',
-	}
+	},
 );
 
 </script>
diff --git a/packages/editor-ui/src/components/VariableSelector.vue b/packages/editor-ui/src/components/VariableSelector.vue
index 1975f332a..1bf23af23 100644
--- a/packages/editor-ui/src/components/VariableSelector.vue
+++ b/packages/editor-ui/src/components/VariableSelector.vue
@@ -250,7 +250,7 @@ export default mixins(
 			 * @returns
 			 * @memberof Workflow
 			 */
-			getNodeOutputData (runData: IRunData, nodeName: string, filterText: string, itemIndex = 0, runIndex = 0, inputName = 'main', outputIndex = 0): IVariableSelectorOption[] | null {
+			getNodeOutputData (runData: IRunData, nodeName: string, filterText: string, itemIndex = 0, runIndex = 0, inputName = 'main', outputIndex = 0, useShort = false): IVariableSelectorOption[] | null {
 				if (!runData.hasOwnProperty(nodeName)) {
 					// No data found for node
 					return null;
@@ -291,9 +291,12 @@ export default mixins(
 
 				// Get json data
 				if (outputData.hasOwnProperty('json')) {
+
+					const jsonPropertyPrefix = useShort === true ? '$json' : `$node["${nodeName}"].json`;
+
 					const jsonDataOptions: IVariableSelectorOption[] = [];
 					for (const propertyName of Object.keys(outputData.json)) {
-						jsonDataOptions.push.apply(jsonDataOptions, this.jsonDataToFilterOption(outputData.json[propertyName], `$node["${nodeName}"].json`, propertyName, filterText));
+						jsonDataOptions.push.apply(jsonDataOptions, this.jsonDataToFilterOption(outputData.json[propertyName], jsonPropertyPrefix, propertyName, filterText));
 					}
 
 					if (jsonDataOptions.length) {
@@ -308,6 +311,9 @@ export default mixins(
 
 				// Get binary data
 				if (outputData.hasOwnProperty('binary')) {
+
+					const binaryPropertyPrefix = useShort === true ? '$binary' : `$node["${nodeName}"].binary`;
+
 					const binaryData = [];
 					let binaryPropertyData = [];
 
@@ -326,7 +332,7 @@ export default mixins(
 							binaryPropertyData.push(
 								{
 									name: propertyName,
-									key: `$node["${nodeName}"].binary.${dataPropertyName}.${propertyName}`,
+									key: `${binaryPropertyPrefix}.${dataPropertyName}.${propertyName}`,
 									value: outputData.binary![dataPropertyName][propertyName],
 								},
 							);
@@ -336,7 +342,7 @@ export default mixins(
 							binaryData.push(
 								{
 									name: dataPropertyName,
-									key: `$node["${nodeName}"].binary.${dataPropertyName}`,
+									key: `${binaryPropertyPrefix}.${dataPropertyName}`,
 									options: this.sortOptions(binaryPropertyData),
 									allowParentSelect: true,
 								},
@@ -347,7 +353,7 @@ export default mixins(
 						returnData.push(
 							{
 								name: 'Binary',
-								key: `$node["${nodeName}"].binary`,
+								key: binaryPropertyPrefix,
 								options: this.sortOptions(binaryData),
 								allowParentSelect: true,
 							},
@@ -474,7 +480,7 @@ export default mixins(
 					// (example "IF" node. If node is connected to "true" or to "false" output)
 					const outputIndex = this.workflow.getNodeConnectionOutputIndex(activeNode.name, parentNode[0], 'main');
 
-					tempOutputData = this.getNodeOutputData(runData, parentNode[0], filterText, itemIndex, 0, 'main', outputIndex) as IVariableSelectorOption[];
+					tempOutputData = this.getNodeOutputData(runData, parentNode[0], filterText, itemIndex, 0, 'main', outputIndex, true) as IVariableSelectorOption[];
 
 					if (tempOutputData) {
 						if (JSON.stringify(tempOutputData).length < 102400) {
diff --git a/packages/editor-ui/src/components/mixins/deviceSupportHelpers.ts b/packages/editor-ui/src/components/mixins/deviceSupportHelpers.ts
new file mode 100644
index 000000000..85ccd9c6a
--- /dev/null
+++ b/packages/editor-ui/src/components/mixins/deviceSupportHelpers.ts
@@ -0,0 +1,30 @@
+import Vue from 'vue';
+
+export const deviceSupportHelpers = Vue.extend({
+	data() {
+		return {
+			isTouchDevice: 'ontouchstart' in window || navigator.msMaxTouchPoints,
+			isMacOs: /(ipad|iphone|ipod|mac)/i.test(navigator.platform),
+		};
+	},
+	computed: {
+		// TODO: Check if used anywhere
+		controlKeyCode(): string {
+			if (this.isMacOs) {
+				return 'Meta';
+			}
+			return 'Control';
+		},
+	},
+	methods: {
+		isCtrlKeyPressed(e: MouseEvent | KeyboardEvent): boolean {
+			if (this.isTouchDevice === true) {
+				return true;
+			}
+			if (this.isMacOs) {
+				return e.metaKey;
+			}
+			return e.ctrlKey;
+		},
+	},
+});
diff --git a/packages/editor-ui/src/components/mixins/mouseSelect.ts b/packages/editor-ui/src/components/mixins/mouseSelect.ts
index 7a86c1e4a..0b280297f 100644
--- a/packages/editor-ui/src/components/mixins/mouseSelect.ts
+++ b/packages/editor-ui/src/components/mixins/mouseSelect.ts
@@ -2,20 +2,19 @@ import { INodeUi } from '@/Interface';
 
 import mixins from 'vue-typed-mixins';
 
+import { deviceSupportHelpers } from '@/components/mixins/deviceSupportHelpers';
 import { nodeIndex } from '@/components/mixins/nodeIndex';
 
-export const mouseSelect = mixins(nodeIndex).extend({
+export const mouseSelect = mixins(
+	deviceSupportHelpers,
+	nodeIndex,
+).extend({
 	data () {
 		return {
 			selectActive: false,
 			selectBox: document.createElement('span'),
 		};
 	},
-	computed: {
-		isMacOs (): boolean {
-			return /(ipad|iphone|ipod|mac)/i.test(navigator.platform);
-		},
-	},
 	mounted () {
 		this.createSelectBox();
 	},
@@ -34,6 +33,9 @@ export const mouseSelect = mixins(nodeIndex).extend({
 			this.$el.appendChild(this.selectBox);
 		},
 		isCtrlKeyPressed (e: MouseEvent | KeyboardEvent): boolean {
+			if (this.isTouchDevice === true) {
+				return true;
+			}
 			if (this.isMacOs) {
 				return e.metaKey;
 			}
@@ -125,6 +127,13 @@ export const mouseSelect = mixins(nodeIndex).extend({
 		},
 		mouseUpMouseSelect (e: MouseEvent) {
 			if (this.selectActive === false) {
+				if (this.isTouchDevice === true) {
+					// @ts-ignore
+					if (e.target && e.target.id.includes('node-view')) {
+						// Deselect all nodes
+						this.deselectAllNodes();
+					}
+				}
 				// If it is not active return direcly.
 				// Else normal node dragging will not work.
 				return;
diff --git a/packages/editor-ui/src/components/mixins/moveNodeWorkflow.ts b/packages/editor-ui/src/components/mixins/moveNodeWorkflow.ts
index 9dcf86aea..b1250003f 100644
--- a/packages/editor-ui/src/components/mixins/moveNodeWorkflow.ts
+++ b/packages/editor-ui/src/components/mixins/moveNodeWorkflow.ts
@@ -1,41 +1,43 @@
 import mixins from 'vue-typed-mixins';
-
+// @ts-ignore
+import normalizeWheel from 'normalize-wheel';
+import { deviceSupportHelpers } from '@/components/mixins/deviceSupportHelpers';
 import { nodeIndex } from '@/components/mixins/nodeIndex';
 
-export const moveNodeWorkflow = mixins(nodeIndex).extend({
+export const moveNodeWorkflow = mixins(
+	deviceSupportHelpers,
+	nodeIndex,
+).extend({
 	data () {
 		return {
 			moveLastPosition: [0, 0],
 		};
 	},
-	computed: {
-		controlKeyCode (): string {
-			if (this.isMacOs) {
-				return 'Meta';
-			}
-			return 'Control';
-		},
-		isMacOs (): boolean {
-			return /(ipad|iphone|ipod|mac)/i.test(navigator.platform);
-		},
-	},
+
 	methods: {
-		isCtrlKeyPressed (e: MouseEvent | KeyboardEvent): boolean {
-			if (this.isMacOs) {
-				return e.metaKey;
-			}
-			return e.ctrlKey;
+		getMousePosition(e: MouseEvent | TouchEvent) {
+			// @ts-ignore
+			const x = e.pageX !== undefined ? e.pageX : (e.touches && e.touches[0] && e.touches[0].pageX ? e.touches[0].pageX : 0);
+			// @ts-ignore
+			const y = e.pageY !== undefined ? e.pageY : (e.touches && e.touches[0] && e.touches[0].pageY ? e.touches[0].pageY : 0);
+
+			return {
+				x,
+				y,
+			};
 		},
 		moveWorkflow (e: MouseEvent) {
 			const offsetPosition = this.$store.getters.getNodeViewOffsetPosition;
 
-			const nodeViewOffsetPositionX = offsetPosition[0] + (e.pageX - this.moveLastPosition[0]);
-			const nodeViewOffsetPositionY = offsetPosition[1] + (e.pageY - this.moveLastPosition[1]);
+			const position = this.getMousePosition(e);
+
+			const nodeViewOffsetPositionX = offsetPosition[0] + (position.x - this.moveLastPosition[0]);
+			const nodeViewOffsetPositionY = offsetPosition[1] + (position.y - this.moveLastPosition[1]);
 			this.$store.commit('setNodeViewOffsetPosition', {newOffset: [nodeViewOffsetPositionX, nodeViewOffsetPositionY], setStateDirty: true});
 
 			// Update the last position
-			this.moveLastPosition[0] = e.pageX;
-			this.moveLastPosition[1] = e.pageY;
+			this.moveLastPosition[0] = position.x;
+			this.moveLastPosition[1] = position.y;
 		},
 		mouseDownMoveWorkflow (e: MouseEvent) {
 			if (this.isCtrlKeyPressed(e) === false) {
@@ -51,8 +53,10 @@ export const moveNodeWorkflow = mixins(nodeIndex).extend({
 
 			this.$store.commit('setNodeViewMoveInProgress', true);
 
-			this.moveLastPosition[0] = e.pageX;
-			this.moveLastPosition[1] = e.pageY;
+			const position = this.getMousePosition(e);
+
+			this.moveLastPosition[0] = position.x;
+			this.moveLastPosition[1] = position.y;
 
 			// @ts-ignore
 			this.$el.addEventListener('mousemove', this.mouseMoveNodeWorkflow);
@@ -72,6 +76,15 @@ export const moveNodeWorkflow = mixins(nodeIndex).extend({
 			// Nothing else to do. Simply leave the node view at the current offset
 		},
 		mouseMoveNodeWorkflow (e: MouseEvent) {
+			// @ts-ignore
+			if (e.target && !e.target.id.includes('node-view')) {
+				return;
+			}
+
+			if (this.$store.getters.isActionActive('dragActive')) {
+				return;
+			}
+
 			if (e.buttons === 0) {
 				// Mouse button is not pressed anymore so stop selection mode
 				// Happens normally when mouse leave the view pressed and then
@@ -84,9 +97,10 @@ export const moveNodeWorkflow = mixins(nodeIndex).extend({
 			this.moveWorkflow(e);
 		},
 		wheelMoveWorkflow (e: WheelEvent) {
+			const normalized = normalizeWheel(e);
 			const offsetPosition = this.$store.getters.getNodeViewOffsetPosition;
-			const nodeViewOffsetPositionX = offsetPosition[0] - e.deltaX;
-			const nodeViewOffsetPositionY = offsetPosition[1] - e.deltaY;
+			const nodeViewOffsetPositionX = offsetPosition[0] - normalized.pixelX;
+			const nodeViewOffsetPositionY = offsetPosition[1] - normalized.pixelY;
 			this.$store.commit('setNodeViewOffsetPosition', {newOffset: [nodeViewOffsetPositionX, nodeViewOffsetPositionY], setStateDirty: true});
 		},
 	},
diff --git a/packages/editor-ui/src/components/mixins/nodeBase.ts b/packages/editor-ui/src/components/mixins/nodeBase.ts
index ba3661700..830d7ed2e 100644
--- a/packages/editor-ui/src/components/mixins/nodeBase.ts
+++ b/packages/editor-ui/src/components/mixins/nodeBase.ts
@@ -2,20 +2,20 @@ import { IConnectionsUi, IEndpointOptions, INodeUi, XYPositon } from '@/Interfac
 
 import mixins from 'vue-typed-mixins';
 
+import { deviceSupportHelpers } from '@/components/mixins/deviceSupportHelpers';
 import { nodeIndex } from '@/components/mixins/nodeIndex';
 import { NODE_NAME_PREFIX } from '@/constants';
 
-export const nodeBase = mixins(nodeIndex).extend({
+export const nodeBase = mixins(
+	deviceSupportHelpers,
+	nodeIndex,
+).extend({
 	mounted () {
 		// Initialize the node
 		if (this.data !== null) {
 			this.__addNode(this.data);
 		}
 	},
-	data () {
-		return {
-		};
-	},
 	computed: {
 		data (): INodeUi {
 			return this.$store.getters.nodeByName(this.name);
@@ -26,9 +26,6 @@ export const nodeBase = mixins(nodeIndex).extend({
 			}
 			return false;
 		},
-		isMacOs (): boolean {
-			return /(ipad|iphone|ipod|mac)/i.test(navigator.platform);
-		},
 		nodeName (): string {
 			return NODE_NAME_PREFIX + this.nodeIndex;
 		},
@@ -336,26 +333,27 @@ export const nodeBase = mixins(nodeIndex).extend({
 			});
 
 		},
-
-		isCtrlKeyPressed (e: MouseEvent | KeyboardEvent): boolean {
-			if (this.isMacOs) {
-				return e.metaKey;
-			}
-			return e.ctrlKey;
-		},
-
-		mouseLeftClick (e: MouseEvent) {
-			if (this.$store.getters.isActionActive('dragActive')) {
-				this.$store.commit('removeActiveAction', 'dragActive');
-			} else {
-				if (this.isCtrlKeyPressed(e) === false) {
-					this.$emit('deselectAllNodes');
+		touchEnd(e: MouseEvent) {
+			if (this.isTouchDevice) {
+				if (this.$store.getters.isActionActive('dragActive')) {
+					this.$store.commit('removeActiveAction', 'dragActive');
 				}
-
-				if (this.$store.getters.isNodeSelected(this.data.name)) {
-					this.$emit('deselectNode', this.name);
+			}
+		},
+		mouseLeftClick (e: MouseEvent) {
+			if (!this.isTouchDevice) {
+				if (this.$store.getters.isActionActive('dragActive')) {
+					this.$store.commit('removeActiveAction', 'dragActive');
 				} else {
-					this.$emit('nodeSelected', this.name);
+					if (this.isCtrlKeyPressed(e) === false) {
+						this.$emit('deselectAllNodes');
+					}
+
+					if (this.$store.getters.isNodeSelected(this.data.name)) {
+						this.$emit('deselectNode', this.name);
+					} else {
+						this.$emit('nodeSelected', this.name);
+					}
 				}
 			}
 		},
diff --git a/packages/editor-ui/src/components/mixins/restApi.ts b/packages/editor-ui/src/components/mixins/restApi.ts
index bca3fff33..8b1b6f256 100644
--- a/packages/editor-ui/src/components/mixins/restApi.ts
+++ b/packages/editor-ui/src/components/mixins/restApi.ts
@@ -152,6 +152,10 @@ export const restApi = Vue.extend({
 					return self.restApi().makeRestApiRequest('GET', `/node-types`);
 				},
 
+				getNodesInformation: (nodeList: string[]): Promise<INodeTypeDescription[]> => {
+					return self.restApi().makeRestApiRequest('POST', `/node-types`, {nodeNames: nodeList});
+				},
+
 				// Returns all the parameter options from the server
 				getNodeParameterOptions: (nodeType: string, methodName: string, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]> => {
 					const sendData = {
diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
index d5354bf2d..ba01dfb00 100644
--- a/packages/editor-ui/src/components/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
@@ -360,7 +360,7 @@ export const workflowHelpers = mixins(
 					connectionInputData = [];
 				}
 
-				return workflow.getParameterValue(expression, runExecutionData, runIndex, itemIndex, activeNode.name, connectionInputData, true);
+				return workflow.expression.getParameterValue(expression, runExecutionData, runIndex, itemIndex, activeNode.name, connectionInputData, true);
 			},
 
 			// Saves the currently loaded workflow to the database.
diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index 37784f7e8..847b3b3ed 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -5,6 +5,7 @@ import Vue from 'vue';
 import 'prismjs';
 import 'prismjs/themes/prism.css';
 import 'vue-prism-editor/dist/VuePrismEditor.css';
+import Vue2TouchEvents from 'vue2-touch-events';
 
 import * as ElementUI from 'element-ui';
 // @ts-ignore
@@ -91,6 +92,9 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
 import { store } from './store';
+
+Vue.use(Vue2TouchEvents);
+
 Vue.use(ElementUI, { locale });
 
 library.add(faAngleDoubleLeft);
diff --git a/packages/editor-ui/src/store.ts b/packages/editor-ui/src/store.ts
index efa656e3e..c55764095 100644
--- a/packages/editor-ui/src/store.ts
+++ b/packages/editor-ui/src/store.ts
@@ -8,6 +8,7 @@ import {
 	IConnection,
 	IConnections,
 	ICredentialType,
+	IDataObject,
 	INodeConnections,
 	INodeIssueData,
 	INodeTypeDescription,
@@ -56,6 +57,7 @@ export const store = new Vuex.Store({
 		executionTimeout: -1,
 		maxExecutionTimeout: Number.MAX_SAFE_INTEGER,
 		versionCli: '0.0.0',
+		oauthCallbackUrls: {},
 		workflowExecutionData: null as IExecutionResponse | null,
 		lastSelectedNode: null as string | null,
 		lastSelectedNodeOutputIndex: null as number | null,
@@ -535,6 +537,9 @@ export const store = new Vuex.Store({
 		setVersionCli (state, version: string) {
 			Vue.set(state, 'versionCli', version);
 		},
+		setOauthCallbackUrls(state, urls: IDataObject) {
+			Vue.set(state, 'oauthCallbackUrls', urls);
+		},
 
 		addNodeType (state, typeData: INodeTypeDescription) {
 			if (!typeData.hasOwnProperty('name')) {
@@ -602,6 +607,14 @@ export const store = new Vuex.Store({
 				Vue.set(state.workflow, 'settings', {});
 			}
 		},
+
+		updateNodeTypes (state, nodeTypes: INodeTypeDescription[]) {
+			const updatedNodeNames = nodeTypes.map(node => node.name) as string[];
+			const oldNodesNotChanged = state.nodeTypes.filter(node => !updatedNodeNames.includes(node.name));
+			const updatedNodes = [...oldNodesNotChanged, ...nodeTypes];
+			Vue.set(state, 'nodeTypes', updatedNodes);
+			state.nodeTypes = updatedNodes;
+		},
 	},
 	getters: {
 
@@ -658,6 +671,9 @@ export const store = new Vuex.Store({
 		versionCli: (state): string => {
 			return state.versionCli;
 		},
+		oauthCallbackUrls: (state): object => {
+			return state.oauthCallbackUrls;
+		},
 
 		// Push Connection
 		pushConnectionActive: (state): boolean => {
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index d0b4133b1..8c82de22f 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -3,11 +3,15 @@
 		<div
 			class="node-view-wrapper"
 			:class="workflowClasses"
+			@touchstart="mouseDown"
+			@touchend="mouseUp"
+			@touchmove="mouseMoveNodeWorkflow"
 			@mousedown="mouseDown"
+			v-touch:tap="touchTap"
 			@mouseup="mouseUp"
 			@wheel="wheelScroll"
 			>
-			<div class="node-view-background" :style="backgroundStyle"></div>
+			<div id="node-view-background" class="node-view-background" :style="backgroundStyle"></div>
 			<div id="node-view" class="node-view" :style="workflowStyle">
 				<node
 				v-for="nodeData in nodes"
@@ -356,14 +360,20 @@ export default mixins(
 
 				return data;
 			},
-			mouseDown (e: MouseEvent) {
+			touchTap (e: MouseEvent | TouchEvent) {
+				if (this.isTouchDevice) {
+					this.mouseDown(e);
+				}
+			},
+			mouseDown (e: MouseEvent | TouchEvent) {
 				// Save the location of the mouse click
+				const position = this.getMousePosition(e);
 				const offsetPosition = this.$store.getters.getNodeViewOffsetPosition;
-				this.lastClickPosition[0] = e.pageX - offsetPosition[0];
-				this.lastClickPosition[1] = e.pageY - offsetPosition[1];
+				this.lastClickPosition[0] = position.x - offsetPosition[0];
+				this.lastClickPosition[1] = position.y - offsetPosition[1];
 
-				this.mouseDownMouseSelect(e);
-				this.mouseDownMoveWorkflow(e);
+				this.mouseDownMouseSelect(e as MouseEvent);
+				this.mouseDownMoveWorkflow(e as MouseEvent);
 
 				// Hide the node-creator
 				this.createNodeActive = false;
@@ -962,7 +972,7 @@ export default mixins(
 					// If a node is active then add the new node directly after the current one
 					// newNodeData.position = [activeNode.position[0], activeNode.position[1] + 60];
 					newNodeData.position = this.getNewNodePosition(
-						[lastSelectedNode.position[0] + 150, lastSelectedNode.position[1]],
+						[lastSelectedNode.position[0] + 200, lastSelectedNode.position[1]],
 						[100, 0],
 					);
 				} else {
@@ -1456,6 +1466,11 @@ export default mixins(
 					[0, 150],
 				);
 
+				if (newNodeData.webhookId) {
+					// Make sure that the node gets a new unique webhook-ID
+					newNodeData.webhookId = uuidv4();
+				}
+
 				await this.addNodes([newNodeData]);
 
 				// Automatically deselect all nodes and select the current one and also active
@@ -1593,6 +1608,11 @@ export default mixins(
 					return;
 				}
 
+				// Before proceeding we must check if all nodes contain the `properties` attribute.
+				// Nodes are loaded without this information so we must make sure that all nodes
+				// being added have this information.
+				await this.loadNodesProperties(nodes.map(node => node.type));
+
 				// Add the node to the node-list
 				let nodeType: INodeTypeDescription | null;
 				let foundNodeIssues: INodeIssues | null;
@@ -1703,6 +1723,9 @@ export default mixins(
 				let oldName: string;
 				let newName: string;
 				const createNodes: INode[] = [];
+
+				await this.loadNodesProperties(data.nodes.map(node => node.type));
+
 				data.nodes.forEach(node => {
 					if (nodeTypesCount[node.type] !== undefined) {
 						if (nodeTypesCount[node.type].exist >= nodeTypesCount[node.type].max) {
@@ -1745,6 +1768,10 @@ export default mixins(
 					for (type of Object.keys(currentConnections[sourceNode])) {
 						connection[type] = [];
 						for (sourceIndex = 0; sourceIndex < currentConnections[sourceNode][type].length; sourceIndex++) {
+							if (!currentConnections[sourceNode][type][sourceIndex]) {
+								// There is so something wrong with the data so ignore
+								continue;
+							}
 							const nodeSourceConnections = [];
 							for (connectionIndex = 0; connectionIndex < currentConnections[sourceNode][type][sourceIndex].length; connectionIndex++) {
 								const nodeConnection: NodeInputConnections = [];
@@ -1908,6 +1935,7 @@ export default mixins(
 				this.$store.commit('setExecutionTimeout', settings.executionTimeout);
 				this.$store.commit('setMaxExecutionTimeout', settings.maxExecutionTimeout);
 				this.$store.commit('setVersionCli', settings.versionCli);
+				this.$store.commit('setOauthCallbackUrls', settings.oauthCallbackUrls);
 			},
 			async loadNodeTypes (): Promise<void> {
 				const nodeTypes = await this.restApi().getNodeTypes();
@@ -1921,6 +1949,17 @@ export default mixins(
 				const credentials = await this.restApi().getAllCredentials();
 				this.$store.commit('setCredentials', credentials);
 			},
+			async loadNodesProperties(nodeNames: string[]): Promise<void> {
+				const allNodes = this.$store.getters.allNodeTypes;
+				const nodesToBeFetched = allNodes.filter((node: INodeTypeDescription) => nodeNames.includes(node.name) && !node.hasOwnProperty('properties')).map((node: INodeTypeDescription) => node.name) as string[];
+				if (nodesToBeFetched.length > 0) {
+					// Only call API if node information is actually missing
+					this.startLoading();
+					const nodeInfo = await this.restApi().getNodesInformation(nodesToBeFetched);
+					this.$store.commit('updateNodeTypes', nodeInfo);
+					this.stopLoading();
+				}
+			},
 		},
 
 		async mounted () {
diff --git a/packages/editor-ui/tslint.json b/packages/editor-ui/tslint.json
index 9f017cc5c..2fda8666d 100644
--- a/packages/editor-ui/tslint.json
+++ b/packages/editor-ui/tslint.json
@@ -47,6 +47,7 @@
 		"forin": true,
 		"jsdoc-format": true,
 		"label-position": true,
+		"indent": [true, "tabs", 2],
 		"member-access": [
 			true,
 			"no-public"
@@ -83,6 +84,18 @@
 			"ignore-bound-class-methods"
 		],
 		"switch-default": true,
+		"trailing-comma": [
+			true,
+			{
+				"multiline": {
+					"objects": "always",
+					"arrays": "always",
+					"functions": "always",
+					"typeLiterals": "ignore"
+				},
+				"esSpecCompliant": true
+			}
+		],
 		"triple-equals": [
 			true,
 			"allow-null-check"
diff --git a/packages/node-dev/LICENSE.md b/packages/node-dev/LICENSE.md
index 24a7d38fc..3dd835dee 100644
--- a/packages/node-dev/LICENSE.md
+++ b/packages/node-dev/LICENSE.md
@@ -19,7 +19,7 @@ Condition notice.
 
 Software: n8n
 
-License: Apache 2.0
+License: Apache 2.0 with Commons Clause
 
 Licensor: n8n GmbH
 
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 51c25727c..9fa433df3 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
     "name": "n8n-node-dev",
-    "version": "0.10.0",
+    "version": "0.11.0",
     "description": "CLI to simplify n8n credentials/node development",
     "license": "SEE LICENSE IN LICENSE.md",
     "homepage": "https://n8n.io",
@@ -24,6 +24,7 @@
         "postpack": "rm -f oclif.manifest.json",
         "prepack": "echo \"Building project...\" && rm -rf dist && tsc -b && oclif-dev manifest",
         "tslint": "tslint -p tsconfig.json -c tslint.json",
+        "tslintfix": "tslint --fix -p tsconfig.json -c tslint.json",
         "watch": "tsc --watch"
     },
     "bin": {
@@ -54,15 +55,16 @@
         "@oclif/command": "^1.5.18",
         "@oclif/errors": "^1.2.2",
         "@types/express": "^4.17.6",
-        "@types/node": "^14.0.27",
+        "@types/node": "14.0.27",
         "change-case": "^4.1.1",
         "copyfiles": "^2.1.1",
         "inquirer": "^7.0.1",
-        "n8n-core": "^0.44.0",
-        "n8n-workflow": "^0.39.0",
+        "n8n-core": "^0.48.0",
+        "n8n-workflow": "^0.42.0",
+        "oauth-1.0a": "^2.2.6",
         "replace-in-file": "^6.0.0",
         "request": "^2.88.2",
         "tmp-promise": "^2.0.2",
-        "typescript": "~3.7.4"
+        "typescript": "~3.9.7"
     }
 }
diff --git a/packages/node-dev/src/Create.ts b/packages/node-dev/src/Create.ts
index 7bec6f215..50b5fcaca 100644
--- a/packages/node-dev/src/Create.ts
+++ b/packages/node-dev/src/Create.ts
@@ -23,7 +23,7 @@ export async function createTemplate(sourceFilePath: string, destinationFilePath
 	// Replace the variables in the template file
 	const options: ReplaceInFileConfig = {
 		files: [
-			destinationFilePath
+			destinationFilePath,
 		],
 		from: [],
 		to: [],
diff --git a/packages/node-dev/tslint.json b/packages/node-dev/tslint.json
index 7eb9d0110..f03bbfee3 100644
--- a/packages/node-dev/tslint.json
+++ b/packages/node-dev/tslint.json
@@ -46,6 +46,11 @@
 		"forin": true,
 		"jsdoc-format": true,
 		"label-position": true,
+		"indent": [
+			true,
+			"tabs",
+			2
+		],
 		"member-access": [
 			true,
 			"no-public"
@@ -60,6 +65,13 @@
 		"no-default-export": true,
 		"no-duplicate-variable": true,
 		"no-inferrable-types": true,
+		"ordered-imports": [
+			true,
+			{
+				"import-sources-order": "any",
+				"named-imports-order": "case-insensitive"
+			}
+		],
 		"no-namespace": [
 			true,
 			"allow-declarations"
@@ -82,6 +94,18 @@
 			"ignore-bound-class-methods"
 		],
 		"switch-default": true,
+		"trailing-comma": [
+			true,
+			{
+				"multiline": {
+					"objects": "always",
+					"arrays": "always",
+					"functions": "always",
+					"typeLiterals": "ignore"
+				},
+				"esSpecCompliant": true
+			}
+		],
 		"triple-equals": [
 			true,
 			"allow-null-check"
diff --git a/packages/nodes-base/LICENSE.md b/packages/nodes-base/LICENSE.md
index 24a7d38fc..3dd835dee 100644
--- a/packages/nodes-base/LICENSE.md
+++ b/packages/nodes-base/LICENSE.md
@@ -19,7 +19,7 @@ Condition notice.
 
 Software: n8n
 
-License: Apache 2.0
+License: Apache 2.0 with Commons Clause
 
 Licensor: n8n GmbH
 
diff --git a/packages/nodes-base/credentials/AcuitySchedulingOAuth2Api.credentials.ts b/packages/nodes-base/credentials/AcuitySchedulingOAuth2Api.credentials.ts
index 59435141a..b5dce3ae3 100644
--- a/packages/nodes-base/credentials/AcuitySchedulingOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/AcuitySchedulingOAuth2Api.credentials.ts
@@ -31,7 +31,7 @@ export class AcuitySchedulingOAuth2Api implements ICredentialType {
 			name: 'scope',
 			type: 'hidden' as NodePropertyTypes,
 			default: 'api-v1',
-			required: true
+			required: true,
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
diff --git a/packages/nodes-base/credentials/AsanaApi.credentials.ts b/packages/nodes-base/credentials/AsanaApi.credentials.ts
index 56b42c8b7..c9096ed8a 100644
--- a/packages/nodes-base/credentials/AsanaApi.credentials.ts
+++ b/packages/nodes-base/credentials/AsanaApi.credentials.ts
@@ -3,7 +3,6 @@ import {
 	NodePropertyTypes,
 } from 'n8n-workflow';
 
-
 export class AsanaApi implements ICredentialType {
 	name = 'asanaApi';
 	displayName = 'Asana API';
diff --git a/packages/nodes-base/credentials/AsanaOAuth2Api.credentials.ts b/packages/nodes-base/credentials/AsanaOAuth2Api.credentials.ts
new file mode 100644
index 000000000..b40949bb6
--- /dev/null
+++ b/packages/nodes-base/credentials/AsanaOAuth2Api.credentials.ts
@@ -0,0 +1,48 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class AsanaOAuth2Api implements ICredentialType {
+	name = 'asanaOAuth2Api';
+	extends = [
+		'oAuth2Api',
+	];
+	displayName = 'Asana OAuth2 API';
+	documentationUrl = 'asana';
+	properties = [
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://app.asana.com/-/oauth_authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://app.asana.com/-/oauth_token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'body',
+			description: 'Resource to consume.',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/AutomizyApi.credentials.ts b/packages/nodes-base/credentials/AutomizyApi.credentials.ts
new file mode 100644
index 000000000..7f4bcc4e3
--- /dev/null
+++ b/packages/nodes-base/credentials/AutomizyApi.credentials.ts
@@ -0,0 +1,18 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class AutomizyApi implements ICredentialType {
+	name = 'automizyApi';
+	displayName = 'Automizy API';
+	documentationUrl = 'automizy';
+	properties = [
+		{
+			displayName: 'API Token',
+			name: 'apiToken',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/BitlyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/BitlyOAuth2Api.credentials.ts
index fc5ef7f15..bdd8b6bfe 100644
--- a/packages/nodes-base/credentials/BitlyOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/BitlyOAuth2Api.credentials.ts
@@ -6,9 +6,9 @@ import {
 
 export class BitlyOAuth2Api implements ICredentialType {
 	name = 'bitlyOAuth2Api';
-    displayName = 'Bitly OAuth2 API';
+	displayName = 'Bitly OAuth2 API';
 	documentationUrl = 'bitly';
-    extends = [
+	extends = [
 		'oAuth2Api',
 	];
 	properties = [
diff --git a/packages/nodes-base/credentials/ClickUpOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ClickUpOAuth2Api.credentials.ts
new file mode 100644
index 000000000..07bb9ef61
--- /dev/null
+++ b/packages/nodes-base/credentials/ClickUpOAuth2Api.credentials.ts
@@ -0,0 +1,48 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class ClickUpOAuth2Api implements ICredentialType {
+	name = 'clickUpOAuth2Api';
+	extends = [
+		'oAuth2Api',
+	];
+	displayName = 'ClickUp OAuth2 API';
+	documentationUrl = 'clickUp';
+	properties = [
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://app.clickup.com/api',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://api.clickup.com/api/v2/oauth/token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'body',
+			description: 'Resource to consume.',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/ContentfulApi.credentials.ts b/packages/nodes-base/credentials/ContentfulApi.credentials.ts
index 8ce49fb14..59680f100 100644
--- a/packages/nodes-base/credentials/ContentfulApi.credentials.ts
+++ b/packages/nodes-base/credentials/ContentfulApi.credentials.ts
@@ -7,6 +7,7 @@ import {
 export class ContentfulApi implements ICredentialType {
 	name = 'contentfulApi';
 	displayName = 'Contenful API';
+	documentationUrl = 'contentful';
 	properties = [
 		{
 			displayName: 'Space ID',
diff --git a/packages/nodes-base/credentials/ConvertKitApi.credentials.ts b/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
index d7e869755..94195ec0f 100644
--- a/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
+++ b/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
@@ -7,6 +7,7 @@ import {
 export class ConvertKitApi implements ICredentialType {
 	name = 'convertKitApi';
 	displayName = 'ConvertKit API';
+	documentationUrl = 'convertKit';
 	properties = [
 		{
 			displayName: 'API Secret',
diff --git a/packages/nodes-base/credentials/DisqusApi.credentials.ts b/packages/nodes-base/credentials/DisqusApi.credentials.ts
index 1c88286c1..3acf068be 100644
--- a/packages/nodes-base/credentials/DisqusApi.credentials.ts
+++ b/packages/nodes-base/credentials/DisqusApi.credentials.ts
@@ -13,7 +13,7 @@ export class DisqusApi implements ICredentialType {
 			name: 'accessToken',
 			type: 'string' as NodePropertyTypes,
 			default: '',
-			description: 'Visit your account details page, and grab the Access Token. See <a href="https://disqus.com/api/docs/auth/">Disqus auth</a>.'
+			description: 'Visit your account details page, and grab the Access Token. See <a href="https://disqus.com/api/docs/auth/">Disqus auth</a>.',
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/DriftApi.credentials.ts b/packages/nodes-base/credentials/DriftApi.credentials.ts
index 40372d06e..64f80048d 100644
--- a/packages/nodes-base/credentials/DriftApi.credentials.ts
+++ b/packages/nodes-base/credentials/DriftApi.credentials.ts
@@ -13,7 +13,7 @@ export class DriftApi implements ICredentialType {
 			name: 'accessToken',
 			type: 'string' as NodePropertyTypes,
 			default: '',
-			description: 'Visit your account details page, and grab the Access Token. See <a href="https://devdocs.drift.com/docs/quick-start">Drift auth</a>.'
+			description: 'Visit your account details page, and grab the Access Token. See <a href="https://devdocs.drift.com/docs/quick-start">Drift auth</a>.',
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/DropboxOAuth2Api.credentials.ts b/packages/nodes-base/credentials/DropboxOAuth2Api.credentials.ts
index b67bae38f..11e290bd8 100644
--- a/packages/nodes-base/credentials/DropboxOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/DropboxOAuth2Api.credentials.ts
@@ -25,8 +25,8 @@ export class DropboxOAuth2Api implements ICredentialType {
 			type: 'hidden' as NodePropertyTypes,
 			default: 'https://api.dropboxapi.com/oauth2/token',
 			required: true,
-        },
-        {
+		},
+		{
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden' as NodePropertyTypes,
diff --git a/packages/nodes-base/credentials/EventbriteOAuth2Api.credentials.ts b/packages/nodes-base/credentials/EventbriteOAuth2Api.credentials.ts
index ed505eaca..551253499 100644
--- a/packages/nodes-base/credentials/EventbriteOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/EventbriteOAuth2Api.credentials.ts
@@ -42,7 +42,7 @@ export class EventbriteOAuth2Api implements ICredentialType {
 			displayName: 'Authentication',
 			name: 'authentication',
 			type: 'hidden' as NodePropertyTypes,
-			default: 'body'
+			default: 'body',
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/FreshdeskApi.credentials.ts b/packages/nodes-base/credentials/FreshdeskApi.credentials.ts
index 078d4db75..6feb810f5 100644
--- a/packages/nodes-base/credentials/FreshdeskApi.credentials.ts
+++ b/packages/nodes-base/credentials/FreshdeskApi.credentials.ts
@@ -21,7 +21,7 @@ export class FreshdeskApi implements ICredentialType {
 			type: 'string' as NodePropertyTypes,
 			placeholder: 'company',
 			description: 'If the URL you get displayed on Freshdesk is "https://company.freshdesk.com" enter "company"',
-			default: ''
-        }
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/Ftp.credentials.ts b/packages/nodes-base/credentials/Ftp.credentials.ts
index 5ec11571f..56e4839e6 100644
--- a/packages/nodes-base/credentials/Ftp.credentials.ts
+++ b/packages/nodes-base/credentials/Ftp.credentials.ts
@@ -14,7 +14,7 @@ export class Ftp implements ICredentialType {
 			required: true,
 			type: 'string' as NodePropertyTypes,
 			default: '',
-			placeholder: 'localhost'
+			placeholder: 'localhost',
 		},
 		{
 			displayName: 'Port',
diff --git a/packages/nodes-base/credentials/GSuiteAdminOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GSuiteAdminOAuth2Api.credentials.ts
new file mode 100644
index 000000000..0271104a1
--- /dev/null
+++ b/packages/nodes-base/credentials/GSuiteAdminOAuth2Api.credentials.ts
@@ -0,0 +1,28 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+const scopes = [
+	'https://www.googleapis.com/auth/admin.directory.group',
+	'https://www.googleapis.com/auth/admin.directory.user',
+	'https://www.googleapis.com/auth/admin.directory.domain.readonly',
+	'https://www.googleapis.com/auth/admin.directory.userschema.readonly',
+];
+
+export class GSuiteAdminOAuth2Api implements ICredentialType {
+	name = 'gSuiteAdminOAuth2Api';
+	extends = [
+		'googleOAuth2Api',
+	];
+	displayName = 'G Suite Admin OAuth2 API';
+	documentationUrl = 'google';
+	properties = [
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: scopes.join(' '),
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/GitlabApi.credentials.ts b/packages/nodes-base/credentials/GitlabApi.credentials.ts
index 2f298ea41..e8d8b151b 100644
--- a/packages/nodes-base/credentials/GitlabApi.credentials.ts
+++ b/packages/nodes-base/credentials/GitlabApi.credentials.ts
@@ -13,7 +13,7 @@ export class GitlabApi implements ICredentialType {
 			displayName: 'Gitlab Server',
 			name: 'server',
 			type: 'string' as NodePropertyTypes,
-			default: 'https://gitlab.com'
+			default: 'https://gitlab.com',
 		},
 		{
 			displayName: 'Access Token',
diff --git a/packages/nodes-base/credentials/GitlabOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GitlabOAuth2Api.credentials.ts
index ca470ae8f..39e1b04a0 100644
--- a/packages/nodes-base/credentials/GitlabOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GitlabOAuth2Api.credentials.ts
@@ -16,7 +16,7 @@ export class GitlabOAuth2Api implements ICredentialType {
 			displayName: 'Gitlab Server',
 			name: 'server',
 			type: 'string' as NodePropertyTypes,
-			default: 'https://gitlab.com'
+			default: 'https://gitlab.com',
 		},
 		{
 			displayName: 'Authorization URL',
diff --git a/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
index 55d9bc66e..0dc677ea8 100644
--- a/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
@@ -27,7 +27,7 @@ export class GoogleOAuth2Api implements ICredentialType {
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
 			type: 'hidden' as NodePropertyTypes,
-			default: 'access_type=offline',
+			default: 'access_type=offline&prompt=consent',
 		},
 		{
 			displayName: 'Authentication',
diff --git a/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
index d13c55612..221f02c06 100644
--- a/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
@@ -4,7 +4,6 @@ import {
 } from 'n8n-workflow';
 
 const scopes = [
-	'https://www.googleapis.com/auth/drive',
 	'https://www.googleapis.com/auth/drive.file',
 	'https://www.googleapis.com/auth/spreadsheets',
 ];
diff --git a/packages/nodes-base/credentials/GoogleTasksOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleTasksOAuth2Api.credentials.ts
index cef0dfa07..4cdffd951 100644
--- a/packages/nodes-base/credentials/GoogleTasksOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleTasksOAuth2Api.credentials.ts
@@ -17,7 +17,7 @@ export class GoogleTasksOAuth2Api implements ICredentialType {
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden' as NodePropertyTypes,
-			default: scopes.join(' ')
+			default: scopes.join(' '),
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/GoogleTranslateOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleTranslateOAuth2Api.credentials.ts
new file mode 100644
index 000000000..0cdcd608e
--- /dev/null
+++ b/packages/nodes-base/credentials/GoogleTranslateOAuth2Api.credentials.ts
@@ -0,0 +1,25 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+const scopes = [
+	'https://www.googleapis.com/auth/cloud-translation',
+];
+
+export class GoogleTranslateOAuth2Api implements ICredentialType {
+	name = 'googleTranslateOAuth2Api';
+	extends = [
+		'googleOAuth2Api',
+	];
+	displayName = 'Google Translate OAuth2 API';
+	documentationUrl = 'google';
+	properties = [
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: scopes.join(' '),
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/HarvestApi.credentials.ts b/packages/nodes-base/credentials/HarvestApi.credentials.ts
index cafef13e6..683010aa1 100644
--- a/packages/nodes-base/credentials/HarvestApi.credentials.ts
+++ b/packages/nodes-base/credentials/HarvestApi.credentials.ts
@@ -13,14 +13,14 @@ export class HarvestApi implements ICredentialType {
 			name: 'accountId',
 			type: 'string' as NodePropertyTypes,
 			default: '',
-			description: 'Visit your account details page, and grab the Account ID. See <a href="https://help.getharvest.com/api-v2/authentication-api/authentication/authentication/">Harvest Personal Access Tokens</a>.'
+			description: 'Visit your account details page, and grab the Account ID. See <a href="https://help.getharvest.com/api-v2/authentication-api/authentication/authentication/">Harvest Personal Access Tokens</a>.',
 		},
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
 			type: 'string' as NodePropertyTypes,
 			default: '',
-			description: 'Visit your account details page, and grab the Access Token. See <a href="https://help.getharvest.com/api-v2/authentication-api/authentication/authentication/">Harvest Personal Access Tokens</a>.'
+			description: 'Visit your account details page, and grab the Access Token. See <a href="https://help.getharvest.com/api-v2/authentication-api/authentication/authentication/">Harvest Personal Access Tokens</a>.',
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/HubspotDeveloperApi.credentials.ts b/packages/nodes-base/credentials/HubspotDeveloperApi.credentials.ts
index 2364e3dd5..5e21f5077 100644
--- a/packages/nodes-base/credentials/HubspotDeveloperApi.credentials.ts
+++ b/packages/nodes-base/credentials/HubspotDeveloperApi.credentials.ts
@@ -5,7 +5,7 @@ import {
 
 export class HubspotDeveloperApi implements ICredentialType {
 	name = 'hubspotDeveloperApi';
-	displayName = 'Hubspot API';
+	displayName = 'Hubspot Developer API';
 	documentationUrl = 'hubspot';
 	properties = [
 		{
diff --git a/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts b/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
index bf237ab76..150d33642 100644
--- a/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
@@ -44,11 +44,11 @@ export class HubspotOAuth2Api implements ICredentialType {
 			default: 'grant_type=authorization_code',
 		},
 		{
-            displayName: 'Authentication',
-            name: 'authentication',
-            type: 'hidden' as NodePropertyTypes,
-            default: 'body',
-            description: 'Resource to consume.',
-        },
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'body',
+			description: 'Resource to consume.',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts
new file mode 100644
index 000000000..bad0c3d83
--- /dev/null
+++ b/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts
@@ -0,0 +1,56 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+
+export class LinkedInOAuth2Api implements ICredentialType {
+	name = 'linkedInOAuth2Api';
+	extends = [
+		'oAuth2Api',
+	];
+	displayName = 'LinkedIn OAuth2 API';
+	documentationUrl = 'linkedIn';
+	properties = [
+		{
+			displayName: 'Organization Support',
+			name: 'organizationSupport',
+			type: 'boolean' as NodePropertyTypes,
+			default: true,
+			description: 'Request permissions to post as an orgaization.',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://www.linkedin.com/oauth/v2/authorization',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://www.linkedin.com/oauth/v2/accessToken',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: '=r_liteprofile,r_emailaddress,w_member_social{{$parameter["organizationSupport"] === true ? ",w_organization_social":""}}',
+			description: 'Standard scopes for posting on behalf of a user or organization. See <a href="https://docs.microsoft.com/en-us/linkedin/marketing/getting-started#available-permissions"> this resource </a>.',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'body',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MatrixApi.credentials.ts b/packages/nodes-base/credentials/MatrixApi.credentials.ts
new file mode 100644
index 000000000..4a03fd733
--- /dev/null
+++ b/packages/nodes-base/credentials/MatrixApi.credentials.ts
@@ -0,0 +1,25 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+
+export class MatrixApi implements ICredentialType {
+	name = 'matrixApi';
+	displayName = 'Matrix API';
+	documentationUrl = 'matrix';
+	properties = [
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Homeserver URL',
+			name: 'homeserverUrl',
+			type: 'string' as NodePropertyTypes,
+			default: 'https://matrix-client.matrix.org',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MessageBirdApi.credentials.ts b/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
index 270bd99fe..e5566b102 100644
--- a/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
+++ b/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
@@ -9,7 +9,7 @@ export class MessageBirdApi implements ICredentialType {
 			displayName: 'API Key',
 			name: 'accessKey',
 			type: 'string' as NodePropertyTypes,
-			default: ''
-		}
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
index 5d469ade4..c13e148a8 100644
--- a/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
@@ -8,7 +8,7 @@ export class MicrosoftExcelOAuth2Api implements ICredentialType {
 	extends = [
 		'microsoftOAuth2Api',
 	];
-	displayName = 'Microsoft OAuth2 API';
+	displayName = 'Microsoft Excel OAuth2 API';
 	documentationUrl = 'microsoft';
 	properties = [
 		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
index ad5770199..08990b2de 100644
--- a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
@@ -11,17 +11,19 @@ export class MicrosoftOAuth2Api implements ICredentialType {
 	displayName = 'Microsoft OAuth2 API';
 	documentationUrl = 'microsoft';
 	properties = [
+		//info about the tenantID
+		//https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-protocols#endpoints
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
 			type: 'string' as NodePropertyTypes,
-			default: 'https://login.microsoftonline.com/{yourtenantid}/oauth2/v2.0/authorize',
+			default: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
 			type: 'string' as NodePropertyTypes,
-			default: 'https://login.microsoftonline.com/{yourtenantid}/oauth2/v2.0/token',
+			default: 'https://login.microsoftonline.com/common/oauth2/v2.0/token',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
diff --git a/packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts
index eb1578dc0..9bfc92cb8 100644
--- a/packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts
@@ -8,7 +8,7 @@ export class MicrosoftOneDriveOAuth2Api implements ICredentialType {
 	extends = [
 		'microsoftOAuth2Api',
 	];
-	displayName = 'Microsoft OAuth2 API';
+	displayName = 'Microsoft Drive OAuth2 API';
 	documentationUrl = 'microsoft';
 	properties = [
 		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
diff --git a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
index bad5a19f5..598c9ded2 100644
--- a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
@@ -9,40 +9,40 @@ export class MicrosoftSql implements ICredentialType {
 			displayName: 'Server',
 			name: 'server',
 			type: 'string' as NodePropertyTypes,
-			default: 'localhost'
+			default: 'localhost',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
 			type: 'string' as NodePropertyTypes,
-			default: 'master'
+			default: 'master',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
 			type: 'string' as NodePropertyTypes,
-			default: 'sa'
+			default: 'sa',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
 			type: 'string' as NodePropertyTypes,
 			typeOptions: {
-				password: true
+				password: true,
 			},
-			default: ''
+			default: '',
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
 			type: 'number' as NodePropertyTypes,
-			default: 1433
+			default: 1433,
 		},
 		{
 			displayName: 'Domain',
 			name: 'domain',
 			type: 'string' as NodePropertyTypes,
-			default: ''
-		}
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/MicrosoftTeamsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftTeamsOAuth2Api.credentials.ts
new file mode 100644
index 000000000..1afbae247
--- /dev/null
+++ b/packages/nodes-base/credentials/MicrosoftTeamsOAuth2Api.credentials.ts
@@ -0,0 +1,22 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class MicrosoftTeamsOAuth2Api implements ICredentialType {
+	name = 'microsoftTeamsOAuth2Api';
+	extends = [
+		'microsoftOAuth2Api',
+	];
+	displayName = 'Microsoft Teams OAuth2 API';
+	documentationUrl = 'microsoft';
+	properties = [
+		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'openid offline_access User.ReadWrite.All Group.ReadWrite.All',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MindeeInvoiceApi.credentials.ts b/packages/nodes-base/credentials/MindeeInvoiceApi.credentials.ts
new file mode 100644
index 000000000..120d11173
--- /dev/null
+++ b/packages/nodes-base/credentials/MindeeInvoiceApi.credentials.ts
@@ -0,0 +1,18 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class MindeeInvoiceApi implements ICredentialType {
+	name = 'mindeeInvoiceApi';
+	displayName = 'Mindee Invoice API';
+	documentationUrl = 'mindee';
+	properties = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MindeeReceiptApi.credentials.ts b/packages/nodes-base/credentials/MindeeReceiptApi.credentials.ts
new file mode 100644
index 000000000..4d9e78a3b
--- /dev/null
+++ b/packages/nodes-base/credentials/MindeeReceiptApi.credentials.ts
@@ -0,0 +1,18 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class MindeeReceiptApi implements ICredentialType {
+	name = 'mindeeReceiptApi';
+	displayName = 'Mindee Receipt API';
+	documentationUrl = 'mindee';
+	properties = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MongoDb.credentials.ts b/packages/nodes-base/credentials/MongoDb.credentials.ts
index 927082845..cd9ed5142 100644
--- a/packages/nodes-base/credentials/MongoDb.credentials.ts
+++ b/packages/nodes-base/credentials/MongoDb.credentials.ts
@@ -39,7 +39,7 @@ export class MongoDb implements ICredentialType {
 			placeholder: 'mongodb://<USERNAME>:<PASSWORD>@localhost:27017/?authSource=admin&readPreference=primary&appname=n8n&ssl=false',
 			required: false,
 			description: `If provided, the value here will be used as a MongoDB connection string,<br />
-						  and the MongoDB credentials will be ignored`
+						  and the MongoDB credentials will be ignored`,
 		},
 		{
 			displayName: 'Host',
@@ -52,14 +52,14 @@ export class MongoDb implements ICredentialType {
 					],
 				},
 			},
-			default: 'localhost'
+			default: 'localhost',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
 			type: 'string' as NodePropertyTypes,
 			default: '',
-			description: 'Note: the database should still be provided even if using an override connection string'
+			description: 'Note: the database should still be provided even if using an override connection string',
 		},
 		{
 			displayName: 'User',
@@ -72,14 +72,14 @@ export class MongoDb implements ICredentialType {
 					],
 				},
 			},
-			default: ''
+			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
 			type: 'string' as NodePropertyTypes,
 			typeOptions: {
-				password: true
+				password: true,
 			},
 			displayOptions: {
 				show: {
@@ -88,7 +88,7 @@ export class MongoDb implements ICredentialType {
 					],
 				},
 			},
-			default: ''
+			default: '',
 		},
 		{
 			displayName: 'Port',
@@ -101,7 +101,7 @@ export class MongoDb implements ICredentialType {
 					],
 				},
 			},
-			default: 27017
+			default: 27017,
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/Mqtt.credentials.ts b/packages/nodes-base/credentials/Mqtt.credentials.ts
index bcc419a52..05d4b0ec5 100644
--- a/packages/nodes-base/credentials/Mqtt.credentials.ts
+++ b/packages/nodes-base/credentials/Mqtt.credentials.ts
@@ -7,6 +7,7 @@ import {
 export class Mqtt implements ICredentialType {
 	name = 'mqtt';
 	displayName = 'MQTT';
+	documentationUrl = 'mqtt';
 	properties = [
 		// The credentials to get from user and save encrypted.
 		// Properties can be defined exactly in the same way
@@ -14,8 +15,8 @@ export class Mqtt implements ICredentialType {
 		{
 			displayName: 'Protocol',
 			name: 'protocol',
-      type: 'options' as NodePropertyTypes,
-      options: [
+			type: 'options' as NodePropertyTypes,
+			options: [
 				{
 					name: 'mqtt',
 					value: 'mqtt',
@@ -56,4 +57,3 @@ export class Mqtt implements ICredentialType {
 		},
 	];
 }
-
diff --git a/packages/nodes-base/credentials/OAuth1Api.credentials.ts b/packages/nodes-base/credentials/OAuth1Api.credentials.ts
index c0d61895f..563b6065c 100644
--- a/packages/nodes-base/credentials/OAuth1Api.credentials.ts
+++ b/packages/nodes-base/credentials/OAuth1Api.credentials.ts
@@ -50,11 +50,15 @@ export class OAuth1Api implements ICredentialType {
 			options: [
 				{
 					name: 'HMAC-SHA1',
-					value: 'HMAC-SHA1'
+					value: 'HMAC-SHA1',
 				},
 				{
 					name: 'HMAC-SHA256',
-					value: 'HMAC-SHA256'
+					value: 'HMAC-SHA256',
+				},
+				{
+					name: 'HMAC-SHA512',
+					value: 'HMAC-SHA512',
 				},
 			],
 			default: '',
diff --git a/packages/nodes-base/credentials/PaddleApi.credentials.ts b/packages/nodes-base/credentials/PaddleApi.credentials.ts
index 143a24b3b..76c0d5bfb 100644
--- a/packages/nodes-base/credentials/PaddleApi.credentials.ts
+++ b/packages/nodes-base/credentials/PaddleApi.credentials.ts
@@ -6,6 +6,7 @@ import {
 export class PaddleApi implements ICredentialType {
 	name = 'paddleApi';
 	displayName = 'Paddle API';
+	documentationUrl = 'paddle';
 	properties = [
 		{
 			displayName: 'Vendor Auth Code',
diff --git a/packages/nodes-base/credentials/PayPalApi.credentials.ts b/packages/nodes-base/credentials/PayPalApi.credentials.ts
index 3e9cbbb80..ed1554fac 100644
--- a/packages/nodes-base/credentials/PayPalApi.credentials.ts
+++ b/packages/nodes-base/credentials/PayPalApi.credentials.ts
@@ -29,13 +29,13 @@ export class PayPalApi implements ICredentialType {
 			options: [
 				{
 					name: 'Sanbox',
-					value: 'sanbox'
+					value: 'sanbox',
 				},
 				{
 					name: 'Live',
-					value: 'live'
+					value: 'live',
 				},
-			]
+			],
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/PhilipsHueOAuth2Api.credentials.ts b/packages/nodes-base/credentials/PhilipsHueOAuth2Api.credentials.ts
index 9f8c6f90a..f2f31fe58 100644
--- a/packages/nodes-base/credentials/PhilipsHueOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/PhilipsHueOAuth2Api.credentials.ts
@@ -11,6 +11,12 @@ export class PhilipsHueOAuth2Api implements ICredentialType {
 	displayName = 'PhilipHue OAuth2 API';
 	documentationUrl = 'philipsHue';
 	properties = [
+		{
+			displayName: 'APP ID',
+			name: 'appId',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
@@ -27,7 +33,7 @@ export class PhilipsHueOAuth2Api implements ICredentialType {
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
 			type: 'hidden' as NodePropertyTypes,
-			default: '',
+			default: '={{"appid="+$parameter["appId"]}}',
 		},
 		{
 			displayName: 'Scope',
@@ -36,11 +42,11 @@ export class PhilipsHueOAuth2Api implements ICredentialType {
 			default: '',
 		},
 		{
-            displayName: 'Authentication',
-            name: 'authentication',
-            type: 'hidden' as NodePropertyTypes,
-            default: 'header',
-            description: 'Method of authentication.',
-        },
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'header',
+			description: 'Method of authentication.',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/Postgres.credentials.ts b/packages/nodes-base/credentials/Postgres.credentials.ts
index d3a8e90e5..22fd706f3 100644
--- a/packages/nodes-base/credentials/Postgres.credentials.ts
+++ b/packages/nodes-base/credentials/Postgres.credentials.ts
@@ -74,7 +74,7 @@ export class Postgres implements ICredentialType {
 				{
 					name: 'verify-full (not implemented)',
 					value: 'verify-full',
-				}
+				},
 			],
 			default: 'disable',
 		},
diff --git a/packages/nodes-base/credentials/PushoverApi.credentials.ts b/packages/nodes-base/credentials/PushoverApi.credentials.ts
new file mode 100644
index 000000000..3ec6fa905
--- /dev/null
+++ b/packages/nodes-base/credentials/PushoverApi.credentials.ts
@@ -0,0 +1,17 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class PushoverApi implements ICredentialType {
+	name = 'pushoverApi';
+	displayName = 'Pushover API';
+	properties = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/S3.credentials.ts b/packages/nodes-base/credentials/S3.credentials.ts
index 9d5b08c19..712664f0f 100644
--- a/packages/nodes-base/credentials/S3.credentials.ts
+++ b/packages/nodes-base/credentials/S3.credentials.ts
@@ -7,12 +7,13 @@ import {
 export class S3 implements ICredentialType {
 	name = 's3';
 	displayName = 'S3';
+	documentationUrl = 's3';
 	properties = [
 		{
 			displayName: 'S3 endpoint',
 			name: 'endpoint',
 			type: 'string' as NodePropertyTypes,
-			default: ''
+			default: '',
 		},
 		{
 			displayName: 'Region',
@@ -39,7 +40,7 @@ export class S3 implements ICredentialType {
 			displayName: 'Force path style',
 			name: 'forcePathStyle',
 			type: 'boolean' as NodePropertyTypes,
-			default: false
+			default: false,
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/LinkFishApi.credentials.ts b/packages/nodes-base/credentials/SendyApi.credentials.ts
similarity index 53%
rename from packages/nodes-base/credentials/LinkFishApi.credentials.ts
rename to packages/nodes-base/credentials/SendyApi.credentials.ts
index c809fc3a0..fcca6677d 100644
--- a/packages/nodes-base/credentials/LinkFishApi.credentials.ts
+++ b/packages/nodes-base/credentials/SendyApi.credentials.ts
@@ -3,21 +3,19 @@ import {
 	NodePropertyTypes,
 } from 'n8n-workflow';
 
-
-export class LinkFishApi implements ICredentialType {
-	name = 'linkFishApi';
-	displayName = 'link.fish API';
-	documentationUrl = 'linkFish';
+export class SendyApi implements ICredentialType {
+	name = 'sendyApi';
+	displayName = 'Sendy API';
 	properties = [
 		{
-			displayName: 'Email',
-			name: 'email',
+			displayName: 'URL',
+			name: 'url',
 			type: 'string' as NodePropertyTypes,
 			default: '',
-
+			placeholder: 'https://yourdomain.com',
 		},
 		{
-			displayName: 'Api Key',
+			displayName: 'API Key',
 			name: 'apiKey',
 			type: 'string' as NodePropertyTypes,
 			default: '',
diff --git a/packages/nodes-base/credentials/SentryIoApi.credentials.ts b/packages/nodes-base/credentials/SentryIoApi.credentials.ts
index 576f27f2f..4530d5027 100644
--- a/packages/nodes-base/credentials/SentryIoApi.credentials.ts
+++ b/packages/nodes-base/credentials/SentryIoApi.credentials.ts
@@ -6,6 +6,7 @@ import {
 export class SentryIoApi implements ICredentialType {
 	name = 'sentryIoApi';
 	displayName = 'Sentry.io API';
+	documentationUrl = 'sentryIo';
 	properties = [
 		{
 			displayName: 'Token',
diff --git a/packages/nodes-base/credentials/SentryIoOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SentryIoOAuth2Api.credentials.ts
index 3948be6c6..9c0ee4dd2 100644
--- a/packages/nodes-base/credentials/SentryIoOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SentryIoOAuth2Api.credentials.ts
@@ -9,6 +9,7 @@ export class SentryIoOAuth2Api implements ICredentialType {
 		'oAuth2Api',
 	];
 	displayName = 'Sentry.io OAuth2 API';
+	documentationUrl = 'sentryIo';
 	properties = [
 		{
 			displayName: 'Authorization URL',
diff --git a/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts b/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
new file mode 100644
index 000000000..02c06ee09
--- /dev/null
+++ b/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
@@ -0,0 +1,24 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class SentryIoServerApi implements ICredentialType {
+	name = 'sentryIoServerApi';
+	displayName = 'Sentry.io API';
+	documentationUrl = 'sentryIo';
+	properties = [
+		{
+			displayName: 'Token',
+			name: 'token',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+			placeholder: 'https://example.com',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/Sftp.credentials.ts b/packages/nodes-base/credentials/Sftp.credentials.ts
index bf2ce34f0..5c7dd2122 100644
--- a/packages/nodes-base/credentials/Sftp.credentials.ts
+++ b/packages/nodes-base/credentials/Sftp.credentials.ts
@@ -6,7 +6,7 @@ import {
 export class Sftp implements ICredentialType {
 	name = 'sftp';
 	displayName = 'SFTP';
-	documentationUrl = 'sftp';
+	documentationUrl = 'ftp';
 	properties = [
 		{
 			displayName: 'Host',
diff --git a/packages/nodes-base/credentials/Signl4Api.credentials.ts b/packages/nodes-base/credentials/Signl4Api.credentials.ts
index 857910a17..3c23832a3 100644
--- a/packages/nodes-base/credentials/Signl4Api.credentials.ts
+++ b/packages/nodes-base/credentials/Signl4Api.credentials.ts
@@ -13,7 +13,7 @@ export class Signl4Api implements ICredentialType {
 			name: 'teamSecret',
 			type: 'string' as NodePropertyTypes,
 			default: '',
-			description: 'The team secret is the last part of your SIGNL4 webhook URL.'
+			description: 'The team secret is the last part of your SIGNL4 webhook URL.',
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
index 3e600122f..77e25bfb1 100644
--- a/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
@@ -10,6 +10,8 @@ const userScopes = [
 	'files:write',
 	'stars:read',
 	'stars:write',
+	'users.profile:read',
+	'users.profile:write',
 ];
 
 export class SlackOAuth2Api implements ICredentialType {
diff --git a/packages/nodes-base/credentials/SpotifyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SpotifyOAuth2Api.credentials.ts
index 48e66b0cf..4b37b0881 100644
--- a/packages/nodes-base/credentials/SpotifyOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SpotifyOAuth2Api.credentials.ts
@@ -49,6 +49,6 @@ export class SpotifyOAuth2Api implements ICredentialType {
 			name: 'authentication',
 			type: 'hidden' as NodePropertyTypes,
 			default: 'header',
-        }
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/StravaOAuth2Api.credentials.ts b/packages/nodes-base/credentials/StravaOAuth2Api.credentials.ts
new file mode 100644
index 000000000..600e220a3
--- /dev/null
+++ b/packages/nodes-base/credentials/StravaOAuth2Api.credentials.ts
@@ -0,0 +1,47 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class StravaOAuth2Api implements ICredentialType {
+	name = 'stravaOAuth2Api';
+	extends = [
+		'oAuth2Api',
+	];
+	displayName = 'Strava OAuth2 API';
+	properties = [
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://www.strava.com/oauth/authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://www.strava.com/oauth/token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'activity:read_all,activity:write',
+			required: true,
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'body',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/SurveyMonkeyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SurveyMonkeyOAuth2Api.credentials.ts
index 2ea8ae3e7..9cc130462 100644
--- a/packages/nodes-base/credentials/SurveyMonkeyOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SurveyMonkeyOAuth2Api.credentials.ts
@@ -50,7 +50,7 @@ export class SurveyMonkeyOAuth2Api implements ICredentialType {
 			displayName: 'Authentication',
 			name: 'authentication',
 			type: 'hidden' as NodePropertyTypes,
-			default: 'body'
+			default: 'body',
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts b/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts
new file mode 100644
index 000000000..753028a4e
--- /dev/null
+++ b/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts
@@ -0,0 +1,24 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class TaigaCloudApi implements ICredentialType {
+	name = 'taigaCloudApi';
+	displayName = 'Taiga Cloud API';
+	documentationUrl = 'taiga';
+	properties = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/TaigaServerApi.credentials.ts b/packages/nodes-base/credentials/TaigaServerApi.credentials.ts
new file mode 100644
index 000000000..a67e7913a
--- /dev/null
+++ b/packages/nodes-base/credentials/TaigaServerApi.credentials.ts
@@ -0,0 +1,31 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class TaigaServerApi implements ICredentialType {
+	name = 'taigaServerApi';
+	displayName = 'Taiga Server API';
+	documentationUrl = 'taiga';
+	properties = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+			placeholder: 'https://taiga.yourdomain.com',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/TodoistOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TodoistOAuth2Api.credentials.ts
index 9341e69c6..b7baa37c2 100644
--- a/packages/nodes-base/credentials/TodoistOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/TodoistOAuth2Api.credentials.ts
@@ -9,6 +9,7 @@ export class TodoistOAuth2Api implements ICredentialType {
 		'oAuth2Api',
 	];
 	displayName = 'Todoist OAuth2 API';
+	documentationUrl = 'todoist';
 	properties = [
 		{
 			displayName: 'Authorization URL',
diff --git a/packages/nodes-base/credentials/VonageApi.credentials.ts b/packages/nodes-base/credentials/VonageApi.credentials.ts
new file mode 100644
index 000000000..d8d235b89
--- /dev/null
+++ b/packages/nodes-base/credentials/VonageApi.credentials.ts
@@ -0,0 +1,24 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class VonageApi implements ICredentialType {
+	name = 'vonageApi';
+	displayName = 'Vonage API';
+	documentationUrl = 'vonage';
+	properties = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'API Secret',
+			name: 'apiSecret',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/WekanApi.credentials.ts b/packages/nodes-base/credentials/WekanApi.credentials.ts
new file mode 100644
index 000000000..0642c99c0
--- /dev/null
+++ b/packages/nodes-base/credentials/WekanApi.credentials.ts
@@ -0,0 +1,31 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class WekanApi implements ICredentialType {
+	name = 'wekanApi';
+	displayName = 'Wekan API';
+	documentationUrl = 'wekan';
+	properties = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+			placeholder: 'https://wekan.yourdomain.com',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/WufooApi.credentials.ts b/packages/nodes-base/credentials/WufooApi.credentials.ts
new file mode 100644
index 000000000..ae31ecbf7
--- /dev/null
+++ b/packages/nodes-base/credentials/WufooApi.credentials.ts
@@ -0,0 +1,24 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class WufooApi implements ICredentialType {
+	name = 'wufooApi';
+	displayName = 'Wufoo API';
+	documentationUrl = 'wufoo';
+	properties = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Subdomain',
+			name: 'subdomain',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/ZoomApi.credentials.ts b/packages/nodes-base/credentials/ZoomApi.credentials.ts
index b90881289..9cef54158 100644
--- a/packages/nodes-base/credentials/ZoomApi.credentials.ts
+++ b/packages/nodes-base/credentials/ZoomApi.credentials.ts
@@ -9,7 +9,7 @@ export class ZoomApi implements ICredentialType {
 			displayName: 'JWT Token',
 			name: 'accessToken',
 			type: 'string' as NodePropertyTypes,
-			default: ''
-		}
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/ZoomOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ZoomOAuth2Api.credentials.ts
index 6a7ac622a..49e708448 100644
--- a/packages/nodes-base/credentials/ZoomOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/ZoomOAuth2Api.credentials.ts
@@ -13,31 +13,31 @@ export class ZoomOAuth2Api implements ICredentialType {
 			displayName: 'Authorization URL',
 			name: 'authUrl',
 			type: 'hidden' as NodePropertyTypes,
-			default: 'https://zoom.us/oauth/authorize'
+			default: 'https://zoom.us/oauth/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
 			type: 'hidden' as NodePropertyTypes,
-			default: 'https://zoom.us/oauth/token'
+			default: 'https://zoom.us/oauth/token',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden' as NodePropertyTypes,
-			default: ''
+			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
 			type: 'hidden' as NodePropertyTypes,
-			default: ''
+			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
 			type: 'hidden' as NodePropertyTypes,
-			default: 'header'
-		}
+			default: 'header',
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/ActiveCampaign/AccountContactDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/AccountContactDescription.ts
new file mode 100644
index 000000000..5a88c8a4e
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/AccountContactDescription.ts
@@ -0,0 +1,175 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const accountContactOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'accountContact',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an association',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an association',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an association',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const accountContactFields = [
+	// ----------------------------------
+	//         accountContact:create
+	// ----------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'account',
+		type: 'number',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'accountContact',
+				],
+			},
+		},
+		description: 'Account ID',
+	},
+	{
+		displayName: 'Contact ID',
+		name: 'contact',
+		type: 'number',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'accountContact',
+				],
+			},
+		},
+		description: 'Contact ID',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'accountContact',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Job title',
+				name: 'jobTitle',
+				type: 'string',
+				default: '',
+				description: 'Job Title of the contact at the account',
+			},
+		],
+	},
+	// ----------------------------------
+	//         accountContact:delete
+	// ----------------------------------
+	{
+		displayName: 'Account Contact ID',
+		name: 'accountContactId',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'accountContact',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'ID of the account contact to delete.',
+	},
+	// ----------------------------------
+	//         accountContact:update
+	// ----------------------------------
+	{
+		displayName: 'Account Contact ID',
+		name: 'accountContactId',
+		type: 'number',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'accountContact',
+				],
+			},
+		},
+		description: 'Account ID',
+	},
+
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		description: 'The fields to update.',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'accountContact',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Job title',
+				name: 'jobTitle',
+				type: 'string',
+				default: '',
+				description: 'Job Title of the contact at the account',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/AccountDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/AccountDescription.ts
new file mode 100644
index 000000000..bc91bcef0
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/AccountDescription.ts
@@ -0,0 +1,302 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	activeCampaignDefaultGetAllProperties,
+} from './GenericFunctions';
+
+export const accountOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an account',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an account',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get data of an account',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get data of all accounts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an account',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const accountFields = [
+	// ----------------------------------
+	//         contact:create
+	// ----------------------------------
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'account',
+				],
+			},
+		},
+		description: 'Account\'s name.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'account',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Account URL',
+				name: 'accountUrl',
+				type: 'string',
+				default: '',
+				description: `Account's website`,
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				placeholder: 'Add Custom Fields',
+				description: 'Adds a custom fields to set also values which have not been predefined.',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'property',
+						displayName: 'Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'customFieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getAccountCustomFields',
+								},
+								default: '',
+								description: 'ID of the field to set.',
+							},
+							{
+								displayName: 'Field Value',
+								name: 'fieldValue',
+								type: 'string',
+								default: '',
+								description: 'Value of the field to set.',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+
+	// ----------------------------------
+	//         contact:update
+	// ----------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'account',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'ID of the account to update.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		description: 'The fields to update.',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'account',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'Account\'s name.',
+			},
+			{
+				displayName: 'Account URL',
+				name: 'accountUrl',
+				type: 'string',
+				default: '',
+				description: 'Account\'s website',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				placeholder: 'Add Fields',
+				description: 'Adds a custom fields to set also values which have not been predefined.',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'property',
+						displayName: 'Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'customFieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getAccountCustomFields',
+								},
+								default: '',
+								description: 'ID of the field to set.',
+							},
+							{
+								displayName: 'Field Value',
+								name: 'fieldValue',
+								type: 'string',
+								default: '',
+								description: 'Value of the field to set.',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	// ----------------------------------
+	//         account:delete
+	// ----------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'account',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'ID of the account to delete.',
+	},
+	// ----------------------------------
+	//         account:get
+	// ----------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'account',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'ID of the account to get.',
+	},
+	// ----------------------------------
+	//         account:getAll
+	// ----------------------------------
+	...activeCampaignDefaultGetAllProperties('account', 'getAll'),
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'account',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Search',
+				name: 'search',
+				type: 'string',
+				default: '',
+				description: 'Search by name',
+			},
+		],
+	},
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index a7b47f6e2..752cb4646 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -4,9 +4,11 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
+	ILoadOptionsFunctions,
 	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -16,41 +18,60 @@ import {
 } from './GenericFunctions';
 
 import {
+	contactFields,
 	contactOperations,
-	contactFields
 } from './ContactDescription';
 
 import {
+	dealFields,
 	dealOperations,
-	dealFields
 } from './DealDescription';
 
 import {
+	ecomOrderFields,
 	ecomOrderOperations,
-	ecomOrderFields
 } from './EcomOrderDescription';
 
 import {
+	ecomCustomerFields,
 	ecomCustomerOperations,
-	ecomCustomerFields
 } from './EcomCustomerDescription';
 
 import {
+	ecomOrderProductsFields,
 	ecomOrderProductsOperations,
-	ecomOrderProductsFields
 } from './EcomOrderProductsDescription';
 
 import {
+	connectionFields,
 	connectionOperations,
-	connectionFields
 } from './ConnectionDescription';
 
+import {
+	accountFields,
+	accountOperations
+} from "./AccountDescription";
+
+import {
+	tagFields,
+	tagOperations
+} from "./TagDescription";
+
+import {
+	accountContactFields,
+	accountContactOperations
+} from "./AccountContactDescription";
+
+import {
+	contactTagFields,
+	contactTagOperations,
+} from "./ContactTagDescription";
+
 interface CustomProperty {
 	name: string;
 	value: string;
 }
 
-
 /**
  * Add the additional fields to the body
  *
@@ -63,6 +84,10 @@ function addAdditionalFields(body: IDataObject, additionalFields: IDataObject) {
 			for (const customProperty of (additionalFields.customProperties as IDataObject)!.property! as CustomProperty[]) {
 				body[customProperty.name] = customProperty.value;
 			}
+		} else if (key === 'fieldValues' && (additionalFields.fieldValues as IDataObject).property !== undefined) {
+			body.fieldValues = (additionalFields.fieldValues as IDataObject).property;
+		} else if (key === 'fields' && (additionalFields.fields as IDataObject).property !== undefined) {
+			body.fields = (additionalFields.fields as IDataObject).property;
 		} else {
 			body[key] = additionalFields[key];
 		}
@@ -88,7 +113,7 @@ export class ActiveCampaign implements INodeType {
 			{
 				name: 'activeCampaignApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			// ----------------------------------
@@ -99,17 +124,29 @@ export class ActiveCampaign implements INodeType {
 				name: 'resource',
 				type: 'options',
 				options: [
+					{
+						name: 'Account',
+						value: 'account',
+					},
+					{
+						name: 'Account Contact',
+						value: 'accountContact',
+					},
 					{
 						name: 'Contact',
 						value: 'contact',
 					},
 					{
-						name: 'Deal',
-						value: 'deal',
+						name: 'Contact Tag',
+						value: 'contactTag',
 					},
 					{
 						name: 'Connection',
-						value: 'connection'
+						value: 'connection',
+					},
+					{
+						name: 'Deal',
+						value: 'deal',
 					},
 					{
 						name: 'E-commerce Order',
@@ -121,8 +158,12 @@ export class ActiveCampaign implements INodeType {
 					},
 					{
 						name: 'E-commerce Order Products',
-						value: 'ecommerceOrderProducts'
-					}
+						value: 'ecommerceOrderProducts',
+					},
+					{
+						name: 'Tag',
+						value: 'tag',
+					},
 				],
 				default: 'contact',
 				description: 'The resource to operate on.',
@@ -131,7 +172,11 @@ export class ActiveCampaign implements INodeType {
 			// ----------------------------------
 			//         operations
 			// ----------------------------------
+			...accountOperations,
 			...contactOperations,
+			...accountContactOperations,
+			...contactTagOperations,
+			...tagOperations,
 			...dealOperations,
 			...connectionOperations,
 			...ecomOrderOperations,
@@ -141,6 +186,26 @@ export class ActiveCampaign implements INodeType {
 			// ----------------------------------
 			//         fields
 			// ----------------------------------
+			// ----------------------------------
+			//         tag
+			// ----------------------------------
+			...tagFields,
+
+			// ----------------------------------
+			//         tag
+			// ----------------------------------
+			...contactTagFields,
+
+			// ----------------------------------
+			//         account
+			// ----------------------------------
+			...accountFields,
+
+			// ----------------------------------
+			//         account
+			// ----------------------------------
+			...accountContactFields,
+
 			// ----------------------------------
 			//         contact
 			// ----------------------------------
@@ -174,6 +239,40 @@ export class ActiveCampaign implements INodeType {
 		],
 	};
 
+	methods = {
+		loadOptions: {
+			// Get all the available custom fields to display them to user so that he can
+			// select them easily
+			async getContactCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { fields } = await activeCampaignApiRequest.call(this, 'GET', '/api/3/fields', {});
+				for (const field of fields) {
+					const fieldName = field.title;
+					const fieldId = field.id;
+					returnData.push({
+						name: fieldName,
+						value: fieldId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the available custom fields to display them to user so that he can
+			// select them easily
+			async getAccountCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { accountCustomFieldMeta: fields } = await activeCampaignApiRequest.call(this, 'GET', '/api/3/accountCustomFieldMeta', {});
+				for (const field of fields) {
+					const fieldName = field.fieldLabel;
+					const fieldId = field.id;
+					returnData.push({
+						name: fieldName,
+						value: fieldId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
@@ -254,11 +353,24 @@ export class ActiveCampaign implements INodeType {
 					requestMethod = 'GET';
 
 					returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const simple = this.getNodeParameter('simple', i, true) as boolean;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
 					if (returnAll === false) {
 						qs.limit = this.getNodeParameter('limit', i) as number;
 					}
 
-					dataKey = 'contacts';
+					Object.assign(qs, additionalFields);
+
+					if (qs.orderBy) {
+						qs[qs.orderBy as string] = true;
+						delete qs.orderBy;
+					}
+
+					if (simple === true) {
+						dataKey = 'contacts';
+					}
+
 					endpoint = `/api/3/contacts`;
 
 				} else if (operation === 'update') {
@@ -278,6 +390,246 @@ export class ActiveCampaign implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 					addAdditionalFields(body.contact as IDataObject, updateFields);
 
+				} else {
+					throw new Error(`The operation "${operation}" is not known`);
+				}
+			} else if (resource === 'account') {
+				if (operation === 'create') {
+					// ----------------------------------
+					//         account:create
+					// ----------------------------------
+
+					requestMethod = 'POST';
+
+					endpoint = '/api/3/accounts';
+
+					dataKey = 'account';
+
+					body.account = {
+						name: this.getNodeParameter('name', i) as string,
+					} as IDataObject;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					addAdditionalFields(body.account as IDataObject, additionalFields);
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         account:delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const accountId = this.getNodeParameter('accountId', i) as number;
+					endpoint = `/api/3/accounts/${accountId}`;
+
+				} else if (operation === 'get') {
+					// ----------------------------------
+					//         account:get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const accountId = this.getNodeParameter('accountId', i) as number;
+					endpoint = `/api/3/accounts/${accountId}`;
+
+				} else if (operation === 'getAll') {
+					// ----------------------------------
+					//         account:getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const simple = this.getNodeParameter('simple', i, true) as boolean;
+					returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					if (returnAll === false) {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+					}
+
+					if (simple === true) {
+						dataKey = 'accounts';
+					}
+
+					endpoint = `/api/3/accounts`;
+
+					const filters = this.getNodeParameter('filters', i) as IDataObject;
+					Object.assign(qs, filters);
+
+				} else if (operation === 'update') {
+					// ----------------------------------
+					//         account:update
+					// ----------------------------------
+
+					requestMethod = 'PUT';
+
+					const accountId = this.getNodeParameter('accountId', i) as number;
+					endpoint = `/api/3/accounts/${accountId}`;
+
+					dataKey = 'account';
+
+					body.account = {} as IDataObject;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					addAdditionalFields(body.account as IDataObject, updateFields);
+
+				} else {
+					throw new Error(`The operation "${operation}" is not known`);
+				}
+			} else if (resource === 'accountContact') {
+				if (operation === 'create') {
+					// ----------------------------------
+					//         account:create
+					// ----------------------------------
+
+					requestMethod = 'POST';
+
+					endpoint = '/api/3/accountContacts';
+
+					dataKey = 'accountContact';
+
+					body.accountContact = {
+						contact: this.getNodeParameter('contact', i) as string,
+						account: this.getNodeParameter('account', i) as string,
+					} as IDataObject;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					addAdditionalFields(body.account as IDataObject, additionalFields);
+
+				} else if (operation === 'update') {
+					// ----------------------------------
+					//         accountContact:update
+					// ----------------------------------
+
+					requestMethod = 'PUT';
+
+					const accountContactId = this.getNodeParameter('accountContactId', i) as number;
+					endpoint = `/api/3/accountContacts/${accountContactId}`;
+
+					dataKey = 'accountContact';
+
+					body.accountContact = {} as IDataObject;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					addAdditionalFields(body.accountContact as IDataObject, updateFields);
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         accountContact:delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const accountContactId = this.getNodeParameter('accountContactId', i) as number;
+					endpoint = `/api/3/accountContacts/${accountContactId}`;
+
+				} else {
+					throw new Error(`The operation "${operation}" is not known`);
+				}
+			} else if (resource === 'contactTag') {
+				if (operation === 'add') {
+					// ----------------------------------
+					//         contactTag:add
+					// ----------------------------------
+
+					requestMethod = 'POST';
+
+					endpoint = '/api/3/contactTags';
+
+					dataKey = 'contactTag';
+
+					body.contactTag = {
+						contact: this.getNodeParameter('contactId', i) as string,
+						tag: this.getNodeParameter('tagId', i) as string,
+					} as IDataObject;
+
+				} else if (operation === 'remove') {
+					// ----------------------------------
+					//         contactTag:remove
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const contactTagId = this.getNodeParameter('contactTagId', i) as number;
+					endpoint = `/api/3/contactTags/${contactTagId}`;
+
+				} else {
+					throw new Error(`The operation "${operation}" is not known`);
+				}
+			} else if (resource === 'tag') {
+				if (operation === 'create') {
+					// ----------------------------------
+					//         tag:create
+					// ----------------------------------
+
+					requestMethod = 'POST';
+
+					endpoint = '/api/3/tags';
+
+					dataKey = 'tag';
+
+					body.tag = {
+						tag: this.getNodeParameter('name', i) as string,
+						tagType: this.getNodeParameter('tagType', i) as string,
+					} as IDataObject;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					addAdditionalFields(body.tag as IDataObject, additionalFields);
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         tag:delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const tagId = this.getNodeParameter('tagId', i) as number;
+					endpoint = `/api/3/tags/${tagId}`;
+
+				} else if (operation === 'get') {
+					// ----------------------------------
+					//         tag:get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const tagId = this.getNodeParameter('tagId', i) as number;
+					endpoint = `/api/3/tags/${tagId}`;
+
+				} else if (operation === 'getAll') {
+					// ----------------------------------
+					//         tags:getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const simple = this.getNodeParameter('simple', i, true) as boolean;
+					returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					if (returnAll === false) {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+					}
+
+					if (simple === true) {
+						dataKey = 'tags';
+					}
+
+					endpoint = `/api/3/tags`;
+
+				} else if (operation === 'update') {
+					// ----------------------------------
+					//         tags:update
+					// ----------------------------------
+
+					requestMethod = 'PUT';
+
+					const tagId = this.getNodeParameter('tagId', i) as number;
+					endpoint = `/api/3/tags/${tagId}`;
+
+					dataKey = 'tag';
+
+					body.tag = {} as IDataObject;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					addAdditionalFields(body.tag as IDataObject, updateFields);
+
 				} else {
 					throw new Error(`The operation "${operation}" is not known`);
 				}
@@ -358,11 +710,16 @@ export class ActiveCampaign implements INodeType {
 
 					requestMethod = 'GET';
 
+					const simple = this.getNodeParameter('simple', i, true) as boolean;
 					returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					if (returnAll === false) {
 						qs.limit = this.getNodeParameter('limit', i) as number;
 					}
 
+					if (simple === true) {
+						dataKey = 'deals';
+					}
+
 					endpoint = `/api/3/deals`;
 
 				} else if (operation === 'createNote') {
@@ -455,11 +812,16 @@ export class ActiveCampaign implements INodeType {
 
 					requestMethod = 'GET';
 
+					const simple = this.getNodeParameter('simple', i, true) as boolean;
 					returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					if (returnAll === false) {
 						qs.limit = this.getNodeParameter('limit', i) as number;
 					}
 
+					if (simple === true) {
+						dataKey = 'connections';
+					}
+
 					endpoint = `/api/3/connections`;
 
 				} else {
@@ -548,11 +910,16 @@ export class ActiveCampaign implements INodeType {
 
 					requestMethod = 'GET';
 
+					const simple = this.getNodeParameter('simple', i, true) as boolean;
 					returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					if (returnAll === false) {
 						qs.limit = this.getNodeParameter('limit', i) as number;
 					}
 
+					if (simple === true) {
+						dataKey = 'ecomOrders';
+					}
+
 					endpoint = `/api/3/ecomOrders`;
 
 				} else {
@@ -633,11 +1000,16 @@ export class ActiveCampaign implements INodeType {
 
 					requestMethod = 'GET';
 
+					const simple = this.getNodeParameter('simple', i, true) as boolean;
 					returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					if (returnAll === false) {
 						qs.limit = this.getNodeParameter('limit', i) as number;
 					}
 
+					if (simple === true) {
+						dataKey = 'ecomCustomers';
+					}
+
 					endpoint = `/api/3/ecomCustomers`;
 
 				} else {
@@ -662,6 +1034,8 @@ export class ActiveCampaign implements INodeType {
 
 					requestMethod = 'GET';
 
+					//dataKey = 'ecomOrderProducts';
+
 					const orderId = this.getNodeParameter('orderId', i) as number;
 					endpoint = `/api/3/ecomOrders/${orderId}/orderProducts`;
 
@@ -672,11 +1046,16 @@ export class ActiveCampaign implements INodeType {
 
 					requestMethod = 'GET';
 
+					const simple = this.getNodeParameter('simple', i, true) as boolean;
 					returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					if (returnAll === false) {
 						qs.limit = this.getNodeParameter('limit', i) as number;
 					}
 
+					if (simple === true) {
+						dataKey = 'ecomOrderProducts';
+					}
+
 					endpoint = `/api/3/ecomOrderProducts`;
 
 				} else {
@@ -703,4 +1082,4 @@ export class ActiveCampaign implements INodeType {
 
 		return [this.helpers.returnJsonArray(returnData)];
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
index b76ed9fd3..aad65ee1b 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
@@ -6,9 +6,9 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	INodePropertyOptions,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -19,12 +19,12 @@ import {
 
 export class ActiveCampaignTrigger implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'Active Campaign Trigger',
+		displayName: 'ActiveCampaign Trigger',
 		name: 'activeCampaignTrigger',
 		icon: 'file:activeCampaign.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Handle Active Campaign events via webhooks',
+		description: 'Handle ActiveCampaign events via webhooks',
 		defaults: {
 			name: 'ActiveCampaign Trigger',
 			color: '#356ae6',
@@ -35,7 +35,7 @@ export class ActiveCampaignTrigger implements INodeType {
 			{
 				name: 'activeCampaignApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
@@ -103,7 +103,7 @@ export class ActiveCampaignTrigger implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 	// @ts-ignore
 	webhookMethods = {
@@ -132,7 +132,7 @@ export class ActiveCampaignTrigger implements INodeType {
 						url: webhookUrl,
 						events,
 						sources,
-					}
+					},
 				};
 				const { webhook } = await activeCampaignApiRequest.call(this, 'POST', '/api/3/webhooks', body);
 				webhookData.webhookId = webhook.id;
@@ -142,7 +142,7 @@ export class ActiveCampaignTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 				try {
 					await activeCampaignApiRequest.call(this, 'DELETE', `/api/3/webhooks/${webhookData.webhookId}`, {});
-				} catch(error) {
+				} catch (error) {
 					return false;
 				}
 				delete webhookData.webhookId;
@@ -155,7 +155,7 @@ export class ActiveCampaignTrigger implements INodeType {
 		const req = this.getRequestObject();
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ConnectionDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/ConnectionDescription.ts
index e962e4041..24241d851 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ConnectionDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ConnectionDescription.ts
@@ -1,4 +1,10 @@
-import { INodeProperties } from "n8n-workflow";
+import {
+	INodeProperties,
+} from "n8n-workflow";
+
+import {
+	activeCampaignDefaultGetAllProperties,
+} from "./GenericFunctions";
 
 export const connectionOperations = [
 	{
@@ -228,7 +234,7 @@ export const connectionFields = [
 				default: 1,
 				description: 'The status of a sync triggered on the connection (0 = sync stopped; 1 = sync running).',
 			},
-		]
+		],
 	},
 
 	// ----------------------------------
@@ -278,45 +284,6 @@ export const connectionFields = [
 	// ----------------------------------
 	//         connection:getAll
 	// ----------------------------------
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'connection',
-				],
-			},
-		},
-		default: false,
-		description: 'If all results should be returned or only up to a given limit.',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'connection',
-				],
-				returnAll: [
-					false,
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'How many results to return.',
-	},
+	...activeCampaignDefaultGetAllProperties('connection', 'getAll'),
+
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ContactDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/ContactDescription.ts
index 25b42b367..e6f31d932 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ContactDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ContactDescription.ts
@@ -1,4 +1,10 @@
-import { INodeProperties } from "n8n-workflow";
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	activeCampaignDefaultGetAllProperties,
+} from './GenericFunctions';
 
 export const contactOperations = [
 	{
@@ -100,6 +106,42 @@ export const contactFields = [
 		},
 		default: {},
 		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'fieldValues',
+				placeholder: 'Add Custom Fields',
+				description: 'Adds a custom fields to set also values which have not been predefined.',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'property',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'field',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getContactCustomFields',
+								},
+								default: '',
+								description: 'ID of the field to set.',
+							},
+							{
+								displayName: 'Field Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the field to set.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'First Name',
 				name: 'firstName',
@@ -121,39 +163,6 @@ export const contactFields = [
 				default: '',
 				description: 'Phone number of the contact.',
 			},
-			{
-				displayName: 'Custom Properties',
-				name: 'customProperties',
-				placeholder: 'Add Custom Property',
-				description: 'Adds a custom property to set also values which have not been predefined.',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'property',
-						displayName: 'Property',
-						values: [
-							{
-								displayName: 'Property Name',
-								name: 'name',
-								type: 'string',
-								default: '',
-								description: 'Name of the property to set.',
-							},
-							{
-								displayName: 'Property Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'Value of the property to set.',
-							},
-						]
-					},
-				],
-			},
 		],
 	},
 
@@ -196,6 +205,42 @@ export const contactFields = [
 		},
 		default: {},
 		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'fieldValues',
+				placeholder: 'Add Custom Fields',
+				description: 'Adds a custom fields to set also values which have not been predefined.',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'property',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'field',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getContactCustomFields',
+								},
+								default: '',
+								description: 'ID of the field to set.',
+							},
+							{
+								displayName: 'Field Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the field to set.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Email',
 				name: 'email',
@@ -224,39 +269,6 @@ export const contactFields = [
 				default: '',
 				description: 'Phone number of the contact.',
 			},
-			{
-				displayName: 'Custom Properties',
-				name: 'customProperties',
-				placeholder: 'Add Custom Property',
-				description: 'Adds a custom property to set also values which have not been predefined.',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'property',
-						displayName: 'Property',
-						values: [
-							{
-								displayName: 'Property Name',
-								name: 'name',
-								type: 'string',
-								default: '',
-								description: 'Name of the property to set.',
-							},
-							{
-								displayName: 'Property Value',
-								name: 'value',
-								type: 'string',
-								default: '',
-								description: 'Value of the property to set.',
-							},
-						]
-					},
-				],
-			},
 		],
 	},
 
@@ -307,10 +319,12 @@ export const contactFields = [
 	// ----------------------------------
 	//         contact:getAll
 	// ----------------------------------
+	...activeCampaignDefaultGetAllProperties('contact', 'getAll'),
 	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
 		displayOptions: {
 			show: {
 				operation: [
@@ -321,31 +335,179 @@ export const contactFields = [
 				],
 			},
 		},
-		default: false,
-		description: 'If all results should be returned or only up to a given limit.',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'contact',
-				],
-				returnAll: [
-					false,
-				],
+		default: {},
+		options: [
+			{
+				displayName: 'Datetime',
+				name: 'datetime',
+				type: 'dateTime',
+				default: '',
+				description: 'Contacts created on the specified date',
 			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'How many results to return.',
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				description: 'Email address of the contact you want to get',
+			},
+			{
+				displayName: 'Email Like',
+				name: 'email_like',
+				type: 'string',
+				default: '',
+				description: 'Filter contacts that contain the given value in the email address',
+			},
+			{
+				displayName: 'Exclude',
+				name: 'exclude',
+				type: 'string',
+				default: '',
+				description: 'Exclude from the response the contact with the given ID',
+			},
+			{
+				displayName: 'Form ID',
+				name: 'formid',
+				type: 'string',
+				default: '',
+				description: 'Filter contacts associated with the given form',
+			},
+			{
+				displayName: 'List ID',
+				name: 'listid',
+				type: 'string',
+				default: '',
+				description: 'Filter contacts associated with the given list',
+			},
+			{
+				displayName: 'Search',
+				name: 'search',
+				type: 'string',
+				default: '',
+				description: 'Filter contacts that match the given value in the contact names, organization, phone or email',
+			},
+			{
+				displayName: 'Segment ID',
+				name: 'segmentid',
+				type: 'string',
+				default: '',
+				description: 'Return only contacts that match a list segment',
+			},
+			{
+				displayName: 'Series ID',
+				name: 'seriesid',
+				type: 'string',
+				default: '',
+				description: 'Filter contacts associated with the given automation',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Any',
+						value: -1,
+					},
+					{
+						name: 'Unconfirmed',
+						value: 0,
+					},
+					{
+						name: 'Active',
+						value: 1,
+					},
+					{
+						name: 'Unsubscribed',
+						value: 2,
+					},
+					{
+						name: 'Bounced',
+						value: 3,
+					},
+				],
+				default: '',
+			},
+			{
+				displayName: 'Tag ID',
+				name: 'tagid',
+				type: 'string',
+				default: '',
+				description: 'Filter contacts associated with the given tag',
+			},
+			{
+				displayName: 'Created Before',
+				name: 'filters[created_before]',
+				type: 'dateTime',
+				default: '',
+				description: 'Filter contacts that were created prior to this date',
+			},
+			{
+				displayName: 'Created After',
+				name: 'filters[created_after]',
+				type: 'dateTime',
+				default: '',
+				description: 'Filter contacts that were created after this date',
+			},
+			{
+				displayName: 'Updated Before',
+				name: 'filters[updated_before]',
+				type: 'dateTime',
+				default: '',
+				description: 'Filter contacts that were updated before this date',
+			},
+			{
+				displayName: 'Updated After',
+				name: 'filters[updated_after]',
+				type: 'dateTime',
+				default: '',
+				description: 'Filter contacts that were updated after this date',
+			},
+			{
+				displayName: 'Wait ID',
+				name: 'waitid',
+				type: 'string',
+				default: '',
+				description: 'Filter by contacts in the wait queue of an automation block',
+			},
+			{
+				displayName: 'Order By',
+				name: 'orderBy',
+				type: 'options',
+				options: [
+					{
+						name: 'Creation Date',
+						value: 'orders[cdate]',
+						description: 'Order contacts by creation date',
+					},
+					{
+						name: 'Email',
+						value: 'orders[email]',
+						description: 'Order contacts by email',
+					},
+					{
+						name: 'First Name',
+						value: 'orders[first_name]',
+						description: 'Order contacts by first name',
+					},
+					{
+						name: 'Last Name',
+						value: 'orders[last_name]',
+						description: 'Order contacts by last name',
+					},
+					{
+						name: 'Name',
+						value: 'orders[name]',
+						description: 'Order contacts by full name',
+					},
+					{
+						name: 'Score',
+						value: 'orders[score]',
+						description: 'Order contacts by score',
+					},
+				],
+				default: '',
+			},
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ContactTagDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/ContactTagDescription.ts
new file mode 100644
index 000000000..59e823d9a
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/ContactTagDescription.ts
@@ -0,0 +1,95 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const contactTagOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'contactTag',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add a tag to a contact',
+			},
+			{
+				name: 'Remove',
+				value: 'remove',
+				description: 'Remove a tag from a contact',
+			},
+		],
+		default: 'add',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const contactTagFields = [
+	// ----------------------------------
+	//         contactTag:add
+	// ----------------------------------
+	{
+		displayName: 'Tag ID',
+		name: 'tagId',
+		type: 'number',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'add',
+				],
+				resource: [
+					'contactTag',
+				],
+			},
+		},
+		description: 'Tag ID',
+	},
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		type: 'number',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'add',
+				],
+				resource: [
+					'contactTag',
+				],
+			},
+		},
+		description: 'Contact ID',
+	},
+	// ----------------------------------
+	//         contactTag:delete
+	// ----------------------------------
+	{
+		displayName: 'Contact Tag ID',
+		name: 'contactTagId',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'remove',
+				],
+				resource: [
+					'contactTag',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'ID of the contact tag to delete.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
index 9d61c4339..fded580d8 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
@@ -1,6 +1,14 @@
-import { INodeProperties } from "n8n-workflow";
+import {
+	INodeProperties,
+} from "n8n-workflow";
 
-import { allCurrencies } from './currencies';
+import {
+	allCurrencies,
+} from './currencies';
+
+import {
+	activeCampaignDefaultGetAllProperties,
+} from "./GenericFunctions";
 
 export const dealOperations = [
 	{
@@ -224,7 +232,7 @@ export const dealFields = [
 				default: 0,
 				description: 'The status of the deal',
 			},
-		]
+		],
 	},
 
 	// ----------------------------------
@@ -337,7 +345,7 @@ export const dealFields = [
 				default: 0,
 				description: 'The status of the deal',
 			},
-		]
+		],
 	},
 
 	// ----------------------------------
@@ -387,47 +395,7 @@ export const dealFields = [
 	// ----------------------------------
 	//         deal:getAll
 	// ----------------------------------
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'deal',
-				],
-			},
-		},
-		default: false,
-		description: 'If all results should be returned or only up to a given limit.',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'deal',
-				],
-				returnAll: [
-					false,
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'How many results to return.',
-	},
+	...activeCampaignDefaultGetAllProperties('deal', 'getAll'),
 
 	// ----------------------------------
 	//         dealNote:create
diff --git a/packages/nodes-base/nodes/ActiveCampaign/EcomCustomerDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/EcomCustomerDescription.ts
index 2b8b0d33c..009307441 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/EcomCustomerDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/EcomCustomerDescription.ts
@@ -1,4 +1,10 @@
-import { INodeProperties } from "n8n-workflow";
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	activeCampaignDefaultGetAllProperties,
+} from './GenericFunctions';
 
 export const ecomCustomerOperations = [
 	{
@@ -246,45 +252,5 @@ export const ecomCustomerFields = [
 	// ----------------------------------
 	//         ecommerceCustomer:getAll
 	// ----------------------------------
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'ecommerceCustomer',
-				],
-			},
-		},
-		default: false,
-		description: 'If all results should be returned or only up to a given limit.',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'ecommerceCustomer',
-				],
-				returnAll: [
-					false,
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'How many results to return.',
-	},
+	...activeCampaignDefaultGetAllProperties('ecommerceCustomer', 'getAll'),
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
index 752b551ad..e8de36b25 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
@@ -1,6 +1,14 @@
-import { INodeProperties } from "n8n-workflow";
+import {
+	INodeProperties,
+} from "n8n-workflow";
 
-import { allCurrencies } from './currencies';
+import {
+	allCurrencies,
+} from './currencies';
+
+import {
+	activeCampaignDefaultGetAllProperties,
+} from './GenericFunctions';
 
 export const ecomOrderOperations = [
 	{
@@ -239,7 +247,7 @@ export const ecomOrderFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'create'
+					'create',
 				],
 				resource: [
 					'ecommerceOrder',
@@ -383,7 +391,7 @@ export const ecomOrderFields = [
 				description: 'The order number. This can be different than the externalid.',
 			},
 
-		]
+		],
 	},
 
 	// ----------------------------------
@@ -624,7 +632,7 @@ export const ecomOrderFields = [
 				],
 			},
 
-		]
+		],
 	},
 
 	// ----------------------------------
@@ -672,45 +680,6 @@ export const ecomOrderFields = [
 	// ----------------------------------
 	//         ecommerceOrder:getAll
 	// ----------------------------------
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'ecommerceOrder',
-				],
-			},
-		},
-		default: false,
-		description: 'If all results should be returned or only up to a given limit.',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'ecommerceOrder',
-				],
-				returnAll: [
-					false,
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'How many results to return.',
-	},
+	...activeCampaignDefaultGetAllProperties('ecommerceOrder', 'getAll'),
+
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/EcomOrderProductsDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/EcomOrderProductsDescription.ts
index 1f53c47f0..5613bff04 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/EcomOrderProductsDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/EcomOrderProductsDescription.ts
@@ -1,4 +1,10 @@
-import { INodeProperties } from "n8n-workflow";
+import {
+	INodeProperties,
+} from "n8n-workflow";
+
+import {
+	activeCampaignDefaultGetAllProperties,
+} from './GenericFunctions';
 
 export const ecomOrderProductsOperations = [
 	{
@@ -80,45 +86,5 @@ export const ecomOrderProductsFields = [
 	// ----------------------------------
 	//         ecommerceOrderProducts:getAll
 	// ----------------------------------
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'ecommerceOrderProducts',
-				],
-			},
-		},
-		default: false,
-		description: 'If all results should be returned or only up to a given limit.',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'ecommerceOrderProducts',
-				],
-				returnAll: [
-					false,
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'How many results to return.',
-	},
-] as INodeProperties[];
\ No newline at end of file
+	...activeCampaignDefaultGetAllProperties('ecommerceOrderProducts', 'getAll'),
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
index 833e334b9..d5b7e7d1c 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
@@ -4,7 +4,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject, ILoadOptionsFunctions,
+	IDataObject, ILoadOptionsFunctions, INodeProperties,
 } from 'n8n-workflow';
 
 import { OptionsWithUri } from 'request';
@@ -42,7 +42,7 @@ export async function activeCampaignApiRequest(this: IHookFunctions | IExecuteFu
 		method,
 		qs: query,
 		uri: `${credentials.apiUrl}${endpoint}`,
-		json: true
+		json: true,
 	};
 
 	if (Object.keys(body).length !== 0) {
@@ -124,3 +124,67 @@ export async function activeCampaignApiRequestAllItems(this: IHookFunctions | IE
 
 	return returnData;
 }
+
+export function activeCampaignDefaultGetAllProperties(resource: string, operation: string): INodeProperties[] {
+	return [
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: [
+						operation,
+					],
+					resource: [
+						resource,
+					],
+				},
+			},
+			default: false,
+			description: 'If all results should be returned or only up to a given limit.',
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			displayOptions: {
+				show: {
+					operation: [
+						operation,
+					],
+					resource: [
+						resource,
+					],
+					returnAll: [
+						false,
+					],
+				},
+			},
+			typeOptions: {
+				minValue: 1,
+				maxValue: 500,
+			},
+			default: 100,
+			description: 'How many results to return.',
+		},
+		{
+			displayName: 'Simple',
+			name: 'simple',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: [
+						operation,
+					],
+					resource: [
+						resource,
+					],
+				},
+			},
+			default: true,
+			description: 'When set to true a simplify version of the response will be used else the raw data.',
+		},
+	];
+}
+
diff --git a/packages/nodes-base/nodes/ActiveCampaign/TagDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/TagDescription.ts
new file mode 100644
index 000000000..c619d1caa
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/TagDescription.ts
@@ -0,0 +1,232 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	activeCampaignDefaultGetAllProperties,
+} from './GenericFunctions';
+
+export const tagOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'tag',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a tag',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a tag',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get data of a tag',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get data of all tags',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a tag',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const tagFields = [
+	// ----------------------------------
+	//         contact:create
+	// ----------------------------------
+	{
+		displayName: 'Type',
+		name: 'tagType',
+		type: 'options',
+		default: 'contact',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Contact',
+				value: 'contact',
+				description: 'Tag contact',
+			},
+			{
+				name: 'Template',
+				value: 'template',
+				description: 'Tag template',
+			},
+		],
+		description: 'Tag-type of the new tag',
+	},
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		description: 'Name of the new tag',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Description of the new tag',
+			},
+		],
+	},
+	// ----------------------------------
+	//         tag:update
+	// ----------------------------------
+	{
+		displayName: 'Tag ID',
+		name: 'tagId',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'ID of the tag to update.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		description: 'The fields to update.',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Tag',
+				name: 'tag',
+				type: 'string',
+				default: '',
+				description: 'Name of the contact.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Description of the tag being updated',
+			},
+		],
+	},
+	// ----------------------------------
+	//         tag:delete
+	// ----------------------------------
+	{
+		displayName: 'Tag ID',
+		name: 'tagId',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'ID of the tag to delete.',
+	},
+	// ----------------------------------
+	//         contact:get
+	// ----------------------------------
+	{
+		displayName: 'Tag ID',
+		name: 'tagId',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'ID of the tag to get.',
+	},
+	// ----------------------------------
+	//         tag:getAll
+	// ----------------------------------
+	...activeCampaignDefaultGetAllProperties('tag', 'getAll'),
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ActiveCampaign/currencies.ts b/packages/nodes-base/nodes/ActiveCampaign/currencies.ts
index e979999ee..333c0f3dc 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/currencies.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/currencies.ts
@@ -169,5 +169,5 @@ export const allCurrencies = [
 	{ name: 'Yemeni Rial', value: 'yer' },
 	{ name: 'South African Rand', value: 'zar' },
 	{ name: 'Zambian Kwacha', value: 'zmw' },
-	{ name: 'Zimbabwean Dollar', value: 'zwl' }
+	{ name: 'Zimbabwean Dollar', value: 'zwl' },
 ];
diff --git a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
index 75ab74699..289f45221 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
diff --git a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
index c23c84ce6..bf13f1aef 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
@@ -20,7 +20,7 @@ export async function acuitySchedulingApiRequest(this: IHookFunctions | IExecute
 		qs,
 		body,
 		uri: uri ||`https://acuityscheduling.com/api/v1${resource}`,
-		json: true
+		json: true,
 	};
 
 	try {
diff --git a/packages/nodes-base/nodes/AcuityScheduling/acuityScheduling.png b/packages/nodes-base/nodes/AcuityScheduling/acuityScheduling.png
index e9ebcbae6..16f2cccbf 100644
Binary files a/packages/nodes-base/nodes/AcuityScheduling/acuityScheduling.png and b/packages/nodes-base/nodes/AcuityScheduling/acuityScheduling.png differ
diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.ts b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
index 972c2e7ec..7efbbe4cf 100644
--- a/packages/nodes-base/nodes/Affinity/Affinity.node.ts
+++ b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
@@ -4,10 +4,10 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
-	INodeTypeDescription,
 	INodeExecutionData,
-	INodeType,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	affinityApiRequest,
@@ -49,7 +49,7 @@ export class Affinity implements INodeType {
 			{
 				name: 'affinityApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
index 3d387e7b4..4d3ba70f1 100644
--- a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
+++ b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
@@ -4,10 +4,10 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
index 0c2f68061..1d3ca50db 100644
--- a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
@@ -1,9 +1,9 @@
 import { OptionsWithUri } from 'request';
 
 import {
+	BINARY_ENCODING,
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
-	BINARY_ENCODING
 } from 'n8n-core';
 
 import { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
@@ -29,7 +29,7 @@ export async function affinityApiRequest(this: IExecuteFunctions | IWebhookFunct
 		body,
 		qs: query,
 		uri: uri || `${endpoint}${resource}`,
-		json: true
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.body;
diff --git a/packages/nodes-base/nodes/Affinity/OrganizationDescription.ts b/packages/nodes-base/nodes/Affinity/OrganizationDescription.ts
index 8e8a72f2b..36d27ce9b 100644
--- a/packages/nodes-base/nodes/Affinity/OrganizationDescription.ts
+++ b/packages/nodes-base/nodes/Affinity/OrganizationDescription.ts
@@ -62,7 +62,7 @@ export const organizationFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'The name of the organization.',
@@ -80,7 +80,7 @@ export const organizationFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'The domain name of the organization.',
@@ -130,7 +130,7 @@ export const organizationFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the organization.',
@@ -176,7 +176,7 @@ export const organizationFields = [
 				default: [],
 				description: 'Persons that the new organization will be associated with.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 organization:get                           */
@@ -194,7 +194,7 @@ export const organizationFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the organization.',
@@ -223,7 +223,7 @@ export const organizationFields = [
 				default: false,
 				description: 'When true, interaction dates will be present on the returned resources.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 organization:getAll                        */
@@ -300,7 +300,7 @@ export const organizationFields = [
 				default: false,
 				description: 'When true, interaction dates will be present on the returned resources.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 organization:delete                        */
@@ -318,7 +318,7 @@ export const organizationFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the organization.',
diff --git a/packages/nodes-base/nodes/Affinity/PersonDescription.ts b/packages/nodes-base/nodes/Affinity/PersonDescription.ts
index 5cd2c97d2..99e493c78 100644
--- a/packages/nodes-base/nodes/Affinity/PersonDescription.ts
+++ b/packages/nodes-base/nodes/Affinity/PersonDescription.ts
@@ -62,7 +62,7 @@ export const personFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'The first name of the person.',
@@ -80,7 +80,7 @@ export const personFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'The last name of the person.',
@@ -130,7 +130,7 @@ export const personFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		placeholder: 'info@example.com',
@@ -152,7 +152,7 @@ export const personFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the person.',
@@ -198,7 +198,7 @@ export const personFields = [
 				default: [],
 				description: 'Organizations that the person is associated with.',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Emails',
@@ -216,7 +216,7 @@ export const personFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		placeholder: 'info@example.com',
@@ -238,7 +238,7 @@ export const personFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the person.',
@@ -267,7 +267,7 @@ export const personFields = [
 				default: false,
 				description: 'When true, interaction dates will be present on the returned resources.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 person:getAll                              */
@@ -344,7 +344,7 @@ export const personFields = [
 				default: false,
 				description: 'When true, interaction dates will be present on the returned resources.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 person:delete                              */
@@ -362,7 +362,7 @@ export const personFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the person.',
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
index d4411380f..a79e2c682 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
@@ -44,7 +44,7 @@ export class AgileCrm implements INodeType {
 			{
 				name: 'agileCrmApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			// Node properties which the user gets displayed and
@@ -56,15 +56,15 @@ export class AgileCrm implements INodeType {
 				options: [
 					{
 						name: 'Company',
-						value: 'company'
+						value: 'company',
 					},
 					{
 						name: 'Contact',
-						value: 'contact'
+						value: 'contact',
 					},
 					{
 						name: 'Deal',
-						value: 'deal'
+						value: 'deal',
 					},
 				],
 				default: 'contact',
@@ -80,7 +80,7 @@ export class AgileCrm implements INodeType {
 
 			// DEAL
 			...dealOperations,
-			...dealFields
+			...dealFields,
 		],
 
 	};
@@ -174,28 +174,28 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'first_name',
-									value: additionalFields.firstName as string
+									value: additionalFields.firstName as string,
 								} as IDataObject);
 							}
 							if (additionalFields.lastName) {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'last_name',
-									value: additionalFields.lastName as string
+									value: additionalFields.lastName as string,
 								} as IDataObject);
 							}
 							if (additionalFields.company) {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'company',
-									value: additionalFields.company as string
+									value: additionalFields.company as string,
 								} as IDataObject);
 							}
 							if (additionalFields.title) {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'title',
-									value: additionalFields.title as string
+									value: additionalFields.title as string,
 								} as IDataObject);
 							}
 							if (additionalFields.emailOptions) {
@@ -205,7 +205,7 @@ export class AgileCrm implements INodeType {
 										type: 'SYSTEM',
 										subtype: property.subtype as string,
 										name: 'email',
-										value: property.email as string
+										value: property.email as string,
 									} as IDataObject);
 								});
 							}
@@ -216,7 +216,7 @@ export class AgileCrm implements INodeType {
 										type: 'SYSTEM',
 										subtype: property.subtype as string,
 										name: 'address',
-										value: property.address as string
+										value: property.address as string,
 									} as IDataObject);
 								});
 							}
@@ -228,7 +228,7 @@ export class AgileCrm implements INodeType {
 										type: 'SYSTEM',
 										subtype: property.subtype as string,
 										name: 'phone',
-										value: property.number as string
+										value: property.number as string,
 									} as IDataObject);
 								});
 							}
@@ -237,7 +237,7 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'email',
-									value: additionalFields.email as string
+									value: additionalFields.email as string,
 								} as IDataObject);
 							}
 
@@ -245,7 +245,7 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'address',
-									value: additionalFields.address as string
+									value: additionalFields.address as string,
 								} as IDataObject);
 							}
 
@@ -253,7 +253,7 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'phone',
-									value: additionalFields.phone as string
+									value: additionalFields.phone as string,
 								} as IDataObject);
 							}
 
@@ -266,7 +266,7 @@ export class AgileCrm implements INodeType {
 									type: 'SYSTEM',
 									subtype: property.subtype as string,
 									name: 'webiste',
-									value: property.url as string
+									value: property.url as string,
 								} as IDataObject);
 							});
 						}
@@ -278,7 +278,7 @@ export class AgileCrm implements INodeType {
 									type: 'CUSTOM',
 									subtype: property.subtype as string,
 									name: property.name,
-									value: property.value as string
+									value: property.value as string,
 								} as IDataObject);
 							});
 						}
@@ -329,28 +329,28 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'first_name',
-									value: additionalFields.firstName as string
+									value: additionalFields.firstName as string,
 								} as IDataObject);
 							}
 							if (additionalFields.lastName) {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'last_name',
-									value: additionalFields.lastName as string
+									value: additionalFields.lastName as string,
 								} as IDataObject);
 							}
 							if (additionalFields.company) {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'company',
-									value: additionalFields.company as string
+									value: additionalFields.company as string,
 								} as IDataObject);
 							}
 							if (additionalFields.title) {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'title',
-									value: additionalFields.title as string
+									value: additionalFields.title as string,
 								} as IDataObject);
 							}
 							if (additionalFields.emailOptions) {
@@ -360,7 +360,7 @@ export class AgileCrm implements INodeType {
 										type: 'SYSTEM',
 										subtype: property.subtype as string,
 										name: 'email',
-										value: property.email as string
+										value: property.email as string,
 									} as IDataObject);
 								});
 							}
@@ -371,7 +371,7 @@ export class AgileCrm implements INodeType {
 										type: 'SYSTEM',
 										subtype: property.subtype as string,
 										name: 'address',
-										value: property.address as string
+										value: property.address as string,
 									} as IDataObject);
 								});
 							}
@@ -383,7 +383,7 @@ export class AgileCrm implements INodeType {
 										type: 'SYSTEM',
 										subtype: property.subtype as string,
 										name: 'phone',
-										value: property.number as string
+										value: property.number as string,
 									} as IDataObject);
 								});
 							}
@@ -392,7 +392,7 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'email',
-									value: additionalFields.email as string
+									value: additionalFields.email as string,
 								} as IDataObject);
 							}
 
@@ -400,7 +400,7 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'address',
-									value: additionalFields.address as string
+									value: additionalFields.address as string,
 								} as IDataObject);
 							}
 
@@ -408,7 +408,7 @@ export class AgileCrm implements INodeType {
 								properties.push({
 									type: 'SYSTEM',
 									name: 'phone',
-									value: additionalFields.phone as string
+									value: additionalFields.phone as string,
 								} as IDataObject);
 							}
 
@@ -421,7 +421,7 @@ export class AgileCrm implements INodeType {
 									type: 'SYSTEM',
 									subtype: property.subtype as string,
 									name: 'webiste',
-									value: property.url as string
+									value: property.url as string,
 								} as IDataObject);
 							});
 						}
@@ -432,7 +432,7 @@ export class AgileCrm implements INodeType {
 									type: 'CUSTOM',
 									subtype: property.subtype as string,
 									name: property.name,
-									value: property.value as string
+									value: property.value as string,
 								} as IDataObject);
 							});
 						}
diff --git a/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts b/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
index 08b45d209..ef473ef46 100644
--- a/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
@@ -104,7 +104,7 @@ export const companyFields = [
 					false,
 				],
 			},
-		}
+		},
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                company:create                               */
@@ -206,29 +206,29 @@ export const companyFields = [
 				options: [
 					{
 						name: '0',
-						value: 0
+						value: 0,
 					},
 					{
 						name: '1',
-						value: 1
+						value: 1,
 					},
 					{
 						name: '2',
-						value: 2
+						value: 2,
 					},
 					{
 						name: '3',
-						value: 3
+						value: 3,
 					},
 					{
 						name: '4',
-						value: 4
+						value: 4,
 					},
 					{
 						name: '5',
-						value: 5
+						value: 5,
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Tags',
@@ -339,7 +339,7 @@ export const companyFields = [
 								type: 'string',
 								required: true,
 								default: '',
-								description: 'Property name.'
+								description: 'Property name.',
 							},
 							{
 								displayName: 'Sub Type',
@@ -653,7 +653,7 @@ export const companyFields = [
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/AgileCrm/ContactDescription.ts b/packages/nodes-base/nodes/AgileCrm/ContactDescription.ts
index 5043e05b4..167d428f8 100644
--- a/packages/nodes-base/nodes/AgileCrm/ContactDescription.ts
+++ b/packages/nodes-base/nodes/AgileCrm/ContactDescription.ts
@@ -205,7 +205,7 @@ export const contactFields = [
 									},
 									{
 										name: 'Office',
-										value: 'office'
+										value: 'office',
 									},
 								],
 							},
@@ -656,15 +656,15 @@ export const contactFields = [
 								options: [
 									{
 										name: 'Home',
-										value: 'home'
+										value: 'home',
 									},
 									{
 										name: 'Office',
-										value: 'office'
+										value: 'office',
 									},
 									{
 										name: 'Postal',
-										value: 'postal'
+										value: 'postal',
 									},
 								],
 							},
@@ -715,8 +715,8 @@ export const contactFields = [
 									{
 										name: 'Personal',
 										value: 'personal',
-									}
-								]
+									},
+								],
 							},
 							{
 								displayName: 'Email',
@@ -752,7 +752,7 @@ export const contactFields = [
 				description: 'Lead score of contact',
 				typeOptions: {
 					minValue: 0,
-				}
+				},
 			},
 			{
 				displayName: 'Star Value',
@@ -966,7 +966,7 @@ export const contactFields = [
 								type: 'string',
 								required: true,
 								default: '',
-								description: 'Property name.'
+								description: 'Property name.',
 							},
 							{
 								displayName: 'Sub Type',
diff --git a/packages/nodes-base/nodes/AgileCrm/DealDescription.ts b/packages/nodes-base/nodes/AgileCrm/DealDescription.ts
index 443017cfd..812d939e0 100644
--- a/packages/nodes-base/nodes/AgileCrm/DealDescription.ts
+++ b/packages/nodes-base/nodes/AgileCrm/DealDescription.ts
@@ -143,7 +143,7 @@ export const dealFields = [
 		required: true,
 		typeOptions: {
 			minValue: 0,
-			maxValue: 1000000000000
+			maxValue: 1000000000000,
 		},
 		displayOptions: {
 			show: {
@@ -210,7 +210,7 @@ export const dealFields = [
 		required: true,
 		typeOptions: {
 			minValue: 0,
-			maxValue: 100
+			maxValue: 100,
 		},
 		displayOptions: {
 			show: {
@@ -318,7 +318,7 @@ export const dealFields = [
 								type: 'string',
 								required: true,
 								default: '',
-								description: 'Property name.'
+								description: 'Property name.',
 							},
 							{
 								displayName: 'Value',
@@ -444,7 +444,7 @@ export const dealFields = [
 				type: 'number',
 				typeOptions: {
 					minValue: 0,
-					maxValue: 10000
+					maxValue: 10000,
 				},
 				default: '',
 				description: 'Expected Value of deal.',
@@ -462,7 +462,7 @@ export const dealFields = [
 				type: 'number',
 				typeOptions: {
 					minValue: 0,
-					maxValue: 100
+					maxValue: 100,
 				},
 				default: 50,
 				description: 'Expected Value of deal.',
@@ -497,7 +497,7 @@ export const dealFields = [
 								type: 'string',
 								required: true,
 								default: '',
-								description: 'Property name.'
+								description: 'Property name.',
 							},
 							{
 								displayName: 'Value',
@@ -510,6 +510,6 @@ export const dealFields = [
 					},
 				],
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
index 71d5a68c1..75b8a71c8 100644
--- a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
@@ -4,9 +4,9 @@ import {
 
 import {
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions,
 } from 'n8n-core';
 
 import {
@@ -25,7 +25,7 @@ export async function agileCrmApiRequest(this: IHookFunctions | IExecuteFunction
 		},
 		auth: {
 			username: credentials!.email as string,
-			password: credentials!.apiKey as string
+			password: credentials!.apiKey as string,
 		},
 		uri: uri || `https://${credentials!.subdomain}.agilecrm.com/dev/${endpoint}`,
 		json: true,
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index acdee495e..98d499f72 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -3,11 +3,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	ILoadOptionsFunctions,
-	INodePropertyOptions,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -33,7 +31,7 @@ export class Airtable implements INodeType {
 			{
 				name: 'airtableApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -49,22 +47,22 @@ export class Airtable implements INodeType {
 					{
 						name: 'Delete',
 						value: 'delete',
-						description: 'Delete data from a table'
+						description: 'Delete data from a table',
 					},
 					{
 						name: 'List',
 						value: 'list',
-						description: 'List data from a table'
+						description: 'List data from a table',
 					},
 					{
 						name: 'Read',
 						value: 'read',
-						description: 'Read data from a table'
+						description: 'Read data from a table',
 					},
 					{
 						name: 'Update',
 						value: 'update',
-						description: 'Update data in a table'
+						description: 'Update data in a table',
 					},
 				],
 				default: 'read',
@@ -107,7 +105,7 @@ export class Airtable implements INodeType {
 					},
 				},
 				default: true,
-				description: 'If all fields should be send to Airtable or only specific ones.',
+				description: 'If all fields should be sent to Airtable or only specific ones.',
 			},
 			{
 				displayName: 'Fields',
@@ -130,7 +128,7 @@ export class Airtable implements INodeType {
 				default: [],
 				placeholder: 'Name',
 				required: true,
-				description: 'The name of fields of which the data should be send to Airtable.',
+				description: 'The name of fields for which data should be sent to Airtable.',
 			},
 
 			// ----------------------------------
@@ -188,7 +186,7 @@ export class Airtable implements INodeType {
 					maxValue: 100,
 				},
 				default: 100,
-				description: 'How many results to return.',
+				description: 'Number of results to return.',
 			},
 
 			{
@@ -198,7 +196,7 @@ export class Airtable implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'list'
+							'list',
 						],
 					},
 				},
@@ -261,13 +259,13 @@ export class Airtable implements INodeType {
 											{
 												name: 'DESC',
 												value: 'desc',
-												description: 'Sort in descending order (large -> small)'
+												description: 'Sort in descending order (large -> small)',
 											},
 										],
 										default: 'asc',
 										description: 'The sort direction.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -331,7 +329,7 @@ export class Airtable implements INodeType {
 					},
 				},
 				default: true,
-				description: 'If all fields should be send to Airtable or only specific ones.',
+				description: 'If all fields should be sent to Airtable or only specific ones.',
 			},
 			{
 				displayName: 'Fields',
@@ -354,7 +352,52 @@ export class Airtable implements INodeType {
 				default: [],
 				placeholder: 'Name',
 				required: true,
-				description: 'The name of fields of which the data should be send to Airtable.',
+				description: 'The name of fields for which data should be sent to Airtable.',
+			},
+
+			// ----------------------------------
+			//         append + update
+			// ----------------------------------
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				displayOptions: {
+					show: {
+						operation: [
+							'append',
+							'update',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Ignore Fields',
+						name: 'ignoreFields',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'update',
+								],
+								'/updateAllFields': [
+									true,
+								],
+							},
+						},
+						default: '',
+						description: 'Comma separated list of fields to ignore.',
+					},
+					{
+						displayName: 'Typecast',
+						name: 'typecast',
+						type: 'boolean',
+						default: false,
+						description: 'If the Airtable API should attempt mapping of string values for linked records & select options.',
+					},
+				],
 			},
 		],
 	};
@@ -386,8 +429,11 @@ export class Airtable implements INodeType {
 
 			let addAllFields: boolean;
 			let fields: string[];
+			let options: IDataObject;
+
 			for (let i = 0; i < items.length; i++) {
 				addAllFields = this.getNodeParameter('addAllFields', i) as boolean;
+				options = this.getNodeParameter('options', i, {}) as IDataObject;
 
 				if (addAllFields === true) {
 					// Add all the fields the item has
@@ -404,6 +450,10 @@ export class Airtable implements INodeType {
 					}
 				}
 
+				if (options.typecast === true) {
+					body['typecast'] = true;
+				}
+
 				responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
 				returnData.push(responseData);
@@ -494,12 +544,25 @@ export class Airtable implements INodeType {
 			let id: string;
 			let updateAllFields: boolean;
 			let fields: string[];
+			let options: IDataObject;
+
 			for (let i = 0; i < items.length; i++) {
 				updateAllFields = this.getNodeParameter('updateAllFields', i) as boolean;
+				options = this.getNodeParameter('options', i, {}) as IDataObject;
 
 				if (updateAllFields === true) {
 					// Update all the fields the item has
 					body.fields = items[i].json;
+
+					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)
+								.filter(([key]) => !ignoreFields.includes(key))
+								.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
+						}
+					}
 				} else {
 					// Update only the specified fields
 					body.fields = {} as IDataObject;
@@ -512,6 +575,10 @@ export class Airtable implements INodeType {
 					}
 				}
 
+				if (options.typecast === true) {
+					body['typecast'] = true;
+				}
+
 				id = this.getNodeParameter('id', i) as string;
 
 				endpoint = `${application}/${table}/${id}`;
diff --git a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
index de7344364..dd9c0aab9 100644
--- a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
@@ -98,6 +98,6 @@ export async function apiRequestAllItems(this: IHookFunctions | IExecuteFunction
 	);
 
 	return {
-		records: returnData
+		records: returnData,
 	};
 }
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
index c2803e927..cad15c6ea 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
@@ -59,7 +59,7 @@ export class Amqp implements INodeType {
 					},
 				],
 			},
-		]
+		],
 	};
 
 	async executeSingle(this: IExecuteSingleFunctions): Promise<INodeExecutionData> {
@@ -107,7 +107,7 @@ export class Amqp implements INodeType {
 
 				const message = {
 					application_properties: headerProperties,
-					body
+					body,
 				};
 
 				const sendResult = context.sender.send(message);
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index 9910ab5e2..a6619c040 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -77,7 +77,7 @@ export class AmqpTrigger implements INodeType {
 					},
 				],
 			},
-		]
+		],
 	};
 
 
@@ -109,7 +109,7 @@ export class AmqpTrigger implements INodeType {
 			port: credentials.port,
 			reconnect: true,		// this id the default anyway
 			reconnect_limit: 50,	// try for max 50 times, based on a back-off algorithm
-			container_id: (durable ? clientname : null)
+			container_id: (durable ? clientname : null),
 		};
 		if (credentials.username || credentials.password) {
 			container.options.username = credentials.username;
@@ -146,16 +146,16 @@ export class AmqpTrigger implements INodeType {
 				source: {
 					address: sink,
 					durable: 2,
-					expiry_policy: 'never'
+					expiry_policy: 'never',
 				},
-				credit_window: 1	// prefetch 1
+				credit_window: 1,	// prefetch 1
 			};
 		} else {
 			clientOptions = {
 				source: {
 					address: sink,
 				},
-				credit_window: 1	// prefetch 1
+				credit_window: 1,	// prefetch 1
 			};
 		}
 		connection.open_receiver(clientOptions);
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index 8b26999c6..f308cba65 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -14,6 +14,7 @@ import {
 import {
 	asanaApiRequest,
 	asanaApiRequestAllItems,
+	getWorkspaces,
 } from './GenericFunctions';
 
 export class Asana implements INodeType {
@@ -35,9 +36,44 @@ export class Asana implements INodeType {
 			{
 				name: 'asanaApi',
 				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+					},
+				},
+			},
+			{
+				name: 'asanaOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'accessToken',
+				description: 'The resource to operate on.',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -1004,32 +1040,7 @@ export class Asana implements INodeType {
 		loadOptions: {
 			// Get all the available workspaces to display them to user so that he can
 			// select them easily
-			async getWorkspaces(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const endpoint = '/workspaces';
-				const responseData = await asanaApiRequestAllItems.call(this, 'GET', endpoint, {});
-
-				const returnData: INodePropertyOptions[] = [];
-				for (const workspaceData of responseData) {
-					if (workspaceData.resource_type !== 'workspace') {
-						// Not sure if for some reason also ever other resources
-						// get returned but just in case filter them out
-						continue;
-					}
-
-					returnData.push({
-						name: workspaceData.name,
-						value: workspaceData.gid,
-					});
-				}
-
-				returnData.sort((a, b) => {
-					if (a.name < b.name) { return -1; }
-					if (a.name > b.name) { return 1; }
-					return 0;
-				});
-
-				return returnData;
-			},
+			getWorkspaces,
 
 			// Get all the available projects to display them to user so that they can be
 			// selected easily
@@ -1207,7 +1218,7 @@ export class Asana implements INodeType {
 				}
 
 				return returnData;
-			}
+			},
 		},
 	};
 
@@ -1215,12 +1226,6 @@ export class Asana implements INodeType {
 		const items = this.getInputData();
 		const returnData: IDataObject[] = [];
 
-		const credentials = this.getCredentials('asanaApi');
-
-		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
-		}
-
 		const resource = this.getNodeParameter('resource', 0) as string;
 		const operation = this.getNodeParameter('operation', 0) as string;
 
diff --git a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
index b4e481d16..6e51b7599 100644
--- a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
@@ -5,16 +5,21 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
 	asanaApiRequest,
+	getWorkspaces,
 } from './GenericFunctions';
 
-import { createHmac } from 'crypto';
+// import {
+// 	createHmac,
+// } from 'crypto';
 
 export class AsanaTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -26,7 +31,7 @@ export class AsanaTrigger implements INodeType {
 		description: 'Starts the workflow when Asana events occure.',
 		defaults: {
 			name: 'Asana-Trigger',
-			color: '#559922',
+			color: '#FC636B',
 		},
 		inputs: [],
 		outputs: ['main'],
@@ -34,7 +39,25 @@ export class AsanaTrigger implements INodeType {
 			{
 				name: 'asanaApi',
 				required: true,
-			}
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+					},
+				},
+			},
+			{
+				name: 'asanaOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
+			},
 		],
 		webhooks: [
 			{
@@ -45,6 +68,23 @@ export class AsanaTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'accessToken',
+				description: 'The resource to operate on.',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -56,13 +96,31 @@ export class AsanaTrigger implements INodeType {
 			{
 				displayName: 'Workspace',
 				name: 'workspace',
-				type: 'string',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getWorkspaces',
+				},
+				options: [],
 				default: '',
 				required: false,
 				description: 'The workspace ID the resource is registered under. This is only required if you want to allow overriding existing webhooks.',
 			},
 		],
+	};
 
+	methods = {
+		loadOptions: {
+			// Get all the available workspaces to display them to user so that he can
+			// select them easily
+			async getWorkspaces(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const workspaces = await getWorkspaces.call(this);
+				workspaces.unshift({
+					name: '',
+					value: '',
+				});
+				return workspaces;
+			},
+		},
 	};
 
 	// @ts-ignore (because of request)
@@ -71,32 +129,29 @@ export class AsanaTrigger implements INodeType {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
 				const webhookData = this.getWorkflowStaticData('node');
 
-				if (webhookData.webhookId === undefined) {
-					// No webhook id is set so no webhook can exist
-					return false;
-				}
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
 
-				// Webhook got created before so check if it still exists
-				const endpoint = `webhooks/${webhookData.webhookId}`;
+				const resource = this.getNodeParameter('resource') as string;
 
-				try {
-					await asanaApiRequest.call(this, 'GET', endpoint, {});
-				} catch (e) {
-					if (e.statusCode === 404) {
-						// Webhook does not exist
-						delete webhookData.webhookId;
+				const workspace = this.getNodeParameter('workspace') as string;
 
-						return false;
+				const endpoint = '/webhooks';
+
+				const { data } = await asanaApiRequest.call(this, 'GET', endpoint, {}, { workspace });
+
+				for (const webhook of data) {
+					if (webhook.resource.gid === resource && webhook.target === webhookUrl) {
+						webhookData.webhookId = webhook.gid;
+						return true;
 					}
-
-					// Some error occured
-					throw e;
 				}
 
 				// If it did not error then the webhook exists
-				return true;
+				return false;
 			},
 			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+
 				const webhookUrl = this.getNodeWebhookUrl('default') as string;
 
 				if (webhookUrl.includes('%20')) {
@@ -105,9 +160,7 @@ export class AsanaTrigger implements INodeType {
 
 				const resource = this.getNodeParameter('resource') as string;
 
-				const workspace = this.getNodeParameter('workspace') as string;
-
-				const endpoint = `webhooks`;
+				const endpoint = `/webhooks`;
 
 				const body = {
 					resource,
@@ -115,29 +168,15 @@ export class AsanaTrigger implements INodeType {
 				};
 
 				let responseData;
-				try {
-					 responseData = await asanaApiRequest.call(this, 'POST', endpoint, body);
-				} catch(error) {
-					// delete webhook if it already exists
-					if (error.statusCode === 403) {
-						const webhookData = await asanaApiRequest.call(this, 'GET', endpoint, {}, { workspace });
-						const webhook = webhookData.data.find((webhook: any) => { // tslint:disable-line:no-any
-							return webhook.target === webhookUrl && webhook.resource.gid === resource;
-						});
-						await asanaApiRequest.call(this, 'DELETE', `${endpoint}/${webhook.gid}`, {});
-						responseData = await asanaApiRequest.call(this, 'POST', endpoint, body);
-					} else {
-						throw error;
-					}
-				}
 
-				if (responseData.data === undefined || responseData.data.id === undefined) {
+				responseData = await asanaApiRequest.call(this, 'POST', endpoint, body);
+
+				if (responseData.data === undefined || responseData.data.gid === undefined) {
 					// Required data is missing so was not successful
 					return false;
 				}
 
-				const webhookData = this.getWorkflowStaticData('node');
-				webhookData.webhookId = responseData.data.id as string;
+				webhookData.webhookId = responseData.data.gid as string;
 
 				return true;
 			},
@@ -145,7 +184,7 @@ export class AsanaTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 
 				if (webhookData.webhookId !== undefined) {
-					const endpoint = `webhooks/${webhookData.webhookId}`;
+					const endpoint = `/webhooks/${webhookData.webhookId}`;
 					const body = {};
 
 					try {
@@ -158,6 +197,7 @@ export class AsanaTrigger implements INodeType {
 					// that no webhooks are registred anymore
 					delete webhookData.webhookId;
 					delete webhookData.webhookEvents;
+					delete webhookData.hookSecret;
 				}
 
 				return true;
@@ -165,15 +205,12 @@ export class AsanaTrigger implements INodeType {
 		},
 	};
 
-
-
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const bodyData = this.getBodyData() as IDataObject;
 		const headerData = this.getHeaderData() as IDataObject;
 		const req = this.getRequestObject();
 
-		const webhookData = this.getWorkflowStaticData('node') as IDataObject;
-
+		const webhookData = this.getWorkflowStaticData('node');
 
 		if (headerData['x-hook-secret'] !== undefined) {
 			// Is a create webhook confirmation request
@@ -182,6 +219,7 @@ export class AsanaTrigger implements INodeType {
 			const res = this.getResponseObject();
 			res.set('X-Hook-Secret', webhookData.hookSecret as string);
 			res.status(200).end();
+
 			return {
 				noWebhookResponse: true,
 			};
@@ -196,17 +234,21 @@ export class AsanaTrigger implements INodeType {
 			return {};
 		}
 
-		// Check if the request is valid
-		// (if the signature matches to data and hookSecret)
-		const computedSignature = createHmac("sha256", webhookData.hookSecret as string).update(JSON.stringify(req.body)).digest("hex");
-		if (headerData['x-hook-signature'] !== computedSignature) {
-			// Signature is not valid so ignore call
-			return {};
-		}
+		// TODO: Had to be deactivated as it is currently not possible to get the secret
+		//       in production mode as the static data overwrites each other because the
+		//       two exist at the same time (create webhook [with webhookId] and receive
+		//       webhook [with secret])
+		// // Check if the request is valid
+		// // (if the signature matches to data and hookSecret)
+		// const computedSignature = createHmac('sha256', webhookData.hookSecret as string).update(JSON.stringify(req.body)).digest('hex');
+		// if (headerData['x-hook-signature'] !== computedSignature) {
+		// 	// Signature is not valid so ignore call
+		// 	return {};
+		// }
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body.events),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index c8a0beb1b..44a04123e 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -10,6 +10,7 @@ import {
 
 import {
 	IDataObject,
+	INodePropertyOptions,
 } from 'n8n-workflow';
 
 import {
@@ -26,16 +27,10 @@ import {
  * @returns {Promise<any>}
  */
 export async function asanaApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: object, query?: object, uri?: string | undefined): Promise<any> { // tslint:disable-line:no-any
-	const credentials = this.getCredentials('asanaApi');
-
-	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
-	}
+	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
 	const options: OptionsWithUri = {
-		headers: {
-			Authorization: `Bearer ${credentials.accessToken}`,
-		},
+		headers: {},
 		method,
 		body: { data: body },
 		qs: query,
@@ -44,13 +39,30 @@ export async function asanaApiRequest(this: IHookFunctions | IExecuteFunctions |
 	};
 
 	try {
-		return await this.helpers.request!(options);
+		if (authenticationMethod === 'accessToken') {
+			const credentials = this.getCredentials('asanaApi');
+
+			if (credentials === undefined) {
+				throw new Error('No credentials got returned!');
+			}
+
+			options.headers!['Authorization'] = `Bearer ${credentials.accessToken}`;
+
+			return await this.helpers.request!(options);
+		} else {
+			//@ts-ignore
+			return await this.helpers.requestOAuth2.call(this, 'asanaOAuth2Api', options);
+		}
 	} catch (error) {
 		if (error.statusCode === 401) {
 			// Return a clear error
 			throw new Error('The Asana credentials are not valid!');
 		}
 
+		if (error.statusCode === 403) {
+			throw error;
+		}
+
 		if (error.response && error.response.body && error.response.body.errors) {
 			// Try to return the error prettier
 			const errorMessages = error.response.body.errors.map((errorData: { message: string }) => {
@@ -82,3 +94,30 @@ export async function asanaApiRequestAllItems(this: IExecuteFunctions | ILoadOpt
 
 	return returnData;
 }
+
+export async function getWorkspaces(this: ILoadOptionsFunctions): Promise < INodePropertyOptions[] > {
+	const endpoint = '/workspaces';
+	const responseData = await asanaApiRequestAllItems.call(this, 'GET', endpoint, {});
+
+	const returnData: INodePropertyOptions[] = [];
+	for(const workspaceData of responseData) {
+		if (workspaceData.resource_type !== 'workspace') {
+			// Not sure if for some reason also ever other resources
+			// get returned but just in case filter them out
+			continue;
+		}
+
+		returnData.push({
+			name: workspaceData.name,
+			value: workspaceData.gid,
+		});
+	}
+
+				returnData.sort((a, b) => {
+		if (a.name < b.name) { return -1; }
+		if (a.name > b.name) { return 1; }
+		return 0;
+	});
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.ts b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
new file mode 100644
index 000000000..2a34d5b18
--- /dev/null
+++ b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
@@ -0,0 +1,383 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	automizyApiRequest,
+	automizyApiRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	contactFields,
+	contactOperations,
+} from './ContactDescription';
+
+import {
+	listFields,
+	listOperations,
+} from './ListDescription';
+
+export class Automizy implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Automizy',
+		name: 'automizy',
+		icon: 'file:automizy.png',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Automizy API',
+		defaults: {
+			name: 'Automizy',
+			color: '#e5863b',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'automizyApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Contact',
+						value: 'contact',
+					},
+					{
+						name: 'List',
+						value: 'list',
+					},
+				],
+				default: 'contact',
+				description: 'The resource to operate on.',
+			},
+
+			...contactOperations,
+			...contactFields,
+
+			...listOperations,
+			...listFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			// Get all the tags to display them to user so that he can
+			// select them easily
+			async getLists(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const lists = await automizyApiRequestAllItems.call(
+					this,
+					'smartLists',
+					'GET',
+					`/smart-lists`,
+				);
+				for (const list of lists) {
+					returnData.push({
+						name: list.name,
+						value: list.id,
+					});
+				}
+				return returnData;
+			},
+			async getTags(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const tags = await automizyApiRequestAllItems.call(
+					this,
+					'contactTags',
+					'GET',
+					'/contacts/tag-manager',
+				);
+				for (const tag of tags) {
+					returnData.push({
+						name: tag.name,
+						value: tag.name,
+					});
+				}
+				return returnData;
+			},
+			async getCustomFields(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const customFields = await automizyApiRequestAllItems.call(
+					this,
+					'customFields',
+					'GET',
+					'/custom-fields',
+				);
+				for (const customField of customFields) {
+					returnData.push({
+						name: customField.name,
+						value: customField.id,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+
+			if (resource === 'contact') {
+
+				if (operation === 'create') {
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					const email = this.getNodeParameter('email', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						email,
+					};
+
+					Object.assign(body, additionalFields);
+
+					if (body.customFieldsUi) {
+						const customFieldsValues = (body.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+
+						body.customFields = {};
+
+						for (const customField of customFieldsValues) {
+
+							//@ts-ignore
+							body.customFields[customField.key] = customField.value;
+						}
+
+						delete body.customFieldsUi;
+					}
+
+					responseData = await automizyApiRequest.call(
+						this,
+						'POST',
+						`/smart-lists/${listId}/contacts`,
+						body,
+					);
+				}
+
+				if (operation === 'delete') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+
+					responseData = await automizyApiRequest.call(
+						this,
+						'DELETE',
+						`/contacts/${contactId}`,
+					);
+
+					responseData = { success: true };
+				}
+
+				if (operation === 'get') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+
+					responseData = await automizyApiRequest.call(
+						this,
+						'GET',
+						`/contacts/${contactId}`,
+					);
+				}
+
+				if (operation === 'getAll') {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					if (additionalFields.direction && additionalFields.sortBy) {
+						qs.order = `${additionalFields.sortBy}:${additionalFields.direction}`;
+					}
+
+					if (additionalFields.fields) {
+						qs.fields = additionalFields.fields;
+					}
+
+					if (returnAll) {
+
+						responseData = await automizyApiRequestAllItems.call(
+							this,
+							'contacts',
+							'GET',
+							`/smart-lists/${listId}/contacts`,
+							{},
+							qs,
+						);
+
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+
+						responseData = await automizyApiRequest.call(
+							this,
+							'GET',
+							`/smart-lists/${listId}/contacts`,
+							{},
+							qs,
+						);
+
+						responseData = responseData.contacts;
+					}
+				}
+
+				if (operation === 'update') {
+					const email = this.getNodeParameter('email', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body: IDataObject = {};
+
+					Object.assign(body, updateFields);
+
+					if (body.customFieldsUi) {
+						const customFieldsValues = (body.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+
+						body.customFields = {};
+
+						for (const customField of customFieldsValues) {
+
+							//@ts-ignore
+							body.customFields[customField.key] = customField.value;
+						}
+
+						delete body.customFieldsUi;
+					}
+
+					responseData = await automizyApiRequest.call(
+						this,
+						'PATCH',
+						`/contacts/${email}`,
+						body,
+					);
+				}
+			}
+
+			if (resource === 'list') {
+
+				if (operation === 'create') {
+					const name = this.getNodeParameter('name', i) as string;
+
+					const body: IDataObject = {
+						name,
+					};
+
+					responseData = await automizyApiRequest.call(
+						this,
+						'POST',
+						`/smart-lists`,
+						body,
+					);
+				}
+
+				if (operation === 'delete') {
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					responseData = await automizyApiRequest.call(
+						this,
+						'DELETE',
+						`/smart-lists/${listId}`,
+					);
+
+					responseData = { success: true };
+				}
+
+				if (operation === 'get') {
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					responseData = await automizyApiRequest.call(
+						this,
+						'GET',
+						`/smart-lists/${listId}`,
+					);
+				}
+
+				if (operation === 'getAll') {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					if (additionalFields.direction && additionalFields.sortBy) {
+						qs.order = `${additionalFields.sortBy}:${additionalFields.direction}`;
+					}
+
+					if (additionalFields.fields) {
+						qs.fields = additionalFields.fields;
+					}
+
+					if (returnAll) {
+
+						responseData = await automizyApiRequestAllItems.call(
+							this,
+							'smartLists',
+							'GET',
+							`/smart-lists`,
+							{},
+							qs,
+						);
+
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+
+						responseData = await automizyApiRequest.call(
+							this,
+							'GET',
+							`/smart-lists`,
+							{},
+							qs,
+						);
+
+						responseData = responseData.smartLists;
+					}
+				}
+
+				if (operation === 'update') {
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					const name = this.getNodeParameter('name', i) as string;
+
+					const body: IDataObject = {
+						name,
+					};
+
+					responseData = await automizyApiRequest.call(
+						this,
+						'PATCH',
+						`/smart-lists/${listId}`,
+						body,
+					);
+				}
+			}
+		}
+		if (Array.isArray(responseData)) {
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+		} else if (responseData !== undefined) {
+			returnData.push(responseData as IDataObject);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Automizy/ContactDescription.ts b/packages/nodes-base/nodes/Automizy/ContactDescription.ts
new file mode 100644
index 000000000..102555ce7
--- /dev/null
+++ b/packages/nodes-base/nodes/Automizy/ContactDescription.ts
@@ -0,0 +1,460 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const contactOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a contact',
+			},
+			{
+				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: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const contactFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:create                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: '',
+		description: 'The email address of the contact.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				type: 'fixedCollection',
+				default: '',
+				placeholder: 'Add Custom Field',
+				typeOptions: {
+					multipleValues: true,
+					loadOptionsMethod: 'getCustomFields',
+				},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCustomFields',
+								},
+								description: 'The end user specified key of the user defined data.',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								description: 'The end user specified value of the user defined data.',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'ACTIVE',
+					},
+					{
+						name: 'Banned',
+						value: 'BANNED',
+					},
+					{
+						name: 'Bounced',
+						value: 'BOUNCED',
+					},
+					{
+						name: 'Inactive',
+						value: 'INACTIVE',
+					},
+
+					{
+						name: 'Unsubscribed',
+						value: 'UNSUBSCRIBED',
+					},
+				],
+				default: '',
+				description: 'The status of the contact. You can only send email to contacts with ACTIVE status.',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+				description: 'The tags you want to set to the contact.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:delete                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: '',
+		description: 'Can be ID or email.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:get                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: '',
+		description: 'Can be ID or email',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:getAll                         */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'contact',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Direction',
+				name: 'direction',
+				type: 'options',
+				options: [
+					{
+						name: 'ASC',
+						value: 'asc',
+					},
+					{
+						name: 'DESC',
+						value: 'desc',
+					},
+				],
+				default: 'desc',
+				description: 'Defines the direction in which search results are ordered. Default value is DESC. Note: It has to be using with the Sort By parameter',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of attributes to include in the response.',
+			},
+			{
+				displayName: 'Sort By',
+				name: 'sortBy',
+				type: 'string',
+				default: 'Defines the field in which search results are sort by. Note: It has to be using with the Direcction parameter',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:update                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				type: 'fixedCollection',
+				default: '',
+				placeholder: 'Add Custom Field',
+				typeOptions: {
+					multipleValues: true,
+					loadOptionsMethod: 'getCustomFields',
+				},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCustomFields',
+								},
+								description: 'The end user specified key of the user defined data.',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								description: 'The end user specified value of the user defined data.',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'ACTIVE',
+					},
+					{
+						name: 'Banned',
+						value: 'BANNED',
+					},
+					{
+						name: 'Bounced',
+						value: 'BOUNCED',
+					},
+					{
+						name: 'Inactive',
+						value: 'INACTIVE',
+					},
+					{
+						name: 'Unsubscribed',
+						value: 'UNSUBSCRIBED',
+					},
+				],
+				default: '',
+				description: 'The status of the contact. You can only send email to contacts with ACTIVE status.',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+				description: 'The tags you want to set to the contact. Will replace all existing ones.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
new file mode 100644
index 000000000..f4265af13
--- /dev/null
+++ b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
@@ -0,0 +1,70 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function automizyApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const credentials = this.getCredentials('automizyApi') as IDataObject;
+
+	const options: OptionsWithUri = {
+		headers: {
+			'Authorization': `Bearer ${credentials.apiToken}`,
+		},
+		method,
+		body,
+		qs,
+		uri: `https://gateway.automizy.com/v2${path}`,
+		json: true,
+	};
+
+	try {
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		if (Object.keys(qs).length === 0) {
+			delete options.qs;
+		}
+		if (Object.keys(option).length !== 0) {
+			Object.assign(options, option);
+		}
+		//@ts-ignore
+		return await this.helpers.request.call(this, options);
+	} catch (error) {
+		if (error.response && error.response.body) {
+
+			throw new Error(
+				`Automizy error response [${error.statusCode}]: ${error.response.body.title}`,
+			);
+		}
+
+		throw error;
+	}
+}
+
+export async function automizyApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.limit = 100;
+	query.page = 1;
+	do {
+		responseData = await automizyApiRequest.call(this, method, endpoint, body, query);
+		query.page++;
+		returnData.push.apply(returnData, responseData[propertyName]);
+	} while (
+		responseData.pageCount !== responseData.page
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Automizy/ListDescription.ts b/packages/nodes-base/nodes/Automizy/ListDescription.ts
new file mode 100644
index 000000000..f8f6faa8e
--- /dev/null
+++ b/packages/nodes-base/nodes/Automizy/ListDescription.ts
@@ -0,0 +1,241 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const listOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'list',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a list',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a list',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a list',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all lists',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a list',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const listFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 list:create                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		default: '',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 list:delete                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		default: '',
+	},
+		/* -------------------------------------------------------------------------- */
+	/*                                 list:get                                   */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		default: '',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'list',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Direction',
+				name: 'direction',
+				type: 'options',
+				options: [
+					{
+						name: 'ASC',
+						value: 'asc',
+					},
+					{
+						name: 'DESC',
+						value: 'desc',
+					},
+				],
+				default: 'desc',
+				description: 'Defines the direction in which search results are ordered. Default value is DESC. Note: It has to be using with the Sort By parameter',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of attributes to include in the response.',
+			},
+			{
+				displayName: 'Sort By',
+				name: 'sortBy',
+				type: 'string',
+				default: 'Defines the field in which search results are sort by. Note: It has to be using with the Direcction parameter',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 list:update                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Name',
+		name: 'name',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		default: '',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Automizy/automizy.png b/packages/nodes-base/nodes/Automizy/automizy.png
new file mode 100644
index 000000000..d8e3a5396
Binary files /dev/null and b/packages/nodes-base/nodes/Automizy/automizy.png differ
diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index 0bddddede..0d08efbae 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -1,11 +1,11 @@
 import { IExecuteFunctions } from 'n8n-core';
 import {
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
-	INodePropertyOptions,
+	IDataObject,
 	ILoadOptionsFunctions,
-	IDataObject
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import { awsApiRequestREST } from './GenericFunctions';
@@ -29,7 +29,7 @@ export class AwsLambda implements INodeType {
 			{
 				name: 'aws',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -145,7 +145,7 @@ export class AwsLambda implements INodeType {
 					});
 				}
 				return returnData;
-			}
+			},
 		},
 	};
 
diff --git a/packages/nodes-base/nodes/Aws/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/AwsSes.node.ts
deleted file mode 100644
index 74870cc90..000000000
--- a/packages/nodes-base/nodes/Aws/AwsSes.node.ts
+++ /dev/null
@@ -1,282 +0,0 @@
-import { IExecuteFunctions } from 'n8n-core';
-import {
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
-	IDataObject
-} from 'n8n-workflow';
-
-import {  awsApiRequestSOAP } from './GenericFunctions';
-
-function setParameter(params: string[], base: string, values: string[]) {
-	for (let i = 0; i < values.length; i++) {
-		params.push(`${base}.${i+1}=${values[i]}`);
-	}
-}
-
-export class AwsSes implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'AWS SES',
-		name: 'awsSes',
-		icon: 'file:ses.png',
-		group: ['output'],
-		version: 1,
-		subtitle: '={{$parameter["operation"]}}',
-		description: 'Sends data to AWS SES',
-		defaults: {
-			name: 'AWS SES',
-			color: '#FF9900',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'aws',
-				required: true,
-			}
-		],
-		properties: [
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				options: [
-					{
-						name: 'Send Email',
-						value: 'sendEmail',
-					},
-				],
-				default: 'sendEmail',
-				description: 'The operation to perform.',
-			},
-			{
-				displayName: 'Is Body HTML',
-				name: 'isBodyHtml',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: [
-							'sendEmail',
-						],
-					},
-				},
-				default: false,
-				description: 'If body is HTML or simple text.',
-			},
-			{
-				displayName: 'Subject',
-				name: 'subject',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: [
-							'sendEmail',
-						],
-					},
-				},
-				default: '',
-				required: true,
-			},
-			{
-				displayName: 'Body',
-				name: 'body',
-				type: 'string',
-				typeOptions: {
-					alwaysOpenEditWindow: true,
-				},
-				displayOptions: {
-					show: {
-						operation: [
-							'sendEmail',
-						],
-					},
-				},
-				default: '',
-				description: 'The message to be sent.',
-				required: true,
-			},
-			{
-				displayName: 'From Email',
-				name: 'fromEmail',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: [
-							'sendEmail',
-						],
-					},
-				},
-				required: true,
-				description: 'Email address of the sender.',
-				placeholder: 'admin@example.com',
-				default: '',
-			},
-			{
-				displayName: 'To Addresses',
-				name: 'toAddresses',
-				type: 'string',
-				description: 'Email addresses of the recipients.',
-				typeOptions: {
-					multipleValues: true,
-					multipleValueButtonText: 'Add To Email',
-				},
-				displayOptions: {
-					show: {
-						operation: [
-							'sendEmail',
-						],
-					},
-				},
-				placeholder: 'info@example.com',
-				default: [],
-			},
-			{
-				displayName: 'Additional Fields',
-				name: 'additionalFields',
-				type: 'collection',
-				placeholder: 'Add Field',
-				default: {},
-				displayOptions: {
-					show: {
-						operation: [
-							'sendEmail',
-						],
-					},
-				},
-				options: [
-					{
-						displayName: 'Bcc Addresses',
-						name: 'bccAddresses',
-						type: 'string',
-						typeOptions: {
-							multipleValues: true,
-							multipleValueButtonText: 'Add Bcc Email',
-						},
-						description: 'Bcc Recipients of the email.',
-						default: [],
-					},
-					{
-						displayName: 'Cc Addresses',
-						name: 'ccAddresses',
-						type: 'string',
-						typeOptions: {
-							multipleValues: true,
-							multipleValueButtonText: 'Add Cc Email',
-						},
-						description: 'Cc recipients of the email.',
-						default: [],
-					},
-					{
-						displayName: 'Configuration Set Name',
-						name: 'configurationSetName',
-						type: 'string',
-						description: 'Name of the configuration set to use when you send an email using SendEmail.',
-						default: '',
-					},
-					{
-						displayName: 'Reply To Addresses',
-						name: 'replyToAddresses',
-						type: 'string',
-						typeOptions: {
-							multipleValues: true,
-							multipleValueButtonText: 'Add Reply To Email',
-						},
-						placeholder: 'Add Reply Address',
-						description: 'Reply-to email address(es) for the message.',
-						default: [],
-					},
-					{
-						displayName: 'Return Path',
-						name: 'returnPath',
-						type: 'string',
-						description: 'Email address that bounces and complaints will be forwarded to when feedback forwarding is enabled',
-						default: '',
-					},
-					{
-						displayName: 'Return Path Arn',
-						name: 'returnPathArn',
-						type: 'string',
-						default: '',
-						description: 'This parameter is used only for sending authorization',
-					},
-					{
-						displayName: 'Source Arn',
-						name: 'sourceArn',
-						type: 'string',
-						description: 'This parameter is used only for sending authorization.',
-						default: '',
-					},
-				],
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
-		let responseData;
-		const operation = this.getNodeParameter('operation', 0) as string;
-		for (let i = 0; i < items.length; i++) {
-			if (operation === 'sendEmail') {
-				const toAddresses = this.getNodeParameter('toAddresses', i) as string[];
-				const message = this.getNodeParameter('body', i) as string;
-				const subject = this.getNodeParameter('subject', i) as string;
-				const fromEmail = this.getNodeParameter('fromEmail', i) as string;
-				const isBodyHtml = this.getNodeParameter('isBodyHtml', i) as boolean;
-				const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
-				const params = [
-					`Message.Subject.Data=${subject}`,
-					`Source=${fromEmail}`,
-				];
-				if (isBodyHtml) {
-					params.push(`Message.Body.Html.Data=${message}`);
-				} else {
-					params.push(`Message.Body.Text.Data=${message}`);
-				}
-				if (toAddresses.length) {
-					setParameter(params, 'Destination.ToAddresses.member', toAddresses);
-				} else {
-					throw new Error('At least one "To Address" has to be added!');
-				}
-				if (additionalFields.configurationSetName) {
-					params.push(`ConfigurationSetName=${additionalFields.configurationSetName}`);
-				}
-				if (additionalFields.returnPath) {
-					params.push(`ReturnPath=${additionalFields.returnPath}`);
-				}
-				if (additionalFields.returnPathArn) {
-					params.push(`ReturnPathArn=${additionalFields.returnPathArn}`);
-				}
-				if (additionalFields.sourceArn) {
-					params.push(`SourceArn=${additionalFields.sourceArn}`);
-				}
-				if (additionalFields.replyToAddresses) {
-					setParameter(params, 'ReplyToAddresses.member', additionalFields.replyToAddresses as string[]);
-				}
-				if (additionalFields.bccAddresses) {
-					setParameter(params, 'Destination.BccAddresses.member', additionalFields.bccAddresses as string[]);
-				}
-				if (additionalFields.ccAddressesUi) {
-					let ccAddresses = (additionalFields.ccAddressesUi as IDataObject).ccAddressesValues as string[];
-					//@ts-ignore
-					ccAddresses = ccAddresses.map(o => o.address);
-					if (ccAddresses) {
-						setParameter(params, 'Destination.CcAddresses.member', ccAddresses);
-					}
-				}
-
-				try {
-					responseData = await awsApiRequestSOAP.call(this, 'email', 'POST', '/?Action=SendEmail&' + params.join('&'));
-				} catch(err) {
-					throw new Error(err);
-				}
-			}
-			if (Array.isArray(responseData)) {
-				returnData.push.apply(returnData, responseData as IDataObject[]);
-			} else {
-				returnData.push(responseData as IDataObject);
-			}
-		}
-		return [this.helpers.returnJsonArray(returnData)];
-	}
-}
diff --git a/packages/nodes-base/nodes/Aws/AwsSns.node.ts b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
index 358b00458..16eb1c432 100644
--- a/packages/nodes-base/nodes/Aws/AwsSns.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
@@ -1,11 +1,11 @@
 import { IExecuteFunctions } from 'n8n-core';
 import {
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
-	INodePropertyOptions,
+	IDataObject,
 	ILoadOptionsFunctions,
-	IDataObject
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import { awsApiRequestSOAP } from './GenericFunctions';
@@ -29,7 +29,7 @@ export class AwsSns implements INodeType {
 			{
 				name: 'aws',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -133,7 +133,7 @@ export class AwsSns implements INodeType {
 				}
 
 				return returnData;
-			}
+			},
 		},
 	};
 
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
index 3d4b63b30..e41f9de57 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -4,18 +4,20 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
 	awsApiRequestSOAP,
 } from './GenericFunctions';
 
-import { get } from 'lodash';
+import {
+	get,
+} from 'lodash';
 
 export class AwsSnsTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -36,7 +38,7 @@ export class AwsSnsTrigger implements INodeType {
 			{
 				name: 'aws',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
@@ -91,7 +93,7 @@ export class AwsSnsTrigger implements INodeType {
 					});
 				}
 				return returnData;
-			}
+			},
 		},
 	};
 	// @ts-ignore
@@ -108,8 +110,18 @@ export class AwsSnsTrigger implements INodeType {
 					'Version=2010-03-31',
 				];
 				const data = await awsApiRequestSOAP.call(this, 'sns', 'GET', '/?Action=ListSubscriptionsByTopic&' + params.join('&'));
-				const subscriptions = get(data, 'ListSubscriptionsByTopicResponse.ListSubscriptionsByTopicResult.Subscriptions.member');
-				for (const subscription of subscriptions) {
+				const subscriptions = get(data, 'ListSubscriptionsByTopicResponse.ListSubscriptionsByTopicResult.Subscriptions');
+				if (!subscriptions || !subscriptions.member) {
+					return false;
+				}
+
+				let subscriptionMembers = subscriptions.member;
+
+				if (!Array.isArray(subscriptionMembers)) {
+					subscriptionMembers = [subscriptionMembers];
+				}
+
+				for (const subscription of subscriptionMembers) {
 					if (webhookData.webhookId === subscription.SubscriptionArn) {
 						return true;
 					}
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
new file mode 100644
index 000000000..72a5806c6
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
@@ -0,0 +1,386 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IBinaryKeyData,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	awsApiRequestREST,
+} from './GenericFunctions';
+
+export class AwsRekognition implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'AWS Rekognition',
+		name: 'awsRekognition',
+		icon: 'file:rekognition.svg',
+		group: ['output'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Sends data to AWS Rekognition',
+		defaults: {
+			name: 'AWS Rekognition',
+			color: '#305b94',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'aws',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Image',
+						value: 'image',
+					},
+				],
+				default: 'image',
+				description: 'The operation to perform.',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [
+					{
+						name: 'Analyze',
+						value: 'analyze',
+					},
+				],
+				default: 'analyze',
+				description: 'The operation to perform.',
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				options: [
+					{
+						name: 'Detect Faces',
+						value: 'detectFaces',
+					},
+					{
+						name: 'Detect Labels',
+						value: 'detectLabels',
+					},
+					{
+						name: 'Detect Moderation Labels',
+						value: 'detectModerationLabels',
+					},
+					{
+						name: 'Recognize Celebrity',
+						value: 'recognizeCelebrity',
+					},
+				],
+				default: 'detectFaces',
+				description: 'The operation to perform.',
+			},
+			{
+				displayName: 'Binary Data',
+				name: 'binaryData',
+				type: 'boolean',
+				default: false,
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'analyze',
+						],
+						resource: [
+							'image',
+						],
+					},
+				},
+				description: 'If the image to analize should be taken from binary field.',
+			},
+			{
+				displayName: 'Binary Property',
+				displayOptions: {
+					show: {
+						operation: [
+							'analyze',
+						],
+						resource: [
+							'image',
+						],
+						binaryData: [
+							true,
+						],
+					},
+				},
+				name: 'binaryPropertyName',
+				type: 'string',
+				default: 'data',
+				description: 'Object property name which holds binary data.',
+				required: true,
+			},
+			{
+				displayName: 'Bucket',
+				name: 'bucket',
+				displayOptions: {
+					show: {
+						operation: [
+							'analyze',
+						],
+						resource: [
+							'image',
+						],
+						binaryData: [
+							false,
+						],
+					},
+				},
+				type: 'string',
+				default: '',
+				required: true,
+				description: 'Name of the S3 bucket',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				displayOptions: {
+					show: {
+						operation: [
+							'analyze',
+						],
+						resource: [
+							'image',
+						],
+						binaryData: [
+							false,
+						],
+					},
+				},
+				type: 'string',
+				default: '',
+				required: true,
+				description: 'S3 object key name',
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				displayOptions: {
+					show: {
+						operation: [
+							'analyze',
+						],
+						resource: [
+							'image',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Version',
+						name: 'version',
+						displayOptions: {
+							show: {
+								'/binaryData': [
+									false,
+								],
+							},
+						},
+						type: 'string',
+						default: '',
+						description: 'If the bucket is versioning enabled, you can specify the object version',
+					},
+					{
+						displayName: 'Max Labels',
+						name: 'maxLabels',
+						type: 'number',
+						displayOptions: {
+							show: {
+								'/type': [
+									'detectModerationLabels',
+									'detectLabels',
+								],
+							},
+						},
+						default: 0,
+						typeOptions: {
+							minValue: 0,
+						},
+						description: `Maximum number of labels you want the service to return in the response. The service returns the specified number of highest confidence labels.`,
+					},
+					{
+						displayName: 'Min Confidence',
+						name: 'minConfidence',
+						type: 'number',
+						displayOptions: {
+							show: {
+								'/type': [
+									'detectModerationLabels',
+									'detectLabels',
+								],
+							},
+						},
+						default: 0,
+						typeOptions: {
+							minValue: 0,
+							maxValue: 100,
+						},
+						description: `Specifies the minimum confidence level for the labels to return. Amazon Rekognition doesn't return any labels with a confidence level lower than this specified value.`,
+					},
+					{
+						displayName: 'Attributes',
+						name: 'attributes',
+						type: 'multiOptions',
+						displayOptions: {
+							show: {
+								'/type': [
+									'detectFaces',
+								],
+							},
+						},
+						options: [
+							{
+								name: 'All',
+								value: 'all',
+							},
+							{
+								name: 'Default',
+								value: 'default',
+							},
+						],
+						default: [],
+						description: `An array of facial attributes you want to be returned`,
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < items.length; i++) {
+			if (resource === 'image') {
+				//https://docs.aws.amazon.com/rekognition/latest/dg/API_DetectModerationLabels.html#API_DetectModerationLabels_RequestSyntax
+				if (operation === 'analyze') {
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					let action = undefined;
+
+					let body: IDataObject = {};
+
+					const type = this.getNodeParameter('type', 0) as string;
+
+					if (type === 'detectModerationLabels') {
+						action = 'RekognitionService.DetectModerationLabels';
+
+						// property = 'ModerationLabels';
+
+						if (additionalFields.minConfidence) {
+							body['MinConfidence'] = additionalFields.minConfidence as number;
+						}
+					}
+
+					if (type === 'detectFaces') {
+						action = 'RekognitionService.DetectFaces';
+
+						// TODO: Add a later point make it possible to activate via option.
+						//       If activated add an index to each of the found faces/tages/...
+						//       to not loose the reference to the image it got found on if
+						//       multilpe ones got supplied.
+						// property = 'FaceDetails';
+
+						if (additionalFields.attributes) {
+							body['Attributes'] = additionalFields.attributes as string;
+						}
+					}
+
+					if (type === 'detectLabels') {
+						action = 'RekognitionService.DetectLabels';
+
+						if (additionalFields.minConfidence) {
+							body['MinConfidence'] = additionalFields.minConfidence as number;
+						}
+
+						if (additionalFields.maxLabels) {
+							body['MaxLabels'] = additionalFields.maxLabels as number;
+						}
+					}
+
+					if (type === 'recognizeCelebrity') {
+						action = 'RekognitionService.RecognizeCelebrities';
+					}
+
+					const binaryData = this.getNodeParameter('binaryData', 0) as boolean;
+
+					if (binaryData) {
+
+						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0) as string;
+
+						if (items[i].binary === undefined) {
+							throw new Error('No binary data exists on item!');
+						}
+
+						if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
+							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+						}
+
+						const binaryPropertyData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+
+						body = {
+							Image: {
+								Bytes: binaryPropertyData.data,
+							},
+						};
+
+					} else {
+
+						const bucket = this.getNodeParameter('bucket', i) as string;
+
+						const name = this.getNodeParameter('name', i) as string;
+
+						body = {
+							Image: {
+								S3Object: {
+									Bucket: bucket,
+									Name: name,
+								},
+							},
+						};
+
+						if (additionalFields.version) {
+							//@ts-ignore
+							body.Image.S3Object.Version = additionalFields.version as string;
+						}
+					}
+
+					responseData = await awsApiRequestREST.call(this, 'rekognition', 'POST', '', JSON.stringify(body), {}, { 'X-Amz-Target': action, 'Content-Type': 'application/x-amz-json-1.1' });
+
+					// if (property !== undefined) {
+					// 	responseData = responseData[property as string];
+					// }
+				}
+			}
+
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+			} else {
+				returnData.push(responseData);
+			}
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
new file mode 100644
index 000000000..9b8d1782b
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
@@ -0,0 +1,126 @@
+import {
+	sign,
+} from 'aws4';
+
+import {
+	get,
+} from 'lodash';
+
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	parseString,
+} from 'xml2js';
+
+import {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+ } from 'n8n-workflow';
+
+export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string | Buffer | IDataObject, query: IDataObject = {}, headers?: object, option: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any
+	const credentials = this.getCredentials('aws');
+	if (credentials === undefined) {
+		throw new Error('No credentials got returned!');
+	}
+
+	const endpoint = `${service}.${region || credentials.region}.amazonaws.com`;
+
+	// Sign AWS API request with the user credentials
+	const signOpts = {headers: headers || {}, host: endpoint, method, path, body};
+
+	sign(signOpts, { accessKeyId: `${credentials.accessKeyId}`.trim(), secretAccessKey: `${credentials.secretAccessKey}`.trim()});
+
+	const options: OptionsWithUri = {
+		headers: signOpts.headers,
+		method,
+		uri: `https://${endpoint}${signOpts.path}`,
+		body: signOpts.body,
+	};
+
+	if (Object.keys(option).length !== 0) {
+		Object.assign(options, option);
+	}
+	try {
+		return await this.helpers.request!(options);
+	} catch (error) {
+		const errorMessage = error.response.body.message || error.response.body.Message || error.message;
+
+		if (error.statusCode === 403) {
+			if (errorMessage === 'The security token included in the request is invalid.') {
+				throw new Error('The AWS credentials are not valid!');
+			} else if (errorMessage.startsWith('The request signature we calculated does not match the signature you provided')) {
+				throw new Error('The AWS credentials are not valid!');
+			}
+		}
+
+		throw new Error(`AWS error response [${error.statusCode}]: ${errorMessage}`);
+	}
+}
+
+export async function awsApiRequestREST(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, service: string, method: string, path: string, body?: string, query: IDataObject = {}, headers?: object, options: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any
+	const response = await awsApiRequest.call(this, service, method, path, body, query, headers, options, region);
+	try {
+		return JSON.parse(response);
+	} catch (e) {
+		return response;
+	}
+}
+
+export async function awsApiRequestSOAP(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string | Buffer | IDataObject, query: IDataObject = {}, headers?: object, option: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any
+	const response = await awsApiRequest.call(this, service, method, path, body, query, headers, option, region);
+	try {
+		return await new Promise((resolve, reject) => {
+			parseString(response, { explicitArray: false }, (err, data) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(data);
+			});
+		});
+	} catch (e) {
+		return e;
+	}
+}
+
+export async function awsApiRequestSOAPAllItems(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, propertyName: string, service: string, method: string, path: string, body?: string, query: IDataObject = {}, headers: IDataObject = {},  option: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	do {
+		responseData = await awsApiRequestSOAP.call(this, service, method, path, body, query, headers, option, region);
+
+		//https://forums.aws.amazon.com/thread.jspa?threadID=55746
+		if (get(responseData, `${propertyName.split('.')[0]}.NextContinuationToken`)) {
+			query['continuation-token'] = get(responseData, `${propertyName.split('.')[0]}.NextContinuationToken`);
+		}
+		if (get(responseData, propertyName)) {
+			if (Array.isArray(get(responseData, propertyName))) {
+				returnData.push.apply(returnData, get(responseData, propertyName));
+			} else {
+				returnData.push(get(responseData, propertyName));
+			}
+		}
+		if (query.limit && query.limit <= returnData.length) {
+			return returnData;
+		}
+	} while (
+		get(responseData, `${propertyName.split('.')[0]}.IsTruncated`) !== undefined &&
+		get(responseData, `${propertyName.split('.')[0]}.IsTruncated`) !== 'false'
+	);
+
+	return returnData;
+}
+
+function queryToString(params: IDataObject) {
+	return Object.keys(params).map(key => key + '=' + params[key]).join('&');
+}
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
new file mode 100644
index 000000000..00d357a0c
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="2.188" y="2.5"/><symbol id="A" overflow="visible"><g stroke="none"><path d="M2.886 52.8L16.8 51.268V28.732L2.886 27.2v25.6z" fill="#5294cf"/><g fill="#19486f"><path d="M67.207 28.898l-6.462 2.43-36.237-5.346L34.99 0l32.217 28.898z"/><path d="M3.504 28.966L35 12.234 45.543 26 16.81 30.224l-13.305-1.26z"/></g><g fill="#205b99"><path d="M35 24L0 30.624V16.556L35 0l17.016 18.478L35 24z"/><path d="M7.008 16.478L0 19.395v44.05l7.008 3.307V16.478z"/></g><path d="M70 16.566L35 0v24l35 6.624v-14.06z" fill="#5294cf"/><g fill="#99bce3"><path d="M1.154 51.26L34.99 80l10.554-26-28.734-4.224L1.154 51.26z"/><path d="M67.64 51.142l-6.493-2.527-36.64 5.405 10.48 25.22 32.65-28.097z"/></g><path d="M67.207 51.103l-13.965-1.327v-19.55L67.207 28.9v22.205zM35 56l15.13-16L35 24 16.356 40 35 56z" fill="#205b99"/><path d="M53.624 40L35 56V24l18.634 16z" fill="#5294cf"/><path d="M0 49.376L35 56l19.21 7.873L35 80 0 63.444V49.376z" fill="#205b99"/><g fill="#5294cf"><path d="M70 63.435L35 80V56l35-6.624v14.06z"/><path d="M62.97 66.75L70 63.434V16.566l-7.03-3.327V66.75z"/></g></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index 5af9ad3d3..c6d714a89 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -1,7 +1,7 @@
 
 import {
-	snakeCase,
 	paramCase,
+	snakeCase,
 } from 'change-case';
 
 import {
@@ -65,7 +65,7 @@ export class AwsS3 implements INodeType {
 			{
 				name: 'aws',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -105,11 +105,11 @@ export class AwsS3 implements INodeType {
 		const items = this.getInputData();
 		const returnData: IDataObject[] = [];
 		const qs: IDataObject = {};
-		const headers: IDataObject = {};
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0) as string;
 		const operation = this.getNodeParameter('operation', 0) as string;
 		for (let i = 0; i < items.length; i++) {
+			const headers: IDataObject = {};
 			if (resource === 'bucket') {
 				//https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html
 				if (operation === 'create') {
@@ -148,7 +148,7 @@ export class AwsS3 implements INodeType {
 							'$': {
 								xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
 							},
-						}
+						},
 					};
 					let data = '';
 					// if credentials has the S3 defaul region (us-east-1) the body (XML) does not have to be sent.
@@ -282,7 +282,7 @@ export class AwsS3 implements INodeType {
 						for (const childObject of responseData) {
 							//@ts-ignore
 							(body.Delete.Object as IDataObject[]).push({
-								Key: childObject.Key as string
+								Key: childObject.Key as string,
 							});
 						}
 
@@ -526,7 +526,6 @@ export class AwsS3 implements INodeType {
 					if (additionalFields.requesterPays) {
 						headers['x-amz-request-payer'] = 'requester';
 					}
-
 					if (additionalFields.parentFolderKey) {
 						path = `/${additionalFields.parentFolderKey}/`;
 					}
diff --git a/packages/nodes-base/nodes/Aws/S3/FileDescription.ts b/packages/nodes-base/nodes/Aws/S3/FileDescription.ts
index 208b847b3..ffff28c6a 100644
--- a/packages/nodes-base/nodes/Aws/S3/FileDescription.ts
+++ b/packages/nodes-base/nodes/Aws/S3/FileDescription.ts
@@ -113,19 +113,19 @@ export const fileFields = [
 				options: [
 					{
 						name: 'Authenticated Read',
-						value: 'authenticatedRead'
+						value: 'authenticatedRead',
 					},
 					{
 						name: 'AWS Exec Read',
-						value: 'awsExecRead'
+						value: 'awsExecRead',
 					},
 					{
 						name: 'Bucket Owner Full Control',
-						value: 'bucketOwnerFullControl'
+						value: 'bucketOwnerFullControl',
 					},
 					{
 						name: 'Bucket Owner Read',
-						value: 'bucketOwnerRead'
+						value: 'bucketOwnerRead',
 					},
 					{
 						name: 'Private',
@@ -133,15 +133,15 @@ export const fileFields = [
 					},
 					{
 						name: 'Public Read',
-						value: 'publicRead'
+						value: 'publicRead',
 					},
 					{
 						name: 'Public Read Write',
-						value: 'publicReadWrite'
+						value: 'publicReadWrite',
 					},
 				],
 				default: 'private',
-				description: 'The canned ACL to apply to the object.'
+				description: 'The canned ACL to apply to the object.',
 			},
 			{
 				displayName: 'Grant Full Control',
@@ -399,7 +399,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
@@ -416,13 +416,13 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
 				],
 				binaryData: [
-					false
+					false,
 				],
 			},
 		},
@@ -438,13 +438,13 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
 				],
 				binaryData: [
-					true
+					true,
 				],
 			},
 
@@ -476,19 +476,19 @@ export const fileFields = [
 				options: [
 					{
 						name: 'Authenticated Read',
-						value: 'authenticatedRead'
+						value: 'authenticatedRead',
 					},
 					{
 						name: 'AWS Exec Read',
-						value: 'awsExecRead'
+						value: 'awsExecRead',
 					},
 					{
 						name: 'Bucket Owner Full Control',
-						value: 'bucketOwnerFullControl'
+						value: 'bucketOwnerFullControl',
 					},
 					{
 						name: 'Bucket Owner Read',
-						value: 'bucketOwnerRead'
+						value: 'bucketOwnerRead',
 					},
 					{
 						name: 'Private',
@@ -496,15 +496,15 @@ export const fileFields = [
 					},
 					{
 						name: 'Public Read',
-						value: 'publicRead'
+						value: 'publicRead',
 					},
 					{
 						name: 'Public Read Write',
-						value: 'publicReadWrite'
+						value: 'publicReadWrite',
 					},
 				],
 				default: 'private',
-				description: 'The canned ACL to apply to the object.'
+				description: 'The canned ACL to apply to the object.',
 			},
 			{
 				displayName: 'Grant Full Control',
@@ -705,7 +705,7 @@ export const fileFields = [
 						description: '',
 					},
 				],
-			}
+			},
 		],
 		description: 'Optional extra headers to add to the message (most headers are allowed).',
 	},
@@ -755,7 +755,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'download'
+					'download',
 				],
 				resource: [
 					'file',
diff --git a/packages/nodes-base/nodes/Aws/S3/FolderDescription.ts b/packages/nodes-base/nodes/Aws/S3/FolderDescription.ts
index 2884206d6..c36d42b54 100644
--- a/packages/nodes-base/nodes/Aws/S3/FolderDescription.ts
+++ b/packages/nodes-base/nodes/Aws/S3/FolderDescription.ts
@@ -97,7 +97,7 @@ export const folderFields = [
 				name: 'parentFolderKey',
 				type: 'string',
 				default: '',
-				description: 'Parent folder you want to create the folder in'
+				description: 'Parent folder you want to create the folder in',
 			},
 			{
 				displayName: 'Requester Pays',
@@ -141,7 +141,7 @@ export const folderFields = [
 					},
 				],
 				default: 'standard',
-				description: 'Amazon S3 storage classes.'
+				description: 'Amazon S3 storage classes.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
new file mode 100644
index 000000000..f4e74520f
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -0,0 +1,850 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	awsApiRequestSOAP,
+	awsApiRequestSOAPAllItems,
+} from './GenericFunctions';
+
+function setParameter(params: string[], base: string, values: string[]) {
+	for (let i = 0; i < values.length; i++) {
+		params.push(`${base}.${i+1}=${values[i]}`);
+	}
+}
+
+export class AwsSes implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'AWS SES',
+		name: 'awsSes',
+		icon: 'file:ses.png',
+		group: ['output'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Sends data to AWS SES',
+		defaults: {
+			name: 'AWS SES',
+			color: '#FF9900',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'aws',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Email',
+						value: 'email',
+					},
+					{
+						name: 'Template',
+						value: 'template',
+					},
+				],
+				default: 'email',
+				description: 'The operation to perform.',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Send',
+						value: 'send',
+					},
+					{
+						name: 'Send Template',
+						value: 'sendTemplate',
+					},
+				],
+				default: 'send',
+				description: 'The operation to perform.',
+			},
+			{
+				displayName: 'Is Body HTML',
+				name: 'isBodyHtml',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'send',
+						],
+					},
+				},
+				default: false,
+				description: 'If body is HTML or simple text.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'send',
+						],
+					},
+				},
+				default: '',
+				required: true,
+			},
+			{
+				displayName: 'Body',
+				name: 'body',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'send',
+						],
+					},
+				},
+				default: '',
+				description: 'The message to be sent.',
+				required: true,
+			},
+			{
+				displayName: 'From Email',
+				name: 'fromEmail',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'send',
+						],
+					},
+				},
+				required: true,
+				description: 'Email address of the sender.',
+				placeholder: 'admin@example.com',
+				default: '',
+			},
+			{
+				displayName: 'To Addresses',
+				name: 'toAddresses',
+				type: 'string',
+				description: 'Email addresses of the recipients.',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add To Email',
+				},
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'send',
+						],
+					},
+				},
+				placeholder: 'info@example.com',
+				default: [],
+			},
+			{
+				displayName: 'Template Name',
+				name: 'templateName',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTemplates',
+				},
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'sendTemplate',
+						],
+					},
+				},
+				default: '',
+				description: 'The ARN of the template to use when sending this email',
+			},
+			{
+				displayName: 'From Email',
+				name: 'fromEmail',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'sendTemplate',
+						],
+					},
+				},
+				required: true,
+				description: 'Email address of the sender.',
+				placeholder: 'admin@example.com',
+				default: '',
+			},
+			{
+				displayName: 'To Addresses',
+				name: 'toAddresses',
+				type: 'string',
+				description: 'Email addresses of the recipients.',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add To Email',
+				},
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'sendTemplate',
+						],
+					},
+				},
+				placeholder: 'info@example.com',
+				default: [],
+			},
+			{
+				displayName: 'Template Data',
+				name: 'templateDataUi',
+				type: 'fixedCollection',
+				placeholder: 'Add Data',
+				typeOptions: {
+					multipleValues: true,
+				},
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'sendTemplate',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Data',
+						name: 'templateDataValues',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'send',
+							'sendTemplate',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Bcc Addresses',
+						name: 'bccAddresses',
+						type: 'string',
+						typeOptions: {
+							multipleValues: true,
+							multipleValueButtonText: 'Add Bcc Email',
+						},
+						description: 'Bcc Recipients of the email.',
+						default: [],
+					},
+					{
+						displayName: 'Cc Addresses',
+						name: 'ccAddresses',
+						type: 'string',
+						typeOptions: {
+							multipleValues: true,
+							multipleValueButtonText: 'Add Cc Email',
+						},
+						description: 'Cc recipients of the email.',
+						default: [],
+					},
+					{
+						displayName: 'Configuration Set Name',
+						name: 'configurationSetName',
+						type: 'string',
+						description: 'Name of the configuration set to use when you send an email using send.',
+						default: '',
+					},
+					{
+						displayName: 'Reply To Addresses',
+						name: 'replyToAddresses',
+						type: 'string',
+						typeOptions: {
+							multipleValues: true,
+							multipleValueButtonText: 'Add Reply To Email',
+						},
+						placeholder: 'Add Reply Address',
+						description: 'Reply-to email address(es) for the message.',
+						default: [],
+					},
+					{
+						displayName: 'Return Path',
+						name: 'returnPath',
+						type: 'string',
+						description: 'Email address that bounces and complaints will be forwarded to when feedback forwarding is enabled',
+						default: '',
+					},
+					{
+						displayName: 'Return Path ARN',
+						name: 'returnPathArn',
+						type: 'string',
+						default: '',
+						description: 'This parameter is used only for sending authorization',
+					},
+					{
+						displayName: 'Source ARN',
+						name: 'sourceArn',
+						type: 'string',
+						description: 'This parameter is used only for sending authorization.',
+						default: '',
+					},
+				],
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'template',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Create',
+						value: 'create',
+						description: 'Create a template',
+					},
+					{
+						name: 'Delete',
+						value: 'delete',
+						description: 'Delete a template',
+					},
+					{
+						name: 'Get',
+						value: 'get',
+						description: 'Get a template',
+					},
+					{
+						name: 'Get All',
+						value: 'getAll',
+						description: 'Get all templates',
+					},
+					{
+						name: 'Update',
+						value: 'update',
+						description: 'Update a template',
+					},
+				],
+				default: 'create',
+				description: 'The operation to perform.',
+			},
+			{
+				displayName: 'Template Name',
+				name: 'templateName',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'template',
+						],
+						operation: [
+							'update',
+							'create',
+							'get',
+							'delete',
+						],
+					},
+				},
+				required: true,
+				description: 'The name of the template.',
+				default: '',
+			},
+			{
+				displayName: 'Subject Part',
+				name: 'subjectPart',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'template',
+						],
+						operation: [
+							'create',
+						],
+					},
+				},
+				description: 'The subject line of the email.',
+				default: '',
+			},
+			{
+				displayName: 'Html Part',
+				name: 'htmlPart',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'template',
+						],
+						operation: [
+							'create',
+						],
+					},
+				},
+				description: 'The HTML body of the email.',
+				default: '',
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						resource: [
+							'template',
+						],
+						operation: [
+							'create',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Text Part',
+						name: 'textPart',
+						type: 'string',
+						description: 'The email body that will be visible to recipients whose email clients do not display HTML.',
+						default: '',
+					},
+				],
+			},
+			{
+				displayName: 'Update Fields',
+				name: 'updateFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						resource: [
+							'template',
+						],
+						operation: [
+							'update',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Text Part',
+						name: 'textPart',
+						type: 'string',
+						description: 'The email body that will be visible to recipients whose email clients do not display HTML.',
+						default: '',
+					},
+					{
+						displayName: 'Subject Part',
+						name: 'subjectPart',
+						type: 'string',
+						description: 'The subject line of the email.',
+						default: '',
+					},
+					{
+						displayName: 'Html Part',
+						name: 'htmlPart',
+						type: 'string',
+						description: 'The HTML body of the email.',
+						default: '',
+					},
+				],
+			},
+			{
+				displayName: 'Return All',
+				name: 'returnAll',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						resource: [
+							'template',
+						],
+						operation: [
+							'getAll',
+						],
+					},
+				},
+				default: false,
+				description: 'If all results should be returned or only up to a given limit.',
+			},
+			{
+				displayName: 'Limit',
+				name: 'limit',
+				type: 'number',
+				default: 20,
+				displayOptions: {
+					show: {
+						resource: [
+							'template',
+						],
+						operation: [
+							'getAll',
+						],
+						returnAll: [
+							false,
+						],
+					},
+				},
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			// Get all the available templates to display them to user so that he can
+			// select them easily
+			async getTemplates(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const templates = await awsApiRequestSOAPAllItems.call(this, 'ListTemplatesResponse.ListTemplatesResult.TemplatesMetadata.member', 'email', 'POST', '/?Action=ListTemplates');
+
+				for (const template of templates) {
+					const templateName = template.Name;
+					const templateId = template.Name;
+
+					returnData.push({
+						name: templateName,
+						value: templateId,
+					});
+				}
+
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		for (let i = 0; i < items.length; i++) {
+
+			if (resource === 'email') {
+
+				if (operation === 'send') {
+
+					const toAddresses = this.getNodeParameter('toAddresses', i) as string[];
+
+					const message = this.getNodeParameter('body', i) as string;
+
+					const subject = this.getNodeParameter('subject', i) as string;
+
+					const fromEmail = this.getNodeParameter('fromEmail', i) as string;
+
+					const isBodyHtml = this.getNodeParameter('isBodyHtml', i) as boolean;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const params = [
+						`Message.Subject.Data=${subject}`,
+						`Source=${fromEmail}`,
+					];
+
+					if (isBodyHtml) {
+						params.push(`Message.Body.Html.Data=${encodeURI(message)}`);
+					} else {
+						params.push(`Message.Body.Text.Data=${encodeURI(message)}`);
+					}
+
+					if (toAddresses.length) {
+						setParameter(params, 'Destination.ToAddresses.member', toAddresses);
+					} else {
+						throw new Error('At least one "To Address" has to be added!');
+					}
+
+					if (additionalFields.configurationSetName) {
+						params.push(`ConfigurationSetName=${additionalFields.configurationSetName}`);
+					}
+
+					if (additionalFields.returnPath) {
+						params.push(`ReturnPath=${additionalFields.returnPath}`);
+					}
+
+					if (additionalFields.returnPathArn) {
+						params.push(`ReturnPathArn=${additionalFields.returnPathArn}`);
+					}
+
+					if (additionalFields.sourceArn) {
+						params.push(`SourceArn=${additionalFields.sourceArn}`);
+					}
+
+					if (additionalFields.replyToAddresses) {
+						setParameter(params, 'ReplyToAddresses.member', additionalFields.replyToAddresses as string[]);
+					}
+
+					if (additionalFields.bccAddresses) {
+						setParameter(params, 'Destination.BccAddresses.member', additionalFields.bccAddresses as string[]);
+					}
+
+					if (additionalFields.ccAddressesUi) {
+						let ccAddresses = (additionalFields.ccAddressesUi as IDataObject).ccAddressesValues as string[];
+						//@ts-ignore
+						ccAddresses = ccAddresses.map(o => o.address);
+						if (ccAddresses) {
+							setParameter(params, 'Destination.CcAddresses.member', ccAddresses);
+						}
+					}
+
+					responseData = await awsApiRequestSOAP.call(this, 'email', 'POST', '/?Action=SendEmail&' + params.join('&'));
+				}
+
+				if (operation === 'sendTemplate') {
+
+					const toAddresses = this.getNodeParameter('toAddresses', i) as string[];
+
+					const template = this.getNodeParameter('templateName', i) as string;
+
+					const fromEmail = this.getNodeParameter('fromEmail', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const templateDataUi = this.getNodeParameter('templateDataUi', i) as IDataObject;
+
+					const params = [
+						`Template=${template}`,
+						`Source=${fromEmail}`,
+					];
+
+					if (toAddresses.length) {
+						setParameter(params, 'Destination.ToAddresses.member', toAddresses);
+					} else {
+						throw new Error('At least one "To Address" has to be added!');
+					}
+
+					if (additionalFields.configurationSetName) {
+						params.push(`ConfigurationSetName=${additionalFields.configurationSetName}`);
+					}
+
+					if (additionalFields.returnPath) {
+						params.push(`ReturnPath=${additionalFields.returnPath}`);
+					}
+
+					if (additionalFields.returnPathArn) {
+						params.push(`ReturnPathArn=${additionalFields.returnPathArn}`);
+					}
+
+					if (additionalFields.sourceArn) {
+						params.push(`SourceArn=${additionalFields.sourceArn}`);
+					}
+
+					if (additionalFields.replyToAddresses) {
+						setParameter(params, 'ReplyToAddresses.member', additionalFields.replyToAddresses as string[]);
+					}
+
+					if (additionalFields.bccAddresses) {
+						setParameter(params, 'Destination.BccAddresses.member', additionalFields.bccAddresses as string[]);
+					}
+
+					if (additionalFields.ccAddressesUi) {
+						let ccAddresses = (additionalFields.ccAddressesUi as IDataObject).ccAddressesValues as string[];
+						//@ts-ignore
+						ccAddresses = ccAddresses.map(o => o.address);
+						if (ccAddresses) {
+							setParameter(params, 'Destination.CcAddresses.member', ccAddresses);
+						}
+					}
+
+					if (templateDataUi) {
+						const templateDataValues = (templateDataUi as IDataObject).templateDataValues as IDataObject[];
+						const templateData: IDataObject = {};
+						if (templateDataValues !== undefined) {
+							for (const templateDataValue of templateDataValues) {
+								//@ts-ignore
+								templateData[templateDataValue.key] = templateDataValue.value;
+							}
+							params.push(`TemplateData=${JSON.stringify(templateData)}`);
+						}
+					}
+
+					responseData = await awsApiRequestSOAP.call(this, 'email', 'POST', '/?Action=SendTemplatedEmail&' + params.join('&'));
+
+					responseData = responseData.SendTemplatedEmailResponse;
+				}
+			}
+
+			if (resource === 'template') {
+
+				if (operation === 'create') {
+
+					const templateName = this.getNodeParameter('templateName', i) as string;
+
+					const subjectPart = this.getNodeParameter('subjectPart', i) as string;
+
+					const htmlPart = this.getNodeParameter('htmlPart', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const params = [
+						`Template.TemplateName=${templateName}`,
+						`Template.SubjectPart=${subjectPart}`,
+						`Template.HtmlPart=<h1>${htmlPart}</h1>`,
+					];
+
+					if (additionalFields.textPart) {
+						params.push(`Template.TextPart=${additionalFields.textPart}`);
+					}
+
+					responseData = await awsApiRequestSOAP.call(this, 'email', 'POST', '/?Action=CreateTemplate&' + params.join('&'));
+
+					responseData = responseData.CreateTemplateResponse;
+				}
+
+				if (operation === 'delete') {
+
+					const templateName = this.getNodeParameter('templateName', i) as string;
+
+					const params = [
+						`TemplateName=${templateName}`,
+					];
+
+					responseData = await awsApiRequestSOAP.call(this, 'email', 'POST', '/?Action=DeleteTemplate&' + params.join('&'));
+
+					responseData = responseData.DeleteTemplateResponse;
+				}
+
+				if (operation === 'get') {
+
+					const templateName = this.getNodeParameter('templateName', i) as string;
+
+					const params = [
+						`TemplateName=${templateName}`,
+					];
+
+					responseData = await awsApiRequestSOAP.call(this, 'email', 'POST', '/?Action=GetTemplate&' + params.join('&'));
+
+					responseData = responseData.GetTemplateResponse;
+				}
+
+				if (operation === 'getAll') {
+
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					if (returnAll === true) {
+						responseData = await awsApiRequestSOAPAllItems.call(this, 'ListTemplatesResponse.ListTemplatesResult.TemplatesMetadata.member', 'email', 'POST', '/?Action=ListTemplates');
+
+					} else {
+						const limit = this.getNodeParameter('limit', i) as number;
+
+						responseData = await awsApiRequestSOAP.call(this, 'email', 'GET', `/?Action=ListTemplates&MaxItems=${limit}`);
+
+						responseData = responseData.ListTemplatesResponse.ListTemplatesResult.TemplatesMetadata.member;
+					}
+				}
+
+				if (operation === 'update') {
+
+					const templateName = this.getNodeParameter('templateName', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const params = [
+						`Template.TemplateName=${templateName}`,
+					];
+
+					if (updateFields.textPart) {
+						params.push(`Template.TextPart=${updateFields.textPart}`);
+					}
+
+					if (updateFields.subjectPart) {
+						params.push(`Template.SubjectPart=${updateFields.subjectPart}`);
+					}
+
+					if (updateFields.subjectPart) {
+						params.push(`Template.HtmlPart=${updateFields.htmlPart}`);
+					}
+
+					responseData = await awsApiRequestSOAP.call(this, 'email', 'POST', '/?Action=UpdateTemplate&' + params.join('&'));
+
+					responseData = responseData.UpdateTemplateResponse;
+				}
+			}
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+
+			} else {
+				returnData.push(responseData as IDataObject);
+			}
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
new file mode 100644
index 000000000..b22ee7ca6
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
@@ -0,0 +1,116 @@
+import {
+	sign,
+} from 'aws4';
+
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	parseString,
+} from 'xml2js';
+
+import {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+import {
+	get,
+} from 'lodash';
+
+export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string, headers?: object): Promise<any> { // tslint:disable-line:no-any
+	const credentials = this.getCredentials('aws');
+	if (credentials === undefined) {
+		throw new Error('No credentials got returned!');
+	}
+
+	const endpoint = `${service}.${credentials.region}.amazonaws.com`;
+
+	// Sign AWS API request with the user credentials
+	const signOpts = { headers: headers || {}, host: endpoint, method, path, body };
+	sign(signOpts, { accessKeyId: `${credentials.accessKeyId}`.trim(), secretAccessKey: `${credentials.secretAccessKey}`.trim() });
+
+	const options: OptionsWithUri = {
+		headers: signOpts.headers,
+		method,
+		uri: `https://${endpoint}${signOpts.path}`,
+		body: signOpts.body,
+	};
+
+	try {
+		return await this.helpers.request!(options);
+	} catch (error) {
+		const errorMessage = error.response.body.message || error.response.body.Message || error.message;
+
+		if (error.statusCode === 403) {
+			if (errorMessage === 'The security token included in the request is invalid.') {
+				throw new Error('The AWS credentials are not valid!');
+			} else if (errorMessage.startsWith('The request signature we calculated does not match the signature you provided')) {
+				throw new Error('The AWS credentials are not valid!');
+			}
+		}
+
+		throw new Error(`AWS error response [${error.statusCode}]: ${errorMessage}`);
+	}
+}
+
+export async function awsApiRequestREST(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, service: string, method: string, path: string, body?: string, headers?: object): Promise<any> { // tslint:disable-line:no-any
+	const response = await awsApiRequest.call(this, service, method, path, body, headers);
+	try {
+		return JSON.parse(response);
+	} catch (e) {
+		return response;
+	}
+}
+
+export async function awsApiRequestSOAP(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string, headers?: object): Promise<any> { // tslint:disable-line:no-any
+	const response = await awsApiRequest.call(this, service, method, path, body, headers);
+	try {
+		return await new Promise((resolve, reject) => {
+			parseString(response, { explicitArray: false }, (err, data) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(data);
+			});
+		});
+	} catch (e) {
+		return response;
+	}
+}
+
+
+export async function awsApiRequestSOAPAllItems(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, propertyName: string, service: string, method: string, path: string, body?: string, query: IDataObject = {}, headers: IDataObject = {},  option: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	const propertyNameArray = propertyName.split('.');
+
+	do {
+		responseData = await awsApiRequestSOAP.call(this, service, method, path, body, query);
+
+		if (get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`)) {
+			query['NextToken'] = get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`);
+		}
+		if (get(responseData, propertyName)) {
+			if (Array.isArray(get(responseData, propertyName))) {
+				returnData.push.apply(returnData, get(responseData, propertyName));
+			} else {
+				returnData.push(get(responseData, propertyName));
+			}
+		}
+	} while (
+		get(responseData, `${propertyNameArray[0]}.${propertyNameArray[1]}.NextToken`) !== undefined
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Aws/ses.png b/packages/nodes-base/nodes/Aws/SES/ses.png
similarity index 100%
rename from packages/nodes-base/nodes/Aws/ses.png
rename to packages/nodes-base/nodes/Aws/SES/ses.png
diff --git a/packages/nodes-base/nodes/Bannerbear/ImageDescription.ts b/packages/nodes-base/nodes/Bannerbear/ImageDescription.ts
index 223368d92..d88aaa0a3 100644
--- a/packages/nodes-base/nodes/Bannerbear/ImageDescription.ts
+++ b/packages/nodes-base/nodes/Bannerbear/ImageDescription.ts
@@ -181,7 +181,7 @@ export const imageFields = [
 						type: 'string',
 						default: '',
 						description: 'Replacement image url you want to use (must be publicly viewable)',
-					}
+					},
 				],
 			},
 		],
@@ -202,7 +202,7 @@ export const imageFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the image.',
diff --git a/packages/nodes-base/nodes/Bannerbear/TemplateDescription.ts b/packages/nodes-base/nodes/Bannerbear/TemplateDescription.ts
index 692fb1a34..034f78723 100644
--- a/packages/nodes-base/nodes/Bannerbear/TemplateDescription.ts
+++ b/packages/nodes-base/nodes/Bannerbear/TemplateDescription.ts
@@ -49,7 +49,7 @@ export const templateFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the template.',
diff --git a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
index 55488c9fd..6fa13fad2 100644
--- a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
+++ b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
@@ -6,9 +6,9 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	INodePropertyOptions,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -35,7 +35,7 @@ export class BitbucketTrigger implements INodeType {
 			{
 				name: 'bitbucketApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
@@ -75,9 +75,9 @@ export class BitbucketTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'user'
-						]
-					}
+							'user',
+						],
+					},
 				},
 				typeOptions: {
 					loadOptionsMethod: 'getUsersEvents',
@@ -94,9 +94,9 @@ export class BitbucketTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'team'
-						]
-					}
+							'team',
+						],
+					},
 				},
 				typeOptions: {
 					loadOptionsMethod: 'getTeams',
@@ -112,9 +112,9 @@ export class BitbucketTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'team'
-						]
-					}
+							'team',
+						],
+					},
 				},
 				typeOptions: {
 					loadOptionsMethod: 'getTeamEvents',
@@ -131,9 +131,9 @@ export class BitbucketTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'repository'
-						]
-					}
+							'repository',
+						],
+					},
 				},
 				typeOptions: {
 					loadOptionsMethod: 'getRepositories',
@@ -149,9 +149,9 @@ export class BitbucketTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'repository'
-						]
-					}
+							'repository',
+						],
+					},
 				},
 				typeOptions: {
 					loadOptionsMethod: 'getRepositoriesEvents',
@@ -351,7 +351,7 @@ export class BitbucketTrigger implements INodeType {
 		}
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
index 5f9c78446..4963f2c10 100644
--- a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
@@ -21,7 +21,7 @@ export async function bitbucketApiRequest(this: IHookFunctions | IExecuteFunctio
 		qs,
 		body,
 		uri: uri ||`https://api.bitbucket.org/2.0${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.ts b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
index d712238ef..3781a4cb1 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.ts
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
@@ -4,11 +4,11 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
index b44a894ad..b12da3393 100644
--- a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
@@ -21,7 +21,7 @@ export async function bitlyApiRequest(this: IHookFunctions | IExecuteFunctions |
 		qs,
 		body,
 		uri: uri ||`https://api-ssl.bitly.com/v4${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Bitly/LinkDescription.ts b/packages/nodes-base/nodes/Bitly/LinkDescription.ts
index 50fd5268c..5fbd0a6be 100644
--- a/packages/nodes-base/nodes/Bitly/LinkDescription.ts
+++ b/packages/nodes-base/nodes/Bitly/LinkDescription.ts
@@ -98,7 +98,7 @@ export const linkFields = [
 					loadOptionsMethod: 'getTags',
 					loadOptionsDependsOn: [
 						'group',
-					]
+					],
 				},
 			},
 			{
@@ -157,7 +157,7 @@ export const linkFields = [
 						type: 'string',
 						default: '',
 					},
-				]
+				],
 			},
 		],
 	},
@@ -229,7 +229,7 @@ export const linkFields = [
 					loadOptionsMethod: 'getTags',
 					loadOptionsDependsOn: [
 						'group',
-					]
+					],
 				},
 			},
 			{
@@ -288,7 +288,7 @@ export const linkFields = [
 						type: 'string',
 						default: '',
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index 374a79612..4483c4e38 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -4,11 +4,11 @@ import {
 } from 'n8n-core';
 
 import {
+	IBinaryKeyData,
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
-	IBinaryKeyData,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
index 7bcb3d507..26227f948 100644
--- a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
+++ b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
@@ -4,8 +4,8 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -275,8 +275,6 @@ export class BoxTrigger implements INodeType {
 				const endpoint = '/webhooks';
 				const webhooks = await boxApiRequestAllItems.call(this, 'entries', 'GET', endpoint, {});
 
-				console.log(webhooks);
-
 				for (const webhook of webhooks) {
 					if (webhook.address === webhookUrl &&
 						webhook.target.id === targetId &&
@@ -308,7 +306,7 @@ export class BoxTrigger implements INodeType {
 					target: {
 						id: targetId,
 						type: targetType,
-					}
+					},
 				};
 
 				const responseData = await boxApiRequest.call(this, 'POST', endpoint, body);
@@ -347,7 +345,7 @@ export class BoxTrigger implements INodeType {
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(bodyData)
+				this.helpers.returnJsonArray(bodyData),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Box/FileDescription.ts b/packages/nodes-base/nodes/Box/FileDescription.ts
index 8e84fb877..9a3ae0e2c 100644
--- a/packages/nodes-base/nodes/Box/FileDescription.ts
+++ b/packages/nodes-base/nodes/Box/FileDescription.ts
@@ -182,7 +182,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'download'
+					'download',
 				],
 				resource: [
 					'file',
diff --git a/packages/nodes-base/nodes/Box/GenericFunctions.ts b/packages/nodes-base/nodes/Box/GenericFunctions.ts
index ba0ae1f31..1a586c1df 100644
--- a/packages/nodes-base/nodes/Box/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Box/GenericFunctions.ts
@@ -5,8 +5,8 @@ import {
 import {
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
 	IHookFunctions,
+	ILoadOptionsFunctions,
 } from 'n8n-core';
 
 import {
diff --git a/packages/nodes-base/nodes/Box/box.png b/packages/nodes-base/nodes/Box/box.png
index a85a7fb9f..94cc410a2 100644
Binary files a/packages/nodes-base/nodes/Box/box.png and b/packages/nodes-base/nodes/Box/box.png differ
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index 4a7a471e3..8369ab3eb 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -4,8 +4,8 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
diff --git a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
index 0d4c229d0..464d8a5bf 100644
--- a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
@@ -30,7 +30,7 @@ export async function calendlyApiRequest(this: IExecuteFunctions | IWebhookFunct
 		body,
 		qs: query,
 		uri: uri || `${endpoint}${resource}`,
-		json: true
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.form;
diff --git a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
index 5bbda0ab7..6bce476c8 100644
--- a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
@@ -1,9 +1,9 @@
 import { IExecuteFunctions } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 	NodeParameterValue,
 } from 'n8n-workflow';
 
@@ -41,7 +41,7 @@ export class Chargebee implements INodeType {
 			{
 				name: 'chargebeeApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -103,7 +103,7 @@ export class Chargebee implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'customer',
@@ -185,10 +185,10 @@ export class Chargebee implements INodeType {
 										default: '',
 										description: 'Value of the property to set.',
 									},
-								]
+								],
 							},
 						],
-					}
+					},
 
 				],
 			},
@@ -240,10 +240,10 @@ export class Chargebee implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'list'
+							'list',
 						],
 						resource: [
-							'invoice'
+							'invoice',
 						],
 					},
 				},
@@ -262,10 +262,10 @@ export class Chargebee implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'list'
+							'list',
 						],
 						resource: [
-							'invoice'
+							'invoice',
 						],
 					},
 				},
@@ -281,19 +281,19 @@ export class Chargebee implements INodeType {
 								options: [
 									{
 										name: 'Is',
-										value: 'is'
+										value: 'is',
 									},
 									{
 										name: 'Is Not',
-										value: 'is_not'
+										value: 'is_not',
 									},
 									{
 										name: 'After',
-										value: 'after'
+										value: 'after',
 									},
 									{
 										name: 'Before',
-										value: 'before'
+										value: 'before',
 									},
 
 								],
@@ -307,7 +307,7 @@ export class Chargebee implements INodeType {
 								default: '',
 								description: 'Query date.',
 							},
-						]
+						],
 					},
 					{
 						name: 'total',
@@ -320,27 +320,27 @@ export class Chargebee implements INodeType {
 								options: [
 									{
 										name: 'Is',
-										value: 'is'
+										value: 'is',
 									},
 									{
 										name: 'Is Not',
-										value: 'is_not'
+										value: 'is_not',
 									},
 									{
 										name: 'Greater than',
-										value: 'gt'
+										value: 'gt',
 									},
 									{
 										name: 'Greater equal than',
-										value: 'gte'
+										value: 'gte',
 									},
 									{
 										name: 'Less than',
-										value: 'lt'
+										value: 'lt',
 									},
 									{
 										name: 'Less equal than',
-										value: 'lte'
+										value: 'lte',
 									},
 								],
 								default: 'gt',
@@ -356,7 +356,7 @@ export class Chargebee implements INodeType {
 								default: 0,
 								description: 'Query amount.',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -374,10 +374,10 @@ export class Chargebee implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'pdfUrl'
+							'pdfUrl',
 						],
 						resource: [
-							'invoice'
+							'invoice',
 						],
 					},
 				},
@@ -428,7 +428,7 @@ export class Chargebee implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'cancel'
+							'cancel',
 						],
 						resource: [
 							'subscription',
@@ -444,7 +444,7 @@ export class Chargebee implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'cancel'
+							'cancel',
 						],
 						resource: [
 							'subscription',
@@ -467,7 +467,7 @@ export class Chargebee implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'delete'
+							'delete',
 						],
 						resource: [
 							'subscription',
@@ -610,7 +610,7 @@ export class Chargebee implements INodeType {
 					user: credentials.apiKey as string,
 					pass: '',
 				},
-				json: true
+				json: true,
 			};
 
 			const responseData = await this.helpers.request!(options);
diff --git a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
index e3ad8b9cd..dbc0cfacc 100644
--- a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
@@ -4,8 +4,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -216,7 +216,7 @@ export class ChargebeeTrigger implements INodeType {
 						value: 'card_deleted',
 						description: 'Triggered when a card is deleted for a customer.',
 					},
-				]
+				],
 			},
 		],
 
@@ -238,7 +238,7 @@ export class ChargebeeTrigger implements INodeType {
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
index a15a9511e..da0435953 100644
--- a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
+++ b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
@@ -4,9 +4,9 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -38,7 +38,7 @@ export class CircleCi implements INodeType {
 			{
 				name: 'circleCiApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
index fb30950a1..9548586fd 100644
--- a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
@@ -27,7 +27,7 @@ export async function circleciApiRequest(this: IHookFunctions | IExecuteFunction
 		qs,
 		body,
 		uri: uri ||`https://circleci.com/api/v2${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/CircleCi/circleCi.png b/packages/nodes-base/nodes/CircleCi/circleCi.png
index 1708a6a3d..7b8a5a476 100644
Binary files a/packages/nodes-base/nodes/CircleCi/circleCi.png and b/packages/nodes-base/nodes/CircleCi/circleCi.png differ
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
index 4ed7bbc7d..ba28e8d71 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
@@ -15,8 +15,8 @@ import {
 	companyOperations,
 } from './CompanyDescription';
 import {
-	personOperations,
 	personFields,
+	personOperations,
 } from './PersonDescription';
 
 export class Clearbit implements INodeType {
@@ -38,7 +38,7 @@ export class Clearbit implements INodeType {
 			{
 				name: 'clearbitApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -55,7 +55,7 @@ export class Clearbit implements INodeType {
 						name: 'Person',
 						value: 'person',
 						description: `The Person API lets you retrieve social information associated with an email address,<br/>
-						such as a person’s name, location and Twitter handle.`
+						such as a person’s name, location and Twitter handle.`,
 					},
 				],
 				default: 'company',
diff --git a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
index f516c0dd8..4251bd4a2 100644
--- a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
@@ -18,7 +18,7 @@ export async function clearbitApiRequest(this: IHookFunctions | IExecuteFunction
 		qs,
 		body,
 		uri: uri ||`https://${api}-stream.clearbit.com${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
index ad1fcd119..4b35b0f24 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
@@ -63,9 +63,14 @@ import {
 } from './TaskDependencyDescription';
 
 import {
-	timeTrackingFields,
-	timeTrackingOperations,
-} from './TimeTrackingDescription';
+	timeEntryFields,
+	timeEntryOperations,
+} from './TimeEntryDescription';
+
+import {
+	timeEntryTagFields,
+	timeEntryTagOperations,
+} from './TimeEntryTagDescription';
 
 import {
 	listFields,
@@ -74,11 +79,13 @@ import {
 
 import {
 	ITask,
- } from './TaskInterface';
+} from './TaskInterface';
 
- import {
+import {
 	IList,
- } from './ListInterface';
+} from './ListInterface';
+
+import * as moment from 'moment-timezone';
 
 export class ClickUp implements INodeType {
 	description: INodeTypeDescription = {
@@ -99,9 +106,43 @@ export class ClickUp implements INodeType {
 			{
 				name: 'clickUpApi',
 				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+					},
+				},
+			},
+			{
+				name: 'clickUpOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'accessToken',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -148,8 +189,12 @@ export class ClickUp implements INodeType {
 						value: 'taskDependency',
 					},
 					{
-						name: 'Time Traking',
-						value: 'timeTracking',
+						name: 'Time Entry',
+						value: 'timeEntry',
+					},
+					{
+						name: 'Time Entry Tag',
+						value: 'timeEntryTag',
 					},
 				],
 				default: 'task',
@@ -182,9 +227,13 @@ export class ClickUp implements INodeType {
 			// TASK DEPENDENCY
 			...taskDependencyOperations,
 			...taskDependencyFields,
-			// TIME TRACKING
-			...timeTrackingOperations,
-			...timeTrackingFields,
+			// TIME ENTRY
+			...timeEntryOperations,
+			...timeEntryFields,
+			...taskDependencyFields,
+			// TIME ENTRY TAG
+			...timeEntryTagOperations,
+			...timeEntryTagFields,
 			// LIST
 			...listOperations,
 			...listFields,
@@ -276,8 +325,19 @@ export class ClickUp implements INodeType {
 			// select them easily
 			async getAssignees(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const listId = this.getCurrentNodeParameter('list') as string;
+				const taskId = this.getCurrentNodeParameter('task') as string;
 				const returnData: INodePropertyOptions[] = [];
-				const { members } = await clickupApiRequest.call(this, 'GET', `/list/${listId}/member`);
+				let url: string;
+				if (listId) {
+					url = `/list/${listId}/member`;
+				}
+				else if (taskId) {
+					url = `/task/${taskId}/member`;
+				} else {
+					return returnData;
+				}
+
+				const { members } = await clickupApiRequest.call(this, 'GET', url);
 				for (const member of members) {
 					const memberName = member.username;
 					const menberId = member.id;
@@ -295,6 +355,7 @@ export class ClickUp implements INodeType {
 				const returnData: INodePropertyOptions[] = [];
 				const { tags } = await clickupApiRequest.call(this, 'GET', `/space/${spaceId}/tag`);
 				for (const tag of tags) {
+					console.log(tag);
 					const tagName = tag.name;
 					const tagId = tag.name;
 					returnData.push({
@@ -306,6 +367,22 @@ export class ClickUp implements INodeType {
 			},
 			// Get all the available tags to display them to user so that he can
 			// select them easily
+			async getTimeEntryTags(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const teamId = this.getCurrentNodeParameter('team') as string;
+				const returnData: INodePropertyOptions[] = [];
+				const { data: tags } = await clickupApiRequest.call(this, 'GET', `/team/${teamId}/time_entries/tags`);
+				for (const tag of tags) {
+					const tagName = tag.name;
+					const tagId = JSON.stringify(tag);
+					returnData.push({
+						name: tagName,
+						value: tagId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the available tags to display them to user so that he can
+			// select them easily
 			async getStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const listId = this.getCurrentNodeParameter('list') as string;
 				const returnData: INodePropertyOptions[] = [];
@@ -337,6 +414,24 @@ export class ClickUp implements INodeType {
 				}
 				return returnData;
 			},
+
+			// Get all the available lists to display them to user so that he can
+			// select them easily
+			async getTasks(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const listId = this.getCurrentNodeParameter('list') as string;
+				const archived = this.getCurrentNodeParameter('archived') as string;
+				const returnData: INodePropertyOptions[] = [];
+				const { tasks } = await clickupApiRequest.call(this, 'GET', `/list/${listId}/task?archived=${archived}`);
+				for (const task of tasks) {
+					const taskName = task.name;
+					const taskId = task.id;
+					returnData.push({
+						name: taskName,
+						value: taskId,
+					});
+				}
+				return returnData;
+			},
 		},
 	};
 
@@ -593,9 +688,9 @@ export class ClickUp implements INodeType {
 						}
 					}
 					if (type === 'number' || type === 'percentaje'
-					|| type === 'automatic' || type === 'currency' ) {
-						if (additionalFields.stepsStart  === undefined
-						|| !additionalFields.stepsEnd === undefined) {
+						|| type === 'automatic' || type === 'currency') {
+						if (additionalFields.stepsStart === undefined
+							|| !additionalFields.stepsEnd === undefined) {
 							throw new Error('Steps start and steps end fields must be set');
 						}
 					}
@@ -710,7 +805,7 @@ export class ClickUp implements INodeType {
 					const name = this.getNodeParameter('name', i) as string;
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					const body: ITask = {
-							name,
+						name,
 					};
 					if (additionalFields.customFieldsJson) {
 						const customFields = validateJSON(additionalFields.customFieldsJson as string);
@@ -949,52 +1044,157 @@ export class ClickUp implements INodeType {
 					responseData = { success: true };
 				}
 			}
-			if (resource === 'timeTracking') {
-				if (operation === 'log') {
-					const taskId = this.getNodeParameter('task', i) as string;
-					const type = this.getNodeParameter('type', i) as string;
+			if (resource === 'timeEntry') {
+				if (operation === 'update') {
+					const teamId = this.getNodeParameter('team', i) as string;
+					const timeEntryId = this.getNodeParameter('timeEntry', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const timezone = this.getTimezone();
 					const body: IDataObject = {};
-					if (type === 'fromTo') {
-						const from = new Date(this.getNodeParameter('from', i) as string).getTime();
-						const to = new Date(this.getNodeParameter('to', i) as string).getTime();
-						body.from = from;
-						body.to = to;
-					} else {
-						const minutes = this.getNodeParameter('minutes', i) as number;
-						body.time = minutes * 60000;
+					Object.assign(body, updateFields);
+
+					if (body.start) {
+						body.start = moment.tz(body.start, timezone).valueOf();
+					}
+
+					if (body.duration) {
+						body.duration = body.duration as number * 60000;
+					}
+
+					if (body.task) {
+						body.tid = body.task;
+						body.custom_task_ids = true;
+					}
+
+					responseData = await clickupApiRequest.call(this, 'PUT', `/team/${teamId}/time_entries/${timeEntryId}`, body);
+					responseData = responseData.data;
+				}
+				if (operation === 'getAll') {
+					const teamId = this.getNodeParameter('team', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const filters = this.getNodeParameter('filters', i) as IDataObject;
+					const timezone = this.getTimezone();
+					Object.assign(qs, filters);
+
+					if (filters.start_date) {
+						qs.start_date = moment.tz(qs.start_date, timezone).valueOf();
+					}
+					if (filters.end_date) {
+						qs.end_date = moment.tz(qs.end_date, timezone).valueOf();
+					}
+					responseData = await clickupApiRequest.call(this, 'GET', `/team/${teamId}/time_entries`, {}, qs);
+
+					responseData = responseData.data;
+
+					if (returnAll === false) {
+						const limit = this.getNodeParameter('limit', i) as number;
+						responseData = responseData.splice(0, limit);
+					}
+
+				}
+				if (operation === 'get') {
+					const teamId = this.getNodeParameter('team', i) as string;
+					const running = this.getNodeParameter('running', i) as boolean;
+
+					let endpoint = `/team/${teamId}/time_entries/current`;
+
+					if (running === false) {
+						const timeEntryId = this.getNodeParameter('timeEntry', i) as string;
+						endpoint = `/team/${teamId}/time_entries/${timeEntryId}`;
+					}
+
+					responseData = await clickupApiRequest.call(this, 'GET', endpoint);
+					responseData = responseData.data;
+				}
+				if (operation === 'create') {
+					const teamId = this.getNodeParameter('team', i) as string;
+					const taskId = this.getNodeParameter('task', i) as string;
+					const start = this.getNodeParameter('start', i) as string;
+					const duration = this.getNodeParameter('duration', i) as number;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					const timezone = this.getTimezone();
+					const body: IDataObject = {
+						start: moment.tz(start, timezone).valueOf(),
+						duration: duration * 60000,
+						tid: taskId,
+					};
+					Object.assign(body, additionalFields);
+
+					if (body.tags) {
+						body.tags = (body.tags as string[]).map((tag) => (JSON.parse(tag)));
+					}
+
+					responseData = await clickupApiRequest.call(this, 'POST', `/team/${teamId}/time_entries`, body);
+					responseData = responseData.data;
+				}
+				if (operation === 'start') {
+					const teamId = this.getNodeParameter('team', i) as string;
+					const taskId = this.getNodeParameter('task', i) as string;
+					const body: IDataObject = {};
+					body.tid = taskId;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					Object.assign(body, additionalFields);
+					responseData = await clickupApiRequest.call(this, 'POST', `/team/${teamId}/time_entries/start`, body);
+					responseData = responseData.data;
+				}
+				if (operation === 'stop') {
+					const teamId = this.getNodeParameter('team', i) as string;
+					responseData = await clickupApiRequest.call(this, 'POST', `/team/${teamId}/time_entries/stop`);
+
+					if (responseData.data) {
+						responseData = responseData.data;
+					} else {
+						throw new Error('There seems to be nothing to stop.');
 					}
-					responseData = await clickupApiRequest.call(this, 'POST', `/task/${taskId}/time`, body);
 				}
 				if (operation === 'delete') {
-					const taskId = this.getNodeParameter('task', i) as string;
-					const intervalId = this.getNodeParameter('interval', i) as string;
-					responseData = await clickupApiRequest.call(this, 'DELETE', `/task/${taskId}/time/${intervalId}`);
+					const teamId = this.getNodeParameter('team', i) as string;
+					const timeEntryId = this.getNodeParameter('timeEntry', i) as string;
+					responseData = await clickupApiRequest.call(this, 'DELETE', `/team/${teamId}/time_entries/${timeEntryId}`);
+					responseData = responseData.data;
+				}
+			}
+			if (resource === 'timeEntryTag') {
+				if (operation === 'add') {
+					const teamId = this.getNodeParameter('team', i) as string;
+					const timeEntryIds = this.getNodeParameter('timeEntryIds', i) as string;
+					const tagsUi = this.getNodeParameter('tagsUi', i) as IDataObject;
+					const body: IDataObject = {};
+					body.time_entry_ids = timeEntryIds.split(',');
+					if (tagsUi) {
+						const tags = (tagsUi as IDataObject).tagsValues as IDataObject[];
+						if (tags === undefined) {
+							throw new Error('At least one tag must be set');
+						}
+						body.tags = tags;
+					}
+					responseData = await clickupApiRequest.call(this, 'POST', `/team/${teamId}/time_entries/tags`, body);
 					responseData = { success: true };
 				}
 				if (operation === 'getAll') {
-					const taskId = this.getNodeParameter('task', i) as string;
-					qs.limit = this.getNodeParameter('limit', i) as number;
-					responseData = await clickupApiRequest.call(this, 'GET', `/task/${taskId}/time`, {}, qs);
+					const teamId = this.getNodeParameter('team', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					responseData = await clickupApiRequest.call(this, 'GET', `/team/${teamId}/time_entries/tags`);
+
 					responseData = responseData.data;
-					responseData = responseData.splice(0, qs.limit);
-				}
-				if (operation === 'update') {
-					const taskId = this.getNodeParameter('task', i) as string;
-					const intervalId = this.getNodeParameter('interval', i) as string;
-					const type = this.getNodeParameter('type', i) as string;
-					const body: IDataObject = {};
-					if (type === 'fromTo') {
-						const from = new Date(this.getNodeParameter('from', i) as string).getTime();
-						const to = new Date(this.getNodeParameter('to', i) as string).getTime();
-						body.from = from;
-						body.to = to;
-					} else {
-						const minutes = this.getNodeParameter('minutes', i) as number;
-						body.time = minutes * 60000;
+
+					if (returnAll === false) {
+						const limit = this.getNodeParameter('limit', i) as number;
+						responseData = responseData.splice(0, limit);
 					}
-					responseData = await clickupApiRequest.call(this, 'PUT', `/task/${taskId}/time/${intervalId}`, body);
+
+				}
+				if (operation === 'remove') {
+					const teamId = this.getNodeParameter('team', i) as string;
+					const timeEntryIds = this.getNodeParameter('timeEntryIds', i) as string;
+					const tagNames = this.getNodeParameter('tagNames', i) as string[];
+					const body: IDataObject = {};
+					body.time_entry_ids = timeEntryIds.split(',');
+					body.tags = tagNames.map((tag) => (JSON.parse(tag).name));
+					responseData = await clickupApiRequest.call(this, 'DELETE', `/team/${teamId}/time_entries/tags`, body);
 					responseData = { success: true };
 				}
+
 			}
 			if (resource === 'list') {
 				if (operation === 'create') {
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
index 36d523313..2e9bb24eb 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
@@ -36,7 +36,25 @@ export class ClickUpTrigger implements INodeType {
 			{
 				name: 'clickUpApi',
 				required: true,
-			}
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+					},
+				},
+			},
+			{
+				name: 'clickUpOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
+			},
 		],
 		webhooks: [
 			{
@@ -47,6 +65,22 @@ export class ClickUpTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'accessToken',
+			},
 			{
 				displayName: 'Team',
 				name: 'team',
diff --git a/packages/nodes-base/nodes/ClickUp/FolderDescription.ts b/packages/nodes-base/nodes/ClickUp/FolderDescription.ts
index af9803c13..327ae830e 100644
--- a/packages/nodes-base/nodes/ClickUp/FolderDescription.ts
+++ b/packages/nodes-base/nodes/ClickUp/FolderDescription.ts
@@ -90,7 +90,7 @@ export const folderFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -153,7 +153,7 @@ export const folderFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -222,7 +222,7 @@ export const folderFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -291,7 +291,7 @@ export const folderFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -383,7 +383,7 @@ export const folderFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
diff --git a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
index d836f7798..79409e69c 100644
--- a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
@@ -12,34 +12,53 @@ import {
 
 import {
 	IDataObject,
+	IOAuth2Options,
  } from 'n8n-workflow';
 
 export async function clickupApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-	const credentials = this.getCredentials('clickUpApi');
-	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
-	}
-
 	const options: OptionsWithUri = {
 		headers: {
-			Authorization: credentials.accessToken,
 			'Content-Type': 'application/json',
 		},
 		method,
 		qs,
 		body,
 		uri: uri ||`https://api.clickup.com/api/v2${resource}`,
-		json: true
+		json: true,
 	};
+
 	try {
-		return await this.helpers.request!(options);
-	} catch (error) {
+		const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
+
+		if (authenticationMethod === 'accessToken') {
+
+			const credentials = this.getCredentials('clickUpApi');
+
+			if (credentials === undefined) {
+				throw new Error('No credentials got returned!');
+			}
+
+			options.headers!['Authorization'] = credentials.accessToken;
+			return await this.helpers.request!(options);
+
+		} else {
+
+			const oAuth2Options: IOAuth2Options = {
+				keepBearer: false,
+				tokenType: 'Bearer',
+			};
+			// @ts-ignore
+			return await this.helpers.requestOAuth2!.call(this, 'clickUpOAuth2Api', options, oAuth2Options);
+		}
+
+	} catch(error) {
 		let errorMessage = error;
 		if (error.err) {
 			errorMessage = error.err;
 		}
 		throw new Error('ClickUp Error: ' + errorMessage);
 	}
+
 }
 
 export async function clickupApiRequestAllItems(this: IHookFunctions | IExecuteFunctions| ILoadOptionsFunctions, propertyName: string ,method: string, resource: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
diff --git a/packages/nodes-base/nodes/ClickUp/ListDescription.ts b/packages/nodes-base/nodes/ClickUp/ListDescription.ts
index ed1de017c..0c28a1d90 100644
--- a/packages/nodes-base/nodes/ClickUp/ListDescription.ts
+++ b/packages/nodes-base/nodes/ClickUp/ListDescription.ts
@@ -100,7 +100,7 @@ export const listFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -337,7 +337,7 @@ export const listFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'teamId',
-			]
+			],
 		},
 		required: true,
 	},
@@ -432,7 +432,7 @@ export const listFields = [
 			loadOptionsMethod: 'getLists',
 			loadOptionsDependsOn: [
 				'folder',
-			]
+			],
 		},
 		required: true,
 	},
@@ -478,7 +478,7 @@ export const listFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -584,7 +584,7 @@ export const listFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -690,7 +690,7 @@ export const listFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -825,7 +825,7 @@ export const listFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
diff --git a/packages/nodes-base/nodes/ClickUp/TaskDescription.ts b/packages/nodes-base/nodes/ClickUp/TaskDescription.ts
index 0d0d9e265..ef80c9565 100644
--- a/packages/nodes-base/nodes/ClickUp/TaskDescription.ts
+++ b/packages/nodes-base/nodes/ClickUp/TaskDescription.ts
@@ -395,7 +395,7 @@ export const taskFields = [
 				name: 'addAssignees',
 				type: 'string',
 				default: '',
-				description: 'Assignees IDs. Multiple ca be added separated by comma'
+				description: 'Assignees IDs. Multiple ca be added separated by comma',
 			},
 			{
 				displayName: 'Content',
@@ -458,14 +458,14 @@ export const taskFields = [
 				name: 'removeAssignees',
 				type: 'string',
 				default: '',
-				description: 'Assignees IDs. Multiple ca be added separated by comma'
+				description: 'Assignees IDs. Multiple ca be added separated by comma',
 			},
 			{
 				displayName: 'Status',
 				name: 'status',
 				type: 'string',
 				default: '',
-				description: 'status'
+				description: 'status',
 			},
 			{
 				displayName: 'Start Date',
@@ -552,7 +552,7 @@ export const taskFields = [
 			loadOptionsMethod: 'getSpaces',
 			loadOptionsDependsOn: [
 				'team',
-			]
+			],
 		},
 		required: true,
 	},
@@ -1053,7 +1053,7 @@ export const taskFields = [
 				],
 				operation: [
 					'setCustomField',
-				]
+				],
 			},
 		},
 		default: false,
diff --git a/packages/nodes-base/nodes/ClickUp/TimeEntryDescription.ts b/packages/nodes-base/nodes/ClickUp/TimeEntryDescription.ts
new file mode 100644
index 000000000..9cb39f734
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/TimeEntryDescription.ts
@@ -0,0 +1,868 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const timeEntryOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a time entry',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a time entry',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a time entry',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all time entries',
+			},
+			{
+				name: 'Start',
+				value: 'start',
+				description: 'Start a time entry',
+			},
+			{
+				name: 'Stop',
+				value: 'stop',
+				description: 'Stop the current running timer',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a time Entry',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const timeEntryFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                timeEntry:getAll                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				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: [
+					'timeEntry',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 10,
+		},
+		default: 5,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'End Date',
+				name: 'end_date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Start Date',
+				name: 'start_date',
+				type: 'dateTime',
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                timeEntry:get                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Running',
+		name: 'running',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		default: false,
+		description: 'When set to true it will return just the current running time entry',
+	},
+	{
+		displayName: 'Time Entry ID',
+		name: 'timeEntry',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'get',
+				],
+				running: [
+					false,
+				],
+			},
+		},
+		required: true,
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                timeEntry:create                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Space ID',
+		name: 'space',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getSpaces',
+			loadOptionsDependsOn: [
+				'team',
+			],
+		},
+		required: true,
+	},
+	{
+		displayName: 'Folderless List',
+		name: 'folderless',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Folder ID',
+		name: 'folder',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+				folderless: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getFolders',
+			loadOptionsDependsOn: [
+				'space',
+			],
+		},
+		required: true,
+	},
+	{
+		displayName: 'List ID',
+		name: 'list',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+				folderless: [
+					true,
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getFolderlessLists',
+			loadOptionsDependsOn: [
+				'space',
+			],
+		},
+		required: true,
+	},
+	{
+		displayName: 'List ID',
+		name: 'list',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+				folderless: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'folder',
+			],
+		},
+		required: true,
+	},
+	{
+		displayName: 'Start',
+		name: 'start',
+		type: 'dateTime',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Duration (minutes)',
+		name: 'duration',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: 0,
+		required: true,
+		description: 'Duration in minutes',
+	},
+	{
+		displayName: 'Task ID',
+		name: 'task',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTasks',
+			loadOptionsDependsOn: [
+				'list',
+			],
+		},
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assignee IDs',
+				name: 'assignee',
+				type: 'options',
+				loadOptionsDependsOn: [
+					'list',
+				],
+				typeOptions: {
+					loadOptionsMethod: 'getAssignees',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Description of the time entry',
+			},
+			{
+				displayName: 'Tags IDs',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'team',
+					],
+					loadOptionsMethod: 'getTimeEntryTags',
+				},
+				default: [],
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                timeEntry:start                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'start',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Task ID',
+		name: 'task',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'start',
+				],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'start',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Description of the time entry',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                timeEntry:stop                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'stop',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                timeEntry:delete                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Time Entry ID',
+		name: 'timeEntry',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		required: true,
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                timeEntry:update                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Space ID',
+		name: 'space',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getSpaces',
+			loadOptionsDependsOn: [
+				'team',
+			],
+		},
+		required: true,
+	},
+	{
+		displayName: 'Folderless List',
+		name: 'folderless',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Folder ID',
+		name: 'folder',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+				folderless: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getFolders',
+			loadOptionsDependsOn: [
+				'space',
+			],
+		},
+		required: true,
+	},
+	{
+		displayName: 'List ID',
+		name: 'list',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+				folderless: [
+					true,
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getFolderlessLists',
+			loadOptionsDependsOn: [
+				'space',
+			],
+		},
+		required: true,
+	},
+	{
+		displayName: 'List ID',
+		name: 'list',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+				folderless: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'folder',
+			],
+		},
+		required: true,
+	},
+	{
+		displayName: 'Archived',
+		name: 'archived',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Time Entry ID',
+		name: 'timeEntry',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assignee IDs',
+				name: 'assignee',
+				type: 'options',
+				loadOptionsDependsOn: [
+					'list',
+				],
+				typeOptions: {
+					loadOptionsMethod: 'getAssignees',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Description of the time entry',
+			},
+			{
+				displayName: 'Duration (minutes)',
+				name: 'duration',
+				type: 'number',
+				default: 0,
+				description: 'Duration in minutes',
+			},
+			{
+				displayName: 'Start',
+				name: 'start',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Tags IDs',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'spaceId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Task ID',
+				name: 'task',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTasks',
+					loadOptionsDependsOn: [
+						'archived',
+						'list',
+					],
+				},
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ClickUp/TimeEntryTagDescription.ts b/packages/nodes-base/nodes/ClickUp/TimeEntryTagDescription.ts
new file mode 100644
index 000000000..1375a53a3
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/TimeEntryTagDescription.ts
@@ -0,0 +1,254 @@
+import {
+	INodeProperties,
+ } from 'n8n-workflow';
+
+export const timeEntryTagOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add tag to time entry',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all time entry tags',
+			},
+			{
+				name: 'Remove',
+				value: 'remove',
+				description:'Remove tag from time entry',
+			},
+		],
+		default: 'add',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const timeEntryTagFields = [
+
+/* -------------------------------------------------------------------------- */
+/*                                timeEntryTag:getAll                         */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+				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: [
+					'timeEntryTag',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 10,
+		},
+		default: 5,
+		description: 'How many results to return.',
+	},
+/* -------------------------------------------------------------------------- */
+/*                                timeEntryTag:add                            */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+				operation: [
+					'add',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Time Entry IDs',
+		name: 'timeEntryIds',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+				operation: [
+					'add',
+				],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Tags',
+		name: 'tagsUi',
+		type: 'fixedCollection',
+		placeholder: 'Add Tag',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+				operation: [
+					'add',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Tag',
+				name: 'tagsValues',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Background Color',
+						name: 'tag_bg',
+						type: 'color',
+						default: '#ff0000',
+					},
+					{
+						displayName: 'Foreground Color',
+						name: 'tag_fg',
+						type: 'color',
+						default: '#ff0000',
+					},
+				],
+			},
+		],
+	},
+/* -------------------------------------------------------------------------- */
+/*                                timeEntryTag:remove                         */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'team',
+		type: 'options',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+				operation: [
+					'remove',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		required: true,
+	},
+	{
+		displayName: 'Time Entry IDs',
+		name: 'timeEntryIds',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+				operation: [
+					'remove',
+				],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Tag Names',
+		name: 'tagNames',
+		type: 'multiOptions',
+		typeOptions: {
+			loadOptionsMethod: 'getTimeEntryTags',
+			loadOptionsDependsOn: [
+				'teamId',
+			],
+		},
+		default: [],
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntryTag',
+				],
+				operation: [
+					'remove',
+				],
+			},
+		},
+		required: true,
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ClickUp/TimeTrackingDescription.ts b/packages/nodes-base/nodes/ClickUp/TimeTrackingDescription.ts
deleted file mode 100644
index 1040a8a6f..000000000
--- a/packages/nodes-base/nodes/ClickUp/TimeTrackingDescription.ts
+++ /dev/null
@@ -1,359 +0,0 @@
-import {
-	INodeProperties,
- } from 'n8n-workflow';
-
-export const timeTrackingOperations = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-			},
-		},
-		options: [
-			{
-				name: 'Log',
-				value: 'log',
-				description: 'Log time on task',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a logged time',
-			},
-			{
-				name: 'Get All',
-				value: 'getAll',
-				description: 'Get all logging times on task',
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a logged time',
-			},
-		],
-		default: 'log',
-		description: 'The operation to perform.',
-	},
-] as INodeProperties[];
-
-export const timeTrackingFields = [
-
-/* -------------------------------------------------------------------------- */
-/*                                timeTracking:log                            */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Task ID',
-		name: 'task',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'log',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'Type',
-		name: 'type',
-		type: 'options',
-		default: '',
-		options: [
-			{
-				name: 'Duration',
-				value: 'duration',
-			},
-			{
-				name: 'From/To',
-				value: 'fromTo',
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'log',
-				],
-			},
-		},
-	},
-	{
-		displayName: 'Minutes',
-		name: 'minutes',
-		type: 'number',
-		typeOptions: {
-			minValue: 0,
-		},
-		default: 0,
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'log',
-				],
-				type: [
-					'duration',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'From',
-		name: 'from',
-		type: 'dateTime',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'log',
-				],
-				type: [
-					'fromTo',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'To',
-		name: 'to',
-		type: 'dateTime',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'log',
-				],
-				type: [
-					'fromTo',
-				],
-			},
-		},
-		required: true,
-	},
-/* -------------------------------------------------------------------------- */
-/*                                timeTracking:delete                         */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Task ID',
-		name: 'task',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'delete',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'Interval ID',
-		name: 'interval',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'delete',
-				],
-			},
-		},
-		required: true,
-	},
-/* -------------------------------------------------------------------------- */
-/*                                timeTracking:getAll                         */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Task ID',
-		name: 'task',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'getAll',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'getAll',
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 100,
-		},
-		default: 50,
-		description: 'How many results to return.',
-	},
-/* -------------------------------------------------------------------------- */
-/*                                timeTracking:update                         */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Task ID',
-		name: 'task',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'Interval ID',
-		name: 'interval',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'Type',
-		name: 'type',
-		type: 'options',
-		default: '',
-		options: [
-			{
-				name: 'Duration',
-				value: 'duration',
-			},
-			{
-				name: 'From/To',
-				value: 'fromTo',
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-	},
-	{
-		displayName: 'Minutes',
-		name: 'minutes',
-		type: 'number',
-		typeOptions: {
-			minValue: 0,
-		},
-		default: 0,
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'update',
-				],
-				type: [
-					'duration',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'From',
-		name: 'from',
-		type: 'dateTime',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'update',
-				],
-				type: [
-					'fromTo',
-				],
-			},
-		},
-		required: true,
-	},
-	{
-		displayName: 'To',
-		name: 'to',
-		type: 'dateTime',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'timeTracking',
-				],
-				operation: [
-					'update',
-				],
-				type: [
-					'fromTo',
-				],
-			},
-		},
-		required: true,
-	},
-] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Clockify/Clockify.node.ts b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
new file mode 100644
index 000000000..9f565fccb
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
@@ -0,0 +1,586 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	clockifyApiRequest,
+	clockifyApiRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	IClientDto,
+	IWorkspaceDto,
+} from './WorkpaceInterfaces';
+
+import {
+	IUserDto,
+} from './UserDtos';
+
+import {
+	IProjectDto,
+} from './ProjectInterfaces';
+
+import {
+	projectFields,
+	projectOperations,
+} from './ProjectDescription';
+
+import {
+	tagFields,
+	tagOperations,
+} from './TagDescription';
+
+import {
+	timeEntryFields,
+	timeEntryOperations,
+} from './TimeEntryDescription';
+
+import * as moment from 'moment-timezone';
+
+export class Clockify implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Clockify',
+		name: 'clockify',
+		icon: 'file:clockify.png',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Clockify REST API',
+		defaults: {
+			name: 'Clockify',
+			color: '#000000',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'clockifyApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Project',
+						value: 'project',
+					},
+					{
+						name: 'Tag',
+						value: 'tag',
+					},
+					{
+						name: 'Time Entry',
+						value: 'timeEntry',
+					},
+				],
+				default: 'project',
+				description: 'The resource to operate on.',
+			},
+			...projectOperations,
+			...tagOperations,
+			...timeEntryOperations,
+			{
+				displayName: 'Workspace ID',
+				name: 'workspaceId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'listWorkspaces',
+				},
+				required: true,
+				default: [],
+			},
+			...projectFields,
+			...tagFields,
+			...timeEntryFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async listWorkspaces(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rtv: INodePropertyOptions[] = [];
+				const workspaces: IWorkspaceDto[] = await clockifyApiRequest.call(this, 'GET', 'workspaces');
+				if (undefined !== workspaces) {
+					workspaces.forEach(value => {
+						rtv.push(
+							{
+								name: value.name,
+								value: value.id,
+							});
+					});
+				}
+				return rtv;
+			},
+			async loadUsersForWorkspace(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rtv: INodePropertyOptions[] = [];
+				const workspaceId = this.getCurrentNodeParameter('workspaceId');
+				if (undefined !== workspaceId) {
+					const resource = `workspaces/${workspaceId}/users`;
+					const users: IUserDto[] = await clockifyApiRequest.call(this, 'GET', resource);
+					if (undefined !== users) {
+						users.forEach(value => {
+							rtv.push(
+								{
+									name: value.name,
+									value: value.id,
+								});
+						});
+					}
+				}
+				return rtv;
+			},
+			async loadClientsForWorkspace(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rtv: INodePropertyOptions[] = [];
+				const workspaceId = this.getCurrentNodeParameter('workspaceId');
+				if (undefined !== workspaceId) {
+					const resource = `workspaces/${workspaceId}/clients`;
+					const clients: IClientDto[] = await clockifyApiRequest.call(this, 'GET', resource);
+					if (undefined !== clients) {
+						clients.forEach(value => {
+							rtv.push(
+								{
+									name: value.name,
+									value: value.id,
+								});
+						});
+					}
+				}
+				return rtv;
+			},
+			async loadProjectsForWorkspace(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rtv: INodePropertyOptions[] = [];
+				const workspaceId = this.getCurrentNodeParameter('workspaceId');
+				if (undefined !== workspaceId) {
+					const resource = `workspaces/${workspaceId}/projects`;
+					const users: IProjectDto[] = await clockifyApiRequest.call(this, 'GET', resource);
+					if (undefined !== users) {
+						users.forEach(value => {
+							rtv.push(
+								{
+									name: value.name,
+									value: value.id,
+								});
+						});
+					}
+				}
+				return rtv;
+			},
+			async loadTagsForWorkspace(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rtv: INodePropertyOptions[] = [];
+				const workspaceId = this.getCurrentNodeParameter('workspaceId');
+				if (undefined !== workspaceId) {
+					const resource = `workspaces/${workspaceId}/tags`;
+					const users: IProjectDto[] = await clockifyApiRequest.call(this, 'GET', resource);
+					if (undefined !== users) {
+						users.forEach(value => {
+							rtv.push(
+								{
+									name: value.name,
+									value: value.id,
+								});
+						});
+					}
+				}
+				return rtv;
+			},
+			async loadCustomFieldsForWorkspace(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rtv: INodePropertyOptions[] = [];
+				const workspaceId = this.getCurrentNodeParameter('workspaceId');
+				if (undefined !== workspaceId) {
+					const resource = `workspaces/${workspaceId}/custom-fields`;
+					const customFields = await clockifyApiRequest.call(this, 'GET', resource);
+					for (const customField of customFields) {
+						rtv.push(
+							{
+								name: customField.name,
+								value: customField.id,
+							});
+					}
+				}
+				return rtv;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+
+		const items = this.getInputData();
+
+		const returnData: IDataObject[] = [];
+
+		const length = (items.length as unknown) as number;
+
+		const qs: IDataObject = {};
+
+		let responseData;
+
+		const resource = this.getNodeParameter('resource', 0) as string;
+
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		for (let i = 0; i < length; i++) {
+
+			if (resource === 'project') {
+
+				if (operation === 'create') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const name = this.getNodeParameter('name', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						name,
+					};
+
+					Object.assign(body, additionalFields);
+
+					if (body.estimateUi) {
+
+						body.estimate = (body.estimateUi as IDataObject).estimateValues;
+
+						delete body.estimateUi;
+					}
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'POST',
+						`/workspaces/${workspaceId}/projects`,
+						body,
+						qs,
+					);
+				}
+
+				if (operation === 'delete') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const projectId = this.getNodeParameter('projectId', i) as string;
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'DELETE',
+						`/workspaces/${workspaceId}/projects/${projectId}`,
+						{},
+						qs,
+					);
+
+					responseData = { success: true };
+				}
+
+				if (operation === 'get') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const projectId = this.getNodeParameter('projectId', i) as string;
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'GET',
+						`/workspaces/${workspaceId}/projects/${projectId}`,
+						{},
+						qs,
+					);
+				}
+
+				if (operation === 'getAll') {
+
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					Object.assign(qs, additionalFields);
+
+					if (returnAll) {
+						responseData = await clockifyApiRequestAllItems.call(
+							this,
+							'GET',
+							`/workspaces/${workspaceId}/projects`,
+							{},
+							qs,
+						);
+
+					} else {
+
+						qs.limit = this.getNodeParameter('limit', i) as number;
+
+						responseData = await clockifyApiRequestAllItems.call(
+							this,
+							'GET',
+							`/workspaces/${workspaceId}/projects`,
+							{},
+							qs,
+						);
+
+						responseData = responseData.splice(0, qs.limit);
+					}
+				}
+
+				if (operation === 'update') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const projectId = this.getNodeParameter('projectId', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body: IDataObject = {};
+
+					Object.assign(body, updateFields);
+
+					if (body.estimateUi) {
+
+						body.estimate = (body.estimateUi as IDataObject).estimateValues;
+
+						delete body.estimateUi;
+					}
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'PUT',
+						`/workspaces/${workspaceId}/projects/${projectId}`,
+						body,
+						qs,
+					);
+				}
+			}
+
+			if (resource === 'tag') {
+
+				if (operation === 'create') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const name = this.getNodeParameter('name', i) as string;
+
+					const body: IDataObject = {
+						name,
+					};
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'POST',
+						`/workspaces/${workspaceId}/tags`,
+						body,
+						qs,
+					);
+				}
+
+				if (operation === 'delete') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const tagId = this.getNodeParameter('tagId', i) as string;
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'DELETE',
+						`/workspaces/${workspaceId}/tags/${tagId}`,
+						{},
+						qs,
+					);
+
+					responseData = { success: true };
+				}
+
+				if (operation === 'getAll') {
+
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					Object.assign(qs, additionalFields);
+
+					if (returnAll) {
+						responseData = await clockifyApiRequestAllItems.call(
+							this,
+							'GET',
+							`/workspaces/${workspaceId}/tags`,
+							{},
+							qs,
+						);
+
+					} else {
+
+						qs.limit = this.getNodeParameter('limit', i) as number;
+
+						responseData = await clockifyApiRequestAllItems.call(
+							this,
+							'GET',
+							`/workspaces/${workspaceId}/tags`,
+							{},
+							qs,
+						);
+
+						responseData = responseData.splice(0, qs.limit);
+					}
+				}
+
+				if (operation === 'update') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const tagId = this.getNodeParameter('tagId', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body: IDataObject = {};
+
+					Object.assign(body, updateFields);
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'PUT',
+						`/workspaces/${workspaceId}/tags/${tagId}`,
+						body,
+						qs,
+					);
+				}
+			}
+
+			if (resource === 'timeEntry') {
+
+				if (operation === 'create') {
+
+					const timezone = this.getTimezone();
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const start = this.getNodeParameter('start', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						start: moment.tz(start, timezone).utc().format(),
+					};
+
+					Object.assign(body, additionalFields);
+
+					if (body.end) {
+						body.end = moment.tz(body.end, timezone).utc().format();
+					}
+
+					if (body.customFieldsUi) {
+
+						const customFields = (body.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+
+						body.customFields = customFields;
+					}
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'POST',
+						`/workspaces/${workspaceId}/time-entries`,
+						body,
+						qs,
+					);
+				}
+
+				if (operation === 'delete') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const timeEntryId = this.getNodeParameter('timeEntryId', i) as string;
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'DELETE',
+						`/workspaces/${workspaceId}/time-entries/${timeEntryId}`,
+						{},
+						qs,
+					);
+
+					responseData = { success: true };
+				}
+
+				if (operation === 'get') {
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const timeEntryId = this.getNodeParameter('timeEntryId', i) as string;
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'GET',
+						`/workspaces/${workspaceId}/time-entries/${timeEntryId}`,
+						{},
+						qs,
+					);
+				}
+
+				if (operation === 'update') {
+
+					const timezone = this.getTimezone();
+
+					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
+
+					const timeEntryId = this.getNodeParameter('timeEntryId', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body: IDataObject = {};
+
+					Object.assign(body, updateFields);
+
+					if (body.end) {
+						body.end = moment.tz(body.end, timezone).utc().format();
+					}
+
+					if (body.start) {
+						body.start = moment.tz(body.start, timezone).utc().format();
+					} else {
+						// even if you do not want to update the start time, it always has to be set
+						// to make it more simple to the user, if he did not set a start time look for the current start time
+						// and set it
+						const { timeInterval: { start } } = await clockifyApiRequest.call(
+							this,
+							'GET',
+							`/workspaces/${workspaceId}/time-entries/${timeEntryId}`,
+							{},
+							qs,
+						);
+
+						body.start = start;
+					}
+
+					responseData = await clockifyApiRequest.call(
+						this,
+						'PUT',
+						`/workspaces/${workspaceId}/time-entries/${timeEntryId}`,
+						body,
+						qs,
+					);
+				}
+			}
+		}
+
+		if (Array.isArray(responseData)) {
+
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+
+		} else if (responseData !== undefined) {
+
+			returnData.push(responseData as IDataObject);
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
index 783432fb3..9f6384ed7 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
@@ -1,6 +1,6 @@
 import * as moment from 'moment-timezone';
 
-import {IPollFunctions} from 'n8n-core';
+import { IPollFunctions } from 'n8n-core';
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
@@ -15,7 +15,7 @@ import {
 } from './GenericFunctions';
 
 import { EntryTypeEnum } from './EntryTypeEnum';
-import { ICurrentUserDto } from './UserDtos';
+import { IUserDto } from './UserDtos';
 import { IWorkspaceDto } from './WorkpaceInterfaces';
 
 
@@ -29,7 +29,7 @@ export class ClockifyTrigger implements INodeType {
 		description: 'Watches Clockify For Events',
 		defaults: {
 			name: 'Clockify Trigger',
-			color: '#00FF00',
+			color: '#000000',
 		},
 		inputs: [],
 		outputs: ['main'],
@@ -37,7 +37,7 @@ export class ClockifyTrigger implements INodeType {
 			{
 				name: 'clockifyApi',
 				required: true,
-			}
+			},
 		],
 		polling: true,
 		properties: [
@@ -59,26 +59,26 @@ export class ClockifyTrigger implements INodeType {
 					{
 						name: 'New Time Entry',
 						value: EntryTypeEnum.NEW_TIME_ENTRY,
-					}
+					},
 				],
 				required: true,
 				default: EntryTypeEnum.NEW_TIME_ENTRY,
 			},
-		]
+		],
 	};
 
 	methods = {
 		loadOptions: {
-			async listWorkspaces(this: ILoadOptionsFunctions) : Promise<INodePropertyOptions[]> {
-				const rtv : INodePropertyOptions[] = [];
-				const  workspaces: IWorkspaceDto[] = await clockifyApiRequest.call(this,'GET', 'workspaces');
-				if(undefined !== workspaces) {
+			async listWorkspaces(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const rtv: INodePropertyOptions[] = [];
+				const workspaces: IWorkspaceDto[] = await clockifyApiRequest.call(this, 'GET', 'workspaces');
+				if (undefined !== workspaces) {
 					workspaces.forEach(value => {
 						rtv.push(
-						{
-							name: value.name,
-							value: value.id,
-						});
+							{
+								name: value.name,
+								value: value.id,
+							});
 					});
 				}
 				return rtv;
@@ -89,20 +89,20 @@ export class ClockifyTrigger implements INodeType {
 	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
 		const webhookData = this.getWorkflowStaticData('node');
 		const triggerField = this.getNodeParameter('watchField') as EntryTypeEnum;
-		const workspaceId  = this.getNodeParameter('workspaceId');
+		const workspaceId = this.getNodeParameter('workspaceId');
 
 		if (!webhookData.userId) {
 			// Cache the user-id that we do not have to request it every time
-			const userInfo: ICurrentUserDto = await clockifyApiRequest.call(this, 'GET', 'user');
+			const userInfo: IUserDto = await clockifyApiRequest.call(this, 'GET', 'user');
 			webhookData.userId = userInfo.id;
 		}
 
-		const qs : IDataObject = {};
+		const qs: IDataObject = {};
 		let resource: string;
 		let result = null;
 
 		switch (triggerField) {
-			case EntryTypeEnum.NEW_TIME_ENTRY :
+			case EntryTypeEnum.NEW_TIME_ENTRY:
 			default:
 				const workflowTimezone = this.getTimezone();
 				resource = `workspaces/${workspaceId}/user/${webhookData.userId}/time-entries`;
@@ -110,16 +110,15 @@ export class ClockifyTrigger implements INodeType {
 				qs.end = moment().tz(workflowTimezone).format('YYYY-MM-DDTHH:mm:ss') + 'Z';
 				qs.hydrated = true;
 				qs['in-progress'] = false;
-			break;
+				break;
 		}
 
-		result = await clockifyApiRequest.call(this, 'GET', resource, {}, qs );
+		result = await clockifyApiRequest.call(this, 'GET', resource, {}, qs);
 		webhookData.lastTimeChecked = qs.end;
 
 		if (Array.isArray(result) && result.length !== 0) {
 			result = [this.helpers.returnJsonArray(result)];
-			return result;
 		}
-		return null;
+		return result;
 	}
 }
diff --git a/packages/nodes-base/nodes/Clockify/CommonDtos.ts b/packages/nodes-base/nodes/Clockify/CommonDtos.ts
index 2876fd4ff..c85c89234 100644
--- a/packages/nodes-base/nodes/Clockify/CommonDtos.ts
+++ b/packages/nodes-base/nodes/Clockify/CommonDtos.ts
@@ -7,7 +7,7 @@ enum MembershipStatusEnum {
 	PENDING = 'PENDING',
 	ACTIVE = 'ACTIVE',
 	DECLINED = 'DECLINED',
-	INACTIVE = 'INACTIVE'
+	INACTIVE = 'INACTIVE',
 }
 
 export interface IMembershipDto {
@@ -17,3 +17,16 @@ export interface IMembershipDto {
 	targetId: string;
 	userId: string;
 }
+
+export interface ITagDto {
+	id: string;
+	name: any; // tslint:disable-line:no-any
+	workspaceId: string;
+	archived: boolean;
+}
+
+export interface ITimeIntervalDto {
+	duration: string;
+	end: string;
+	start: string;
+}
diff --git a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
index 730fad23a..b8288427c 100644
--- a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
@@ -1,15 +1,24 @@
-import { OptionsWithUri } from 'request';
 import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
-	IPollFunctions
+	IPollFunctions,
 } from 'n8n-core';
 
-import { IDataObject } from 'n8n-workflow';
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function clockifyApiRequest(this: ILoadOptionsFunctions | IPollFunctions | IExecuteFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 
-export async function clockifyApiRequest(this: ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('clockifyApi');
+
 	if (credentials === undefined) {
 		throw new Error('No credentials got returned!');
+
 	}
 	const BASE_URL = 'https://api.clockify.me/api/v1';
 
@@ -22,17 +31,53 @@ export async function clockifyApiRequest(this: ILoadOptionsFunctions | IPollFunc
 		qs,
 		body,
 		uri: `${BASE_URL}/${resource}`,
-		json: true
+		json: true,
+		useQuerystring: true,
 	};
+
 	try {
+
 		return await this.helpers.request!(options);
+
 	} catch (error) {
 
 		let errorMessage = error.message;
+
 		if (error.response.body && error.response.body.message) {
-			errorMessage = `[${error.response.body.status_code}] ${error.response.body.message}`;
+
+			errorMessage = `[${error.statusCode}] ${error.response.body.message}`;
+
 		}
 
 		throw new Error('Clockify Error: ' + errorMessage);
 	}
 }
+
+export async function clockifyApiRequestAllItems(this: IExecuteFunctions | IPollFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	query['page-size'] = 50;
+
+	query.page = 1;
+
+	do {
+		responseData = await clockifyApiRequest.call(this, method, endpoint, body, query);
+
+		returnData.push.apply(returnData, responseData);
+
+		if (query.limit && (returnData.length >= query.limit)) {
+
+			return returnData;
+		}
+
+		query.page++;
+
+	} while (
+		responseData.length !== 0
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Clockify/ProjectDescription.ts b/packages/nodes-base/nodes/Clockify/ProjectDescription.ts
new file mode 100644
index 000000000..e5a40087a
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/ProjectDescription.ts
@@ -0,0 +1,528 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const projectOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a project',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a project',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a project',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all projects',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a project',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const projectFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 project:create                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Project Name',
+		name: 'name',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'Name of project being created.',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'project',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'color',
+				default: '#0000FF',
+			},
+			{
+				displayName: 'Client ID',
+				name: 'clientId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+					loadOptionsMethod: 'loadClientsForWorkspace',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Estimate',
+				name: 'estimateUi',
+				placeholder: 'Add Estimate',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: false,
+				},
+				options: [
+					{
+						displayName: 'Estimate',
+						name: 'estimateValues',
+						values: [
+							{
+								displayName: 'Estimate',
+								name: 'estimate',
+								type: 'number',
+								default: 0,
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'Auto',
+										value: 'AUTO',
+									},
+									{
+										name: 'Manual',
+										value: 'MANUAL',
+									},
+								],
+								default: 'AUTO',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Is Public',
+				name: 'isPublic',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Note',
+				name: 'note',
+				type: 'string',
+				default: '',
+				description: 'Note about the project',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 project:delete                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 project:get                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 project:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'project',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'project',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'project',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Archived',
+				name: 'archived',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Client IDs',
+				name: 'clients',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+					loadOptionsMethod: 'loadClientsForWorkspace',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Contains Client',
+				name: 'contains-client',
+				type: 'boolean',
+				default: false,
+				description: 'If provided, projects will be filtered by whether they have a client.;			',
+			},
+			{
+				displayName: 'Client Status',
+				name: 'client-status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'ACTIVE',
+					},
+					{
+						name: 'Archived',
+						value: 'ARCHIVED',
+					},
+				],
+				default: '',
+				description: 'If provided, projects will be filtered by whether they have a client.',
+			},
+			{
+				displayName: 'Contains User',
+				name: 'contains-user',
+				type: 'boolean',
+				default: false,
+				description: 'If provided, projects will be filtered by whether they have users.',
+			},
+			{
+				displayName: 'Is Template',
+				name: 'is-template',
+				type: 'boolean',
+				default: false,
+				description: 'If provided, projects will be filtered by whether they are used as a template.',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sort Column',
+				name: 'sort-column',
+				type: 'options',
+				options: [
+					{
+						name: 'Name',
+						value: 'NAME',
+					},
+					{
+						name: 'Client Name',
+						value: 'CLIENT_NAME',
+					},
+					{
+						name: 'Duration',
+						value: 'DURATION',
+					},
+				],
+				default: '',
+			},
+			{
+				displayName: 'Sort Order',
+				name: 'sort-order',
+				type: 'options',
+				options: [
+					{
+						name: 'Ascending',
+						value: 'ASCENDING',
+					},
+					{
+						name: 'Descending',
+						value: 'DESCENDING',
+					},
+				],
+				default: '',
+			},
+			{
+				displayName: 'User IDs',
+				name: 'users',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+					loadOptionsMethod: 'loadUsersForWorkspace',
+				},
+				default: '',
+			},
+			{
+				displayName: 'User Status',
+				name: 'user-status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'ACTIVE',
+					},
+					{
+						name: 'Archived',
+						value: 'ARCHIVED',
+					},
+				],
+				default: '',
+				description: 'If provided, projects will be filtered by whether they have a client.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 project:update                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'project',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'color',
+				default: '#0000FF',
+			},
+			{
+				displayName: 'Client ID',
+				name: 'clientId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+					loadOptionsMethod: 'loadClientsForWorkspace',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Estimate',
+				name: 'estimateUi',
+				placeholder: 'Add Estimate',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: false,
+				},
+				options: [
+					{
+						displayName: 'Estimate',
+						name: 'estimateValues',
+						values: [
+							{
+								displayName: 'Estimate',
+								name: 'estimate',
+								type: 'number',
+								default: 0,
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'Auto',
+										value: 'AUTO',
+									},
+									{
+										name: 'Manual',
+										value: 'MANUAL',
+									},
+								],
+								default: 'AUTO',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Is Public',
+				name: 'isPublic',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Note',
+				name: 'note',
+				type: 'string',
+				default: '',
+				description: 'Note about the project',
+			},
+		],
+	},
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Clockify/ProjectInterfaces.ts b/packages/nodes-base/nodes/Clockify/ProjectInterfaces.ts
new file mode 100644
index 000000000..1a77ac465
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/ProjectInterfaces.ts
@@ -0,0 +1,55 @@
+import { IHourlyRateDto, IMembershipDto } from './CommonDtos';
+
+enum EstimateEnum {
+	AUTO = "AUTO",
+	MANUAL = "MANUAL",
+}
+
+interface IEstimateDto {
+	estimate: string;
+	type: EstimateEnum;
+}
+
+export interface IProjectDto {
+	archived: boolean;
+	billable: boolean;
+	clientId: string;
+	clientName: string | undefined;
+	color: string;
+	duration: string | undefined;
+	estimate: IEstimateDto | undefined;
+	hourlyRate: IHourlyRateDto | undefined;
+	id: string;
+	memberships: IMembershipDto[] | undefined;
+	name: string;
+	isPublic: boolean;
+	workspaceId: string;
+	note: string | undefined;
+}
+
+export interface IProjectRequest {
+	name: string;
+	clientId: string;
+	isPublic: boolean;
+	estimate: IEstimateDto;
+	color: string;
+	note: string;
+	billable: boolean;
+	hourlyRate: IHourlyRateDto;
+	memberships: IMembershipDto;
+	tasks: ITaskDto;
+}
+
+enum TaskStatusEnum {
+	ACTIVE = 'ACTIVE',
+	DONE = 'DONE',
+}
+
+export interface ITaskDto {
+	assigneeIds: object;
+	estimate: string;
+	id: string;
+	name: string;
+	projectId: string;
+	status: TaskStatusEnum;
+}
diff --git a/packages/nodes-base/nodes/Clockify/TagDescription.ts b/packages/nodes-base/nodes/Clockify/TagDescription.ts
new file mode 100644
index 000000000..fa06e832c
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/TagDescription.ts
@@ -0,0 +1,242 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const tagOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'tag',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a tag',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a tag',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all tags',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a tag',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const tagFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 tag:create                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'Name of tag being created',
+		displayOptions: {
+			show: {
+				resource: [
+					'tag',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 tag:delete                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Tag ID',
+		name: 'tagId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'tag',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 tag:getAll                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'tag',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Archived',
+				name: 'archived',
+				type: 'boolean',
+				default: true,
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sort Column',
+				name: 'sort-column',
+				type: 'options',
+				options: [
+					{
+						name: 'Name',
+						value: 'NAME',
+					},
+				],
+				default: '',
+			},
+			{
+				displayName: 'Sort Order',
+				name: 'sort-order',
+				type: 'options',
+				options: [
+					{
+						name: 'Ascending',
+						value: 'ASCENDING',
+					},
+					{
+						name: 'Descending',
+						value: 'DESCENDING',
+					},
+				],
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 tag:update                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Tag ID',
+		name: 'tagId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'tag',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'tag',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Archived',
+				name: 'archived',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Clockify/TimeEntryDescription.ts b/packages/nodes-base/nodes/Clockify/TimeEntryDescription.ts
new file mode 100644
index 000000000..2ce95efa5
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/TimeEntryDescription.ts
@@ -0,0 +1,384 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const timeEntryOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a time entry',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a time entry',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get time entrie',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a time entry',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const timeEntryFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 timeEntry:create                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Start',
+		name: 'start',
+		type: 'dateTime',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'timeEntry',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'customFieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsDependsOn: [
+										'workspaceId',
+									],
+									loadOptionsMethod: 'loadCustomFieldsForWorkspace',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'End',
+				name: 'end',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Project ID',
+				name: 'projectId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+					loadOptionsMethod: 'loadProjectsForWorkspace',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Tag IDs',
+				name: 'tagIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+					loadOptionsMethod: 'loadTagsForWorkspace',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Task ID',
+				name: 'taskId',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 timeEntry:delete                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Time Entry ID',
+		name: 'timeEntryId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 timeEntry:get                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Time Entry ID',
+		name: 'timeEntryId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'timeEntry',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Consider Duration Format',
+				name: 'consider-duration-format',
+				type: 'boolean',
+				default: false,
+				description: `If provided, returned timeentry's duration will be rounded to minutes or seconds based on duration format (hh:mm or hh:mm:ss) from workspace settings.`,
+			},
+			{
+				displayName: 'Hydrated',
+				name: 'hydrated',
+				type: 'boolean',
+				default: false,
+				description: `If provided, returned timeentry's project,task and tags will be returned in full and not just their ids`,
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 timeEntry:update                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Time Entry ID',
+		name: 'timeEntryId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'timeEntry',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'timeEntry',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'customFieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsDependsOn: [
+										'workspaceId',
+									],
+									loadOptionsMethod: 'loadCustomFieldsForWorkspace',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'End',
+				name: 'end',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Project ID',
+				name: 'projectId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+					loadOptionsMethod: 'loadProjectsForWorkspace',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Start',
+				name: 'start',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Tag IDs',
+				name: 'tagIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+					loadOptionsMethod: 'loadTagsForWorkspace',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Task ID',
+				name: 'taskId',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Clockify/TimeEntryInterfaces.ts b/packages/nodes-base/nodes/Clockify/TimeEntryInterfaces.ts
new file mode 100644
index 000000000..d370b2172
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/TimeEntryInterfaces.ts
@@ -0,0 +1,34 @@
+import { ITimeIntervalDto } from './CommonDtos';
+
+interface ITimeEntriesDurationRequest {
+	start: string;
+	end: string;
+}
+
+export interface ITimeEntryRequest {
+	id: string;
+	start: string;
+	billable: boolean;
+	description: string;
+	projectId: string;
+	userId: string;
+	taskId?: string | null;
+	end: string;
+	tagIds?: string[] | undefined;
+	timeInterval: ITimeEntriesDurationRequest;
+	workspaceId: string;
+	isLocked: boolean;
+}
+
+export interface ITimeEntryDto {
+	billable: boolean;
+	description: string;
+	id: string;
+	isLocked: boolean;
+	projectId: string;
+	tagIds: string[];
+	taskId: string;
+	timeInterval: ITimeIntervalDto;
+	userId: string;
+	workspaceId: string;
+}
diff --git a/packages/nodes-base/nodes/Clockify/UserDtos.ts b/packages/nodes-base/nodes/Clockify/UserDtos.ts
index c6f0efdf7..1a8453866 100644
--- a/packages/nodes-base/nodes/Clockify/UserDtos.ts
+++ b/packages/nodes-base/nodes/Clockify/UserDtos.ts
@@ -1,18 +1,18 @@
 import { IMembershipDto } from './CommonDtos';
 
 enum UserStatusEnum {
-	ACTIVE, PENDING_EMAIL_VERIFICATION, DELETED
+	ACTIVE, PENDING_EMAIL_VERIFICATION, DELETED,
 }
 
 interface IUserSettingsDto {
 }
 
-export interface ICurrentUserDto {
+export interface IUserDto {
 	activeWorkspace: string;
 	defaultWorkspace: string;
 	email: string;
 	id: string;
-	memberships:  IMembershipDto [];
+	memberships: IMembershipDto[];
 	name: string;
 	profilePicture: string;
 	settings: IUserSettingsDto;
diff --git a/packages/nodes-base/nodes/Clockify/WorkpaceInterfaces.ts b/packages/nodes-base/nodes/Clockify/WorkpaceInterfaces.ts
index a06540c36..bce0e4112 100644
--- a/packages/nodes-base/nodes/Clockify/WorkpaceInterfaces.ts
+++ b/packages/nodes-base/nodes/Clockify/WorkpaceInterfaces.ts
@@ -1,7 +1,7 @@
 import { IHourlyRateDto, IMembershipDto } from './CommonDtos';
 
 enum AdminOnlyPagesEnum {
-	PROJECT ='PROJECT',
+	PROJECT = 'PROJECT',
 	TEAM = 'TEAM',
 	REPORTS = 'REPORTS',
 }
@@ -70,7 +70,13 @@ export interface IWorkspaceDto {
 	hourlyRate: IHourlyRateDto;
 	id: string;
 	imageUrl: string;
-	memberships:  IMembershipDto[];
+	memberships: IMembershipDto[];
 	name: string;
 	workspaceSettings: IWorkspaceSettingsDto;
 }
+
+export interface IClientDto {
+	id: string;
+	name: string;
+	workspaceId: string;
+}
diff --git a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
index efd233f74..32335c5e9 100644
--- a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
+++ b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
@@ -27,8 +27,8 @@ import {
 	singletonOperations,
 } from './SingletonDescription';
 import {
-	getSingleton,
 	getAllSingletonNames,
+	getSingleton,
 } from './SingletonFunctions';
 
 export class Cockpit implements INodeType {
diff --git a/packages/nodes-base/nodes/Cockpit/CollectionDescription.ts b/packages/nodes-base/nodes/Cockpit/CollectionDescription.ts
index f0c0e4ccd..904f470a7 100644
--- a/packages/nodes-base/nodes/Cockpit/CollectionDescription.ts
+++ b/packages/nodes-base/nodes/Cockpit/CollectionDescription.ts
@@ -51,7 +51,7 @@ export const collectionFields = [
 			},
 		},
 		required: true,
-		description: 'Name of the collection to operate on.'
+		description: 'Name of the collection to operate on.',
 	},
 
 	// Collection:entry:getAll
@@ -109,7 +109,7 @@ export const collectionFields = [
 				],
 				operation: [
 					'getAll',
-				]
+				],
 			},
 		},
 		options: [
@@ -189,7 +189,7 @@ export const collectionFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'The entry ID.',
@@ -210,7 +210,7 @@ export const collectionFields = [
 				operation: [
 					'create',
 					'update',
-				]
+				],
 			},
 		},
 		description: 'If new entry fields should be set via the value-key pair UI or JSON.',
@@ -234,7 +234,7 @@ export const collectionFields = [
 				operation: [
 					'create',
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Entry data to send as JSON.',
@@ -258,7 +258,7 @@ export const collectionFields = [
 				operation: [
 					'create',
 					'update',
-				]
+				],
 			},
 		},
 		options: [
diff --git a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
index d50862984..27e51094f 100644
--- a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
@@ -15,7 +15,7 @@ export async function createCollectionEntry(this: IExecuteFunctions | IExecuteSi
 	if (id) {
 		body.data = {
 			_id: id,
-			...body.data
+			...body.data,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Cockpit/FormDescription.ts b/packages/nodes-base/nodes/Cockpit/FormDescription.ts
index 3b781d772..795a1a211 100644
--- a/packages/nodes-base/nodes/Cockpit/FormDescription.ts
+++ b/packages/nodes-base/nodes/Cockpit/FormDescription.ts
@@ -22,7 +22,7 @@ export const formOperations = [
 		],
 		default: 'submit',
 		description: 'The operation to perform.',
-	}
+	},
 ] as INodeProperties[];
 
 export const formFields = [
@@ -39,7 +39,7 @@ export const formFields = [
 		},
 		default: '',
 		required: true,
-		description: 'Name of the form to operate on.'
+		description: 'Name of the form to operate on.',
 	},
 
 	// Form:submit
@@ -55,7 +55,7 @@ export const formFields = [
 				],
 				operation: [
 					'submit',
-				]
+				],
 			},
 		},
 		description: 'If form fields should be set via the value-key pair UI or JSON.',
@@ -78,7 +78,7 @@ export const formFields = [
 				],
 				operation: [
 					'submit',
-				]
+				],
 			},
 		},
 		description: 'Form data to send as JSON.',
@@ -101,7 +101,7 @@ export const formFields = [
 				],
 				operation: [
 					'submit',
-				]
+				],
 			},
 		},
 		options: [
diff --git a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
index 36a1bdc38..f2a3e5eec 100644
--- a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
@@ -9,7 +9,7 @@ import { cockpitApiRequest } from './GenericFunctions';
 
 export async function submitForm(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, resourceName: string, form: IDataObject) {
 	const body: IForm = {
-		form
+		form,
 	};
 
 	return cockpitApiRequest.call(this, 'post', `/forms/submit/${resourceName}`, body);
diff --git a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
index 3f3bf39ac..baf97ec13 100644
--- a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
@@ -20,11 +20,11 @@ export async function cockpitApiRequest(this: IExecuteFunctions | IExecuteSingle
 		},
 		method,
 		qs: {
-			token: credentials!.accessToken
+			token: credentials!.accessToken,
 		},
 		body,
 		uri: uri || `${credentials!.url}/api${resource}`,
-		json: true
+		json: true,
 	};
 
 	options = Object.assign({}, options, option);
diff --git a/packages/nodes-base/nodes/Cockpit/SingletonDescription.ts b/packages/nodes-base/nodes/Cockpit/SingletonDescription.ts
index 1e91fce16..59d391347 100644
--- a/packages/nodes-base/nodes/Cockpit/SingletonDescription.ts
+++ b/packages/nodes-base/nodes/Cockpit/SingletonDescription.ts
@@ -21,7 +21,7 @@ export const singletonOperations = [
 		],
 		default: 'get',
 		description: 'The operation to perform.',
-	}
+	},
 ] as INodeProperties[];
 
 export const singletonFields = [
@@ -41,6 +41,6 @@ export const singletonFields = [
 			},
 		},
 		required: true,
-		description: 'Name of the singleton to operate on.'
+		description: 'Name of the singleton to operate on.',
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index e7d8c9c8d..f360b825b 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -3,11 +3,11 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	codaApiRequest,
@@ -49,7 +49,7 @@ export class Coda implements INodeType {
 			{
 				name: 'codaApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -299,7 +299,7 @@ export class Coda implements INodeType {
 					} else {
 						returnData.push({
 							id: responseData.id,
-							...responseData.values
+							...responseData.values,
 						});
 					}
 				}
@@ -348,7 +348,7 @@ export class Coda implements INodeType {
 					for (const item of responseData) {
 						returnData.push({
 							id: item.id,
-							...item.values
+							...item.values,
 						});
 					}
 					return [this.helpers.returnJsonArray(returnData)];
@@ -624,7 +624,7 @@ export class Coda implements INodeType {
 						});
 					}
 					body.row = {
-						cells
+						cells,
 					};
 					await codaApiRequest.call(this, 'PUT', endpoint, body, qs);
 				}
diff --git a/packages/nodes-base/nodes/Coda/ControlDescription.ts b/packages/nodes-base/nodes/Coda/ControlDescription.ts
index 49311d549..9d10e94db 100644
--- a/packages/nodes-base/nodes/Coda/ControlDescription.ts
+++ b/packages/nodes-base/nodes/Coda/ControlDescription.ts
@@ -50,7 +50,7 @@ export const controlFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -68,7 +68,7 @@ export const controlFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'The control to get the row from.',
@@ -92,7 +92,7 @@ export const controlFields = [
 				],
 				operation: [
 					'getAll',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -108,7 +108,7 @@ export const controlFields = [
 				],
 				operation: [
 					'getAll',
-				]
+				],
 			},
 		},
 		default: false,
diff --git a/packages/nodes-base/nodes/Coda/FormulaDescription.ts b/packages/nodes-base/nodes/Coda/FormulaDescription.ts
index 9e6ddbc04..9d1af1059 100644
--- a/packages/nodes-base/nodes/Coda/FormulaDescription.ts
+++ b/packages/nodes-base/nodes/Coda/FormulaDescription.ts
@@ -50,7 +50,7 @@ export const formulaFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -68,7 +68,7 @@ export const formulaFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'The formula to get the row from.',
@@ -92,7 +92,7 @@ export const formulaFields = [
 				],
 				operation: [
 					'getAll',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -108,7 +108,7 @@ export const formulaFields = [
 				],
 				operation: [
 					'getAll',
-				]
+				],
 			},
 		},
 		default: false,
diff --git a/packages/nodes-base/nodes/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
index 3c09c6559..b9270b515 100644
--- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
@@ -1,8 +1,8 @@
 import { OptionsWithUri } from 'request';
 import {
 	IExecuteFunctions,
-	ILoadOptionsFunctions,
 	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
 } from 'n8n-core';
 import { IDataObject } from 'n8n-workflow';
 
@@ -18,7 +18,7 @@ export async function codaApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 		qs,
 		body,
 		uri: uri ||`https://coda.io/apis/v1${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Coda/TableDescription.ts b/packages/nodes-base/nodes/Coda/TableDescription.ts
index 2ebddf758..49ffd4902 100644
--- a/packages/nodes-base/nodes/Coda/TableDescription.ts
+++ b/packages/nodes-base/nodes/Coda/TableDescription.ts
@@ -75,7 +75,7 @@ export const tableFields = [
 				],
 				operation: [
 					'createRow',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -99,7 +99,7 @@ export const tableFields = [
 				],
 				operation: [
 					'createRow',
-				]
+				],
 			},
 		},
 		description: 'The table to create the row in.',
@@ -136,7 +136,7 @@ export const tableFields = [
 				description: `Optional column IDs, URLs, or names (fragile and discouraged)<br />,
 				specifying columns to be used as upsert keys. If more than one separate by ,`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                   table:get                                */
@@ -157,7 +157,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getRow',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -181,7 +181,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getRow',
-				]
+				],
 			},
 		},
 		description: 'The table to get the row from.',
@@ -199,7 +199,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getRow',
-				]
+				],
 			},
 		},
 		description: `ID or name of the row. Names are discouraged because<br />
@@ -262,7 +262,7 @@ export const tableFields = [
 				],
 				description: `The format that cell values are returned as.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                   table:getAll                             */
@@ -283,7 +283,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getAllRows',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -307,7 +307,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getAllRows',
-				]
+				],
 			},
 		},
 		description: 'The table to get the rows from.',
@@ -323,7 +323,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getAllRows',
-				]
+				],
 			},
 		},
 		default: false,
@@ -444,7 +444,7 @@ export const tableFields = [
 				default: false,
 				description: `If true, returns only visible rows and columns for the table.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 row:delete                                 */
@@ -465,7 +465,7 @@ export const tableFields = [
 				],
 				operation: [
 					'deleteRow',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -489,7 +489,7 @@ export const tableFields = [
 				],
 				operation: [
 					'deleteRow',
-				]
+				],
 			},
 		},
 		description: 'The table to delete the row in.',
@@ -507,7 +507,7 @@ export const tableFields = [
 				],
 				operation: [
 					'deleteRow',
-				]
+				],
 			},
 		},
 		description: 'Row IDs to delete.',
@@ -531,7 +531,7 @@ export const tableFields = [
 				],
 				operation: [
 					'pushButton',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -555,7 +555,7 @@ export const tableFields = [
 				],
 				operation: [
 					'pushButton',
-				]
+				],
 			},
 		},
 		description: 'The table to get the row from.',
@@ -573,7 +573,7 @@ export const tableFields = [
 				],
 				operation: [
 					'pushButton',
-				]
+				],
 			},
 		},
 		description: `ID or name of the row. Names are discouraged because<br />
@@ -602,7 +602,7 @@ export const tableFields = [
 				],
 				operation: [
 					'pushButton',
-				]
+				],
 			},
 		},
 	},
@@ -625,7 +625,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getColumn',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -649,7 +649,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getColumn',
-				]
+				],
 			},
 		},
 		description: 'The table to get the row from.',
@@ -667,7 +667,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getColumn',
-				]
+				],
 			},
 		},
 		description: 'The table to get the row from.',
@@ -691,7 +691,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getAllColumns',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -715,7 +715,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getAllColumns',
-				]
+				],
 			},
 		},
 		description: 'The table to get the row from.',
@@ -731,7 +731,7 @@ export const tableFields = [
 				],
 				operation: [
 					'getAllColumns',
-				]
+				],
 			},
 		},
 		default: false,
diff --git a/packages/nodes-base/nodes/Coda/ViewDescription.ts b/packages/nodes-base/nodes/Coda/ViewDescription.ts
index d9c847260..88795ec7c 100644
--- a/packages/nodes-base/nodes/Coda/ViewDescription.ts
+++ b/packages/nodes-base/nodes/Coda/ViewDescription.ts
@@ -75,7 +75,7 @@ export const viewFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -93,7 +93,7 @@ export const viewFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'The view to get the row from.',
@@ -117,7 +117,7 @@ export const viewFields = [
 				],
 				operation: [
 					'getAll',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -133,7 +133,7 @@ export const viewFields = [
 				],
 				operation: [
 					'getAll',
-				]
+				],
 			},
 		},
 		default: false,
@@ -182,7 +182,7 @@ export const viewFields = [
 				],
 				operation: [
 					'getAllViewRows',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -206,7 +206,7 @@ export const viewFields = [
 				],
 				operation: [
 					'getAllViewRows',
-				]
+				],
 			},
 		},
 		description: 'The table to get the rows from.',
@@ -222,7 +222,7 @@ export const viewFields = [
 				],
 				operation: [
 					'getAllViewRows',
-				]
+				],
 			},
 		},
 		default: false,
@@ -336,7 +336,7 @@ export const viewFields = [
 				description: `Specifies the sort order of the rows returned.<br />
 				If left unspecified, rows are returned by creation time ascending.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                   view:getAllViewColumns                   */
@@ -357,7 +357,7 @@ export const viewFields = [
 				],
 				operation: [
 					'getAllViewColumns',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -381,7 +381,7 @@ export const viewFields = [
 				],
 				operation: [
 					'getAllViewColumns',
-				]
+				],
 			},
 		},
 		description: 'The table to get the rows from.',
@@ -397,7 +397,7 @@ export const viewFields = [
 				],
 				operation: [
 					'getAllViewColumns',
-				]
+				],
 			},
 		},
 		default: false,
@@ -446,7 +446,7 @@ export const viewFields = [
 				],
 				operation: [
 					'deleteViewRow',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -470,7 +470,7 @@ export const viewFields = [
 				],
 				operation: [
 					'deleteViewRow',
-				]
+				],
 			},
 		},
 		description: 'The view to get the row from.',
@@ -494,7 +494,7 @@ export const viewFields = [
 				],
 				operation: [
 					'deleteViewRow',
-				]
+				],
 			},
 		},
 		description: 'The view to get the row from.',
@@ -518,7 +518,7 @@ export const viewFields = [
 				],
 				operation: [
 					'pushViewButton',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -542,7 +542,7 @@ export const viewFields = [
 				],
 				operation: [
 					'pushViewButton',
-				]
+				],
 			},
 		},
 		description: 'The view to get the row from.',
@@ -566,7 +566,7 @@ export const viewFields = [
 				],
 				operation: [
 					'pushViewButton',
-				]
+				],
 			},
 		},
 		description: 'The view to get the row from.',
@@ -591,7 +591,7 @@ export const viewFields = [
 				],
 				operation: [
 					'pushViewButton',
-				]
+				],
 			},
 		},
 	},
@@ -614,7 +614,7 @@ export const viewFields = [
 				],
 				operation: [
 					'updateViewRow',
-				]
+				],
 			},
 		},
 		description: 'ID of the doc.',
@@ -638,7 +638,7 @@ export const viewFields = [
 				],
 				operation: [
 					'updateViewRow',
-				]
+				],
 			},
 		},
 		description: 'The view to get the row from.',
@@ -662,7 +662,7 @@ export const viewFields = [
 				],
 				operation: [
 					'updateViewRow',
-				]
+				],
 			},
 		},
 		description: 'The view to get the row from.',
@@ -680,7 +680,7 @@ export const viewFields = [
 				],
 				operation: [
 					'updateViewRow',
-				]
+				],
 			},
 		},
 		description: 'The view to get the row from.',
@@ -709,6 +709,6 @@ export const viewFields = [
 				default: false,
 				description: `If true, the API will not attempt to parse the data in any way.`,
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts b/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts
new file mode 100644
index 000000000..ddf58a4bc
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts
@@ -0,0 +1,782 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const coinOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'coin',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Candlestick',
+				value: 'candlestick',
+				description: 'Get a candlestick open-high-low-close chart for the selected currency',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get current data for a coin',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all coins',
+			},
+			{
+				name: 'History',
+				value: 'history',
+				description: 'Get historical data (name, price, market, stats) at a given date for a coin',
+			},
+			{
+				name: 'Market',
+				value: 'market',
+				description: 'Get prices and market related data for all trading pairs that match the selected currency',
+			},
+			{
+				name: 'Market Chart',
+				value: 'marketChart',
+				description: 'Get historical market data include price, market cap, and 24h volume (granularity auto)',
+			},
+			{
+				name: 'Price',
+				value: 'price',
+				description: 'Get the current price of any cryptocurrencies in any other supported currencies that you need',
+			},
+			{
+				name: 'Ticker',
+				value: 'ticker',
+				description: 'Get coin tickers',
+			},
+		],
+		default: 'getAll',
+	},
+] as INodeProperties[];
+
+export const coinFields = [
+	{
+		displayName: 'Search By',
+		name: 'searchBy',
+		required: true,
+		type: 'options',
+		options: [
+			{
+				name: 'Coin ID',
+				value: 'coinId',
+			},
+			{
+				name: 'Contract address',
+				value: 'contractAddress',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+					'marketChart',
+					'price',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: 'coinId',
+		description: 'Search by coin ID or contract address.',
+	},
+	{
+		displayName: 'Coin ID',
+		name: 'coinId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCoins',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'bitcoin',
+		description: 'Coin ID',
+	},
+	{
+		displayName: 'Base Currency',
+		name: 'baseCurrency',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCoins',
+		},
+		displayOptions: {
+			show: {
+
+				operation: [
+					'candlestick',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: '',
+		description: 'The first currency in the pair. For BTC:ETH this is BTC.',
+	},
+	{
+		displayName: 'Base Currency',
+		name: 'baseCurrency',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCurrencies',
+		},
+		displayOptions: {
+			show: {
+
+				operation: [
+					'market',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: '',
+		description: 'The first currency in the pair. For BTC:ETH this is BTC.',
+	},
+	{
+		displayName: 'Coin ID',
+		name: 'coinId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCoins',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'ticker',
+					'history',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'bitcoin',
+		description: 'Coin ID',
+	},
+	{
+		displayName: 'Base Currencies',
+		name: 'baseCurrencies',
+		required: true,
+		type: 'multiOptions',
+		typeOptions: {
+			loadOptionsMethod: 'getCoins',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'price',
+				],
+				resource: [
+					'coin',
+				],
+				searchBy: [
+					'coinId',
+				],
+			},
+		},
+		default: [],
+		placeholder: 'bitcoin',
+		description: 'The first currency in the pair. For BTC:ETH this is BTC.',
+	},
+	{
+		displayName: 'Platform ID',
+		name: 'platformId',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+					'marketChart',
+					'price',
+				],
+				resource: [
+					'coin',
+				],
+				searchBy: [
+					'contractAddress',
+				],
+			},
+		},
+		type: 'options',
+		options: [
+			{
+				name: 'Ethereum',
+				value: 'ethereum',
+			},
+		],
+		default: 'ethereum',
+		description: 'The id of the platform issuing tokens.',
+	},
+	{
+		displayName: 'Contract address',
+		name: 'contractAddress',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+					'marketChart',
+				],
+				resource: [
+					'coin',
+				],
+				searchBy: [
+					'contractAddress',
+				],
+			},
+		},
+		description: 'Token\'s contract address.',
+	},
+	{
+		displayName: 'Contract addresses',
+		name: 'contractAddresses',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'price',
+				],
+				resource: [
+					'coin',
+				],
+				searchBy: [
+					'contractAddress',
+				],
+			},
+		},
+		description: 'The contract address of tokens, comma separated.',
+	},
+	{
+		displayName: 'Base Currency',
+		name: 'baseCurrency',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCoins',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'marketChart',
+				],
+				resource: [
+					'coin',
+				],
+				searchBy: [
+					'coinId',
+				],
+			},
+			hide: {
+				searchBy: [
+					'contractAddress',
+				],
+			},
+		},
+		default: '',
+		description: 'The first currency in the pair. For BTC:ETH this is BTC.',
+	},
+	{
+		displayName: 'Quote Currency',
+		name: 'quoteCurrency',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCurrencies',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'candlestick',
+					'marketChart',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: '',
+		description: 'The second currency in the pair. For BTC:ETH this is ETH.',
+	},
+	{
+		displayName: 'Quote Currencies',
+		name: 'quoteCurrencies',
+		type: 'multiOptions',
+		typeOptions: {
+			loadOptionsMethod: 'getCurrencies',
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'price',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: [],
+		description: 'The second currency in the pair. For BTC:ETH this is ETH.',
+	},
+	{
+		displayName: 'Range (days)',
+		name: 'days',
+		required: true,
+		type: 'options',
+		options: [
+			{
+				name: '1',
+				value: '1',
+			},
+			{
+				name: '7',
+				value: '7',
+			},
+			{
+				name: '14',
+				value: '14',
+			},
+			{
+				name: '30',
+				value: '30',
+			},
+			{
+				name: '90',
+				value: '90',
+			},
+			{
+				name: '180',
+				value: '180',
+			},
+			{
+				name: '365',
+				value: '365',
+			},
+			{
+				name: 'Max',
+				value: 'max',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'marketChart',
+					'candlestick',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: '',
+		description: 'Return data for this many days in the past from now.',
+	},
+	{
+		displayName: 'Date',
+		name: 'date',
+		required: true,
+		type: 'dateTime',
+		displayOptions: {
+			show: {
+				operation: [
+					'history',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: '',
+		description: 'The date of data snapshot.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+					'market',
+					'ticker',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+					'market',
+					'ticker',
+				],
+				resource: [
+					'coin',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'coin',
+				],
+				operation: [
+					'market',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Coin IDs',
+				name: 'ids',
+				type: 'string',
+				placeholder: 'bitcoin',
+				default: '',
+				description: 'Filter results by comma separated list of coin ID.',
+			},
+			{
+				displayName: 'Category',
+				name: 'category',
+				type: 'options',
+				options: [
+					{
+						name: 'Decentralized Finance Defi',
+						value: 'decentralized_finance_defi',
+					},
+				],
+				default: 'decentralized_finance_defi',
+				description: 'Filter by coin category.',
+			},
+			{
+				displayName: 'Order',
+				name: 'order',
+				type: 'options',
+				options: [
+					{
+						name: 'Market Cap Desc',
+						value: 'market_cap_desc',
+					},
+					{
+						name: 'Gecko Desc',
+						value: 'gecko_desc',
+					},
+					{
+						name: 'Gecko Asc',
+						value: 'gecko_asc',
+					},
+					{
+						name: 'Market Cap Asc',
+						value: 'market_cap_asc',
+					},
+					{
+						name: 'Market Cap Desc',
+						value: 'market_cap_desc',
+					},
+					{
+						name: 'Volume Asc',
+						value: 'volume_asc',
+					},
+					{
+						name: 'Volume Desc',
+						value: 'volume_desc',
+					},
+					{
+						name: 'Id Asc',
+						value: 'id_asc',
+					},
+					{
+						name: 'Id Desc',
+						value: 'id_desc',
+					},
+				],
+				default: '',
+				description: 'Sort results by field.',
+			},
+			{
+				displayName: 'Sparkline',
+				name: 'sparkline',
+				type: 'boolean',
+				default: false,
+				description: 'Include sparkline 7 days data.',
+			},
+			{
+				displayName: 'Price Change Percentage',
+				name: 'price_change_percentage',
+				type: 'multiOptions',
+				options: [
+					{
+						name: '1h',
+						value: '1h',
+					},
+					{
+						name: '24h',
+						value: '24h',
+					},
+					{
+						name: '7d',
+						value: '7d',
+					},
+					{
+						name: '14d',
+						value: '14d',
+					},
+					{
+						name: '30d',
+						value: '30d',
+					},
+					{
+						name: '200d',
+						value: '200d',
+					},
+					{
+						name: '1y',
+						value: '1y',
+					},
+				],
+				default: [],
+				description: 'Include price change percentage for specified times.',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'coin',
+				],
+				operation: [
+					'price',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include 24hr Change',
+				name: 'include_24hr_change',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Include 24hr Vol',
+				name: 'include_24hr_vol',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Include Last Updated At',
+				name: 'include_last_updated_at',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Include Market Cap',
+				name: 'include_market_cap',
+				type: 'boolean',
+				default: false,
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'coin',
+				],
+				operation: [
+					'ticker',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Exchange IDs',
+				name: 'exchange_ids',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getExchanges',
+				},
+				default: [],
+				description: 'Filter results by exchange IDs.',
+			},
+			{
+				displayName: 'Include Exchange Logo',
+				name: 'include_exchange_logo',
+				type: 'boolean',
+				default: false,
+				description: 'Include exchange logo.',
+			},
+			{
+				displayName: 'Order',
+				name: 'order',
+				type: 'options',
+				options: [
+					{
+						name: 'Trust Score Desc',
+						value: 'trust_score_desc',
+					},
+					{
+						name: 'Trust Score Asc',
+						value: 'trust_score_asc',
+					},
+					{
+						name: 'Volume Desc',
+						value: 'volume_desc',
+					},
+				],
+				default: 'trust_score_desc',
+				description: 'Sorts results by the selected rule.',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'coin',
+				],
+				operation: [
+					'history',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Localization',
+				name: 'localization',
+				type: 'boolean',
+				default: true,
+				description: 'Set to false to exclude localized languages in response.',
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'coin',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Community data',
+				name: 'community_data',
+				type: 'boolean',
+				default: false,
+				description: 'Include community data.',
+			},
+			{
+				displayName: 'Developer data',
+				name: 'developer_data',
+				type: 'boolean',
+				default: false,
+				description: 'Include developer data.',
+			},
+			{
+				displayName: 'Localization',
+				name: 'localization',
+				type: 'boolean',
+				default: false,
+				description: 'Include all localized languages in response.',
+			},
+			{
+				displayName: 'Market data',
+				name: 'market_data',
+				type: 'boolean',
+				default: false,
+				description: 'Include market data.',
+			},
+			{
+				displayName: 'Sparkline',
+				name: 'sparkline',
+				type: 'boolean',
+				default: false,
+				description: 'Include sparkline 7 days data (eg. true, false).',
+			},
+			{
+				displayName: 'Tickers',
+				name: 'tickers',
+				type: 'boolean',
+				default: false,
+				description: 'Include tickers data.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
new file mode 100644
index 000000000..af6af6803
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
@@ -0,0 +1,537 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	coinFields,
+	coinOperations,
+} from './CoinDescription';
+
+import {
+	eventFields,
+	eventOperations,
+} from './EventDescription';
+
+import {
+	coinGeckoApiRequest,
+	coinGeckoRequestAllItems,
+} from './GenericFunctions';
+
+import * as moment from 'moment-timezone';
+
+export class CoinGecko implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'CoinGecko',
+		name: 'coinGecko',
+		icon: 'file:coinGecko.png',
+		group: ['output'],
+		version: 1,
+		description: 'Consume CoinGecko API',
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		defaults: {
+			name: 'CoinGecko',
+			color: '#8bc53f',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Coin',
+						value: 'coin',
+					},
+					{
+						name: 'Event',
+						value: 'event',
+					},
+				],
+				default: 'coin',
+			},
+			...coinOperations,
+			...coinFields,
+			...eventOperations,
+			...eventFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getCurrencies(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const currencies = await coinGeckoApiRequest.call(
+					this,
+					'GET',
+					'/simple/supported_vs_currencies',
+				);
+				currencies.sort();
+				for (const currency of currencies) {
+					returnData.push({
+						name: currency.toUpperCase(),
+						value: currency,
+					});
+				}
+				return returnData;
+			},
+
+			async getCoins(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const coins = await coinGeckoApiRequest.call(
+					this,
+					'GET',
+					'/coins/list',
+				);
+				for (const coin of coins) {
+					returnData.push({
+						name: coin.symbol.toUpperCase(),
+						value: coin.id,
+					});
+				}
+				returnData.sort((a, b) => {
+					if (a.name < b.name) { return -1; }
+					if (a.name > b.name) { return 1; }
+					return 0;
+				});
+				return returnData;
+			},
+
+			async getExchanges(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const exchanges = await coinGeckoApiRequest.call(
+					this,
+					'GET',
+					'/exchanges/list',
+				);
+				for (const exchange of exchanges) {
+					returnData.push({
+						name: exchange.name,
+						value: exchange.id,
+					});
+				}
+				return returnData;
+			},
+
+			async getEventCountryCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const countryCodes = await coinGeckoApiRequest.call(
+					this,
+					'GET',
+					'/events/countries',
+				);
+				for (const code of countryCodes.data) {
+					if (!code.code) {
+						continue;
+					}
+					returnData.push({
+						name: code.country,
+						value: code.code,
+					});
+				}
+				return returnData;
+			},
+
+			async getEventTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const eventTypes = await coinGeckoApiRequest.call(
+					this,
+					'GET',
+					'/events/types',
+				);
+				for (const type of eventTypes.data) {
+					returnData.push({
+						name: type,
+						value: type,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+
+			if (resource === 'coin') {
+				//https://www.coingecko.com/api/documentations/v3#/coins/get_coins__id_
+				//https://www.coingecko.com/api/documentations/v3#/contract/get_coins__id__contract__contract_address_
+				if (operation === 'get') {
+
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					qs.community_data = false;
+					qs.developer_data = false;
+					qs.localization = false;
+					qs.market_data = false;
+					qs.sparkline = false;
+					qs.tickers = false;
+
+					Object.assign(qs, options);
+
+					const searchBy = this.getNodeParameter('searchBy', i) as string;
+
+					if (searchBy === 'coinId') {
+						const coinId = this.getNodeParameter('coinId', i) as string;
+
+						responseData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							`/coins/${coinId}`,
+							{},
+							qs,
+						);
+					}
+
+					if (searchBy === 'contractAddress') {
+						const platformId = this.getNodeParameter('platformId', i) as string;
+						const contractAddress = this.getNodeParameter('contractAddress', i) as string;
+
+						responseData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							`/coins/${platformId}/contract/${contractAddress}`,
+							{},
+							qs,
+						);
+					}
+				}
+				//https://www.coingecko.com/api/documentations/v3#/coins/get_coins_list
+				if (operation === 'getAll') {
+
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					let limit;
+
+					responseData = await coinGeckoApiRequest.call(
+						this,
+						'GET',
+						'/coins/list',
+						{},
+						qs,
+					);
+
+					if (returnAll === false) {
+						limit = this.getNodeParameter('limit', i) as number;
+						responseData = responseData.splice(0, limit);
+					}
+				}
+
+				//https://www.coingecko.com/api/documentations/v3#/coins/get_coins_list
+				if (operation === 'market') {
+
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const baseCurrency = this.getNodeParameter('baseCurrency', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					qs.vs_currency = baseCurrency;
+
+					Object.assign(qs, options);
+
+					if (options.price_change_percentage) {
+						qs.price_change_percentage = (options.price_change_percentage as string[]).join(',');
+					}
+
+					if (returnAll) {
+						responseData = await coinGeckoRequestAllItems.call(
+							this,
+							'',
+							'GET',
+							`/coins/markets`,
+							{},
+							qs,
+						);
+					} else {
+						const limit = this.getNodeParameter('limit', i) as number;
+
+						qs.per_page = limit;
+
+						responseData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							`/coins/markets`,
+							{},
+							qs,
+						);
+					}
+				}
+
+				//https://www.coingecko.com/api/documentations/v3#/simple/get_simple_price
+				//https://www.coingecko.com/api/documentations/v3#/simple/get_simple_token_price__id_
+				if (operation === 'price') {
+
+					const searchBy = this.getNodeParameter('searchBy', i) as string;
+					const quoteCurrencies = this.getNodeParameter('quoteCurrencies', i) as string[];
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					qs.vs_currencies = quoteCurrencies.join(',');
+
+					Object.assign(qs, options);
+
+					if (searchBy === 'coinId') {
+						const baseCurrencies = this.getNodeParameter('baseCurrencies', i) as string[];
+
+						qs.ids = baseCurrencies.join(',');
+
+						responseData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							'/simple/price',
+							{},
+							qs,
+						);
+					}
+
+					if (searchBy === 'contractAddress') {
+						const platformId = this.getNodeParameter('platformId', i) as string;
+						const contractAddresses = this.getNodeParameter('contractAddresses', i) as string;
+
+						qs.contract_addresses = contractAddresses;
+
+						responseData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							`/simple/token_price/${platformId}`,
+							{},
+							qs,
+						);
+					}
+				}
+
+				//https://www.coingecko.com/api/documentations/v3#/coins/get_coins__id__tickers
+				if (operation === 'ticker') {
+
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const coinId = this.getNodeParameter('coinId', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					Object.assign(qs, options);
+
+					if (options.exchange_ids) {
+						qs.exchange_ids = (options.exchange_ids as string[]).join(',');
+					}
+
+					if (returnAll) {
+
+						responseData = await coinGeckoRequestAllItems.call(
+							this,
+							'tickers',
+							'GET',
+							`/coins/${coinId}/tickers`,
+							{},
+							qs,
+						);
+					} else {
+						const limit = this.getNodeParameter('limit', i) as number;
+
+						responseData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							`/coins/${coinId}/tickers`,
+							{},
+							qs,
+						);
+
+						responseData = responseData.tickers;
+						responseData = responseData.splice(0, limit);
+					}
+				}
+
+				//https://www.coingecko.com/api/documentations/v3#/coins/get_coins__id__history
+				if (operation === 'history') {
+
+					const coinId = this.getNodeParameter('coinId', i) as string;
+					const date = this.getNodeParameter('date', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					Object.assign(qs, options);
+
+					qs.date = moment(date).format('DD-MM-YYYY');
+
+					responseData = await coinGeckoApiRequest.call(
+						this,
+						'GET',
+						`/coins/${coinId}/history`,
+						{},
+						qs,
+					);
+				}
+
+				//https://www.coingecko.com/api/documentations/v3#/coins/get_coins__id__market_chart
+				//https://www.coingecko.com/api/documentations/v3#/contract/get_coins__id__contract__contract_address__market_chart_
+				if (operation === 'marketChart') {
+
+					let respData;
+
+					const searchBy = this.getNodeParameter('searchBy', i) as string;
+					const quoteCurrency = this.getNodeParameter('quoteCurrency', i) as string;
+					const days = this.getNodeParameter('days', i) as string;
+
+					qs.vs_currency = quoteCurrency;
+					qs.days = days;
+
+					if (searchBy === 'coinId') {
+						const coinId = this.getNodeParameter('baseCurrency', i) as string;
+
+						respData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							`/coins/${coinId}/market_chart`,
+							{},
+							qs,
+						);
+					}
+
+					if (searchBy === 'contractAddress') {
+						const platformId = this.getNodeParameter('platformId', i) as string;
+						const contractAddress = this.getNodeParameter('contractAddress', i) as string;
+
+						respData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							`/coins/${platformId}/contract/${contractAddress}/market_chart`,
+							{},
+							qs,
+						);
+					}
+
+					responseData = [];
+					for (let idx = 0; idx < respData.prices.length; idx++) {
+						const [time, price] = respData.prices[idx];
+						const marketCaps = respData.market_caps[idx][1];
+						const totalVolume = respData.total_volumes[idx][1];
+						responseData.push({ time: moment(time).toISOString(), price, marketCaps, totalVolume } as IDataObject);
+					}
+				}
+
+				//https://www.coingecko.com/api/documentations/v3#/coins/get_coins__id__ohlc
+				if (operation === 'candlestick') {
+
+					const baseCurrency = this.getNodeParameter('baseCurrency', i) as string;
+					const quoteCurrency = this.getNodeParameter('quoteCurrency', i) as string;
+					const days = this.getNodeParameter('days', i) as string;
+
+					qs.vs_currency = quoteCurrency;
+					qs.days = days;
+
+					responseData = await coinGeckoApiRequest.call(
+						this,
+						'GET',
+						`/coins/${baseCurrency}/ohlc`,
+						{},
+						qs,
+					);
+
+					for (let idx = 0; idx < responseData.length; idx++) {
+						const [time, open, high, low, close] = responseData[idx];
+						responseData[idx] = { time: moment(time).toISOString(), open, high, low, close } as IDataObject;
+					}
+				}
+			}
+
+			if (resource === 'event') {
+				//https://www.coingecko.com/api/documentations/v3#/events/get_events
+				if (operation === 'getAll') {
+
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					Object.assign(qs, options);
+
+					if (returnAll) {
+						responseData = await coinGeckoRequestAllItems.call(
+							this,
+							'data',
+							'GET',
+							'/events',
+							{},
+							qs,
+						);
+					} else {
+						const limit = this.getNodeParameter('limit', i) as number;
+
+						qs.per_page = limit;
+
+						responseData = await coinGeckoApiRequest.call(
+							this,
+							'GET',
+							'/events',
+							{},
+							qs,
+						);
+						responseData = responseData.data;
+					}
+				}
+			}
+
+			if (resource === 'simple') {
+				//https://www.coingecko.com/api/documentations/v3#/simple/get_simple_price
+				if (operation === 'price') {
+
+					const ids = this.getNodeParameter('ids', i) as string;
+					const currencies = this.getNodeParameter('currencies', i) as string[];
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					qs.ids = ids,
+						qs.vs_currencies = currencies.join(',');
+
+					Object.assign(qs, options);
+
+					responseData = await coinGeckoApiRequest.call(
+						this,
+						'GET',
+						'/simple/price',
+						{},
+						qs,
+					);
+				}
+
+				//https://www.coingecko.com/api/documentations/v3#/simple/get_simple_token_price__id_
+				if (operation === 'tokenPrice') {
+
+					const id = this.getNodeParameter('id', i) as string;
+					const contractAddresses = this.getNodeParameter('contractAddresses', i) as string;
+					const currencies = this.getNodeParameter('currencies', i) as string[];
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					qs.contract_addresses = contractAddresses;
+					qs.vs_currencies = currencies.join(',');
+
+					Object.assign(qs, options);
+
+					responseData = await coinGeckoApiRequest.call(
+						this,
+						'GET',
+						`/simple/token_price/${id}`,
+						{},
+						qs,
+					);
+				}
+			}
+
+		}
+		if (Array.isArray(responseData)) {
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+		} else if (responseData !== undefined) {
+			returnData.push(responseData as IDataObject);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/CoinGecko/EventDescription.ts b/packages/nodes-base/nodes/CoinGecko/EventDescription.ts
new file mode 100644
index 000000000..4a6f5dc59
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/EventDescription.ts
@@ -0,0 +1,130 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const eventOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'event',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all events',
+			},
+		],
+		default: 'getAll',
+	},
+] as INodeProperties[];
+
+export const eventFields = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'event',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'event',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'event',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Country code',
+				name: 'country_code',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getEventCountryCodes',
+				},
+				default: '',
+				description: 'Country code of event.',
+			},
+			{
+				displayName: 'From date',
+				name: 'from_date',
+				type: 'dateTime',
+				default: '',
+				description: 'Lists events after this date.',
+			},
+			{
+				displayName: 'To date',
+				name: 'to_date',
+				type: 'dateTime',
+				default: '',
+				description: 'Lists events before this date.',
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getEventTypes',
+				},
+				default: '',
+				description: 'Type of event.',
+			},
+			{
+				displayName: 'Upcoming events only',
+				name: 'upcoming_events_only',
+				type: 'boolean',
+				default: true,
+				description: 'Lists only upcoming events.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
new file mode 100644
index 000000000..d5f3e0b51
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
@@ -0,0 +1,67 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function coinGeckoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string,
+	endpoint: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+	let options: OptionsWithUri = {
+		headers: {
+			'Accept': 'application/json',
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://api.coingecko.com/api/v3${endpoint}`,
+		json: true,
+	};
+
+	options = Object.assign({}, options, option);
+
+	try {
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+
+		//@ts-ignore
+		return await this.helpers.request.call(this, options);
+
+	} catch (error) {
+
+		throw error;
+	}
+}
+
+export async function coinGeckoRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let respData;
+	query.per_page = 250;
+	query.page = 1;
+
+	do {
+		responseData = await coinGeckoApiRequest.call(this, method, endpoint, body, query);
+		query.page++;
+		respData = responseData;
+		if (propertyName !== '') {
+			respData = responseData[propertyName];
+		}
+		returnData.push.apply(returnData, respData);
+	} while (
+		respData.length !== 0
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/CoinGecko/coinGecko.png b/packages/nodes-base/nodes/CoinGecko/coinGecko.png
new file mode 100644
index 000000000..0b154ae2a
Binary files /dev/null and b/packages/nodes-base/nodes/CoinGecko/coinGecko.png differ
diff --git a/packages/nodes-base/nodes/Contentful/AssetDescription.ts b/packages/nodes-base/nodes/Contentful/AssetDescription.ts
index 30b167713..f10046c32 100644
--- a/packages/nodes-base/nodes/Contentful/AssetDescription.ts
+++ b/packages/nodes-base/nodes/Contentful/AssetDescription.ts
@@ -52,7 +52,7 @@ export const fields = [
 			},
 		},
 		default: 'master',
-		description: 'The id for the Contentful environment (e.g. master, staging, etc.). Depending on your plan, you might not have environments. In that case use "master".'
+		description: 'The id for the Contentful environment (e.g. master, staging, etc.). Depending on your plan, you might not have environments. In that case use "master".',
 	},
 	{
 		displayName: 'Return All',
@@ -104,7 +104,7 @@ export const fields = [
 		displayOptions: {
 			show: {
 				resource: [
-					resource.value
+					resource.value,
 				],
 				operation: [
 					'get',
diff --git a/packages/nodes-base/nodes/Contentful/ContentTypeDescription.ts b/packages/nodes-base/nodes/Contentful/ContentTypeDescription.ts
index 05e18b137..0bac8e11d 100644
--- a/packages/nodes-base/nodes/Contentful/ContentTypeDescription.ts
+++ b/packages/nodes-base/nodes/Contentful/ContentTypeDescription.ts
@@ -47,7 +47,7 @@ export const fields = [
 			},
 		},
 		default: 'master',
-		description: 'The id for the Contentful environment (e.g. master, staging, etc.). Depending on your plan, you might not have environments. In that case use "master".'
+		description: 'The id for the Contentful environment (e.g. master, staging, etc.). Depending on your plan, you might not have environments. In that case use "master".',
 	},
 	{
 		displayName: 'Content Type ID',
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.ts b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
index b4dde2ba0..0097ee180 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.ts
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
@@ -10,8 +10,8 @@ import {
 } from 'n8n-workflow';
 
 import {
-	contentfulApiRequest,
 	contenfulApiRequestAllItems,
+	contentfulApiRequest,
 } from './GenericFunctions';
 
 import * as SpaceDescription from './SpaceDescription';
@@ -31,14 +31,14 @@ export class Contentful implements INodeType {
 		description: 'Consume Contenful API',
 		defaults: {
 			name: 'Contentful',
-			color: '#2E75D4'
+			color: '#2E75D4',
 		},
 		inputs: ['main'],
 		outputs: ['main'],
 		credentials: [
 			{
 				name: 'contentfulApi',
-				required: true
+				required: true,
 			},
 		],
 		properties: [
@@ -51,11 +51,11 @@ export class Contentful implements INodeType {
 				options: [
 					{
 						name: 'Delivery API',
-						value: 'deliveryApi'
+						value: 'deliveryApi',
 					},
 					{
 						name: 'Preview API',
-						value: 'previewApi'
+						value: 'previewApi',
 					},
 				],
 			},
@@ -72,7 +72,7 @@ export class Contentful implements INodeType {
 					SpaceDescription.resource,
 				],
 				default: 'entry',
-				description: 'The resource to operate on.'
+				description: 'The resource to operate on.',
 			},
 
 			// Operations:
diff --git a/packages/nodes-base/nodes/Contentful/EntryDescription.ts b/packages/nodes-base/nodes/Contentful/EntryDescription.ts
index dcce1d7c6..c377ed3f6 100644
--- a/packages/nodes-base/nodes/Contentful/EntryDescription.ts
+++ b/packages/nodes-base/nodes/Contentful/EntryDescription.ts
@@ -31,8 +31,8 @@ export const operations = [
 			},
 		],
 		default: 'get',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const fields = [
diff --git a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
index 4c81f17bc..f5a25b8c4 100644
--- a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
@@ -27,7 +27,7 @@ export async function contentfulApiRequest(this: IExecuteFunctions | IExecuteSin
 		qs,
 		body,
 		uri: uri ||`https://${isPreview ? 'preview' : 'cdn'}.contentful.com${resource}`,
-		json: true
+		json: true,
 	};
 
 	if (isPreview) {
diff --git a/packages/nodes-base/nodes/Contentful/LocaleDescription.ts b/packages/nodes-base/nodes/Contentful/LocaleDescription.ts
index 5f06237af..a48d83cb7 100644
--- a/packages/nodes-base/nodes/Contentful/LocaleDescription.ts
+++ b/packages/nodes-base/nodes/Contentful/LocaleDescription.ts
@@ -48,7 +48,7 @@ export const fields = [
 			},
 		},
 		default: 'master',
-		description: 'The id for the Contentful environment (e.g. master, staging, etc.). Depending on your plan, you might not have environments. In that case use "master".'
+		description: 'The id for the Contentful environment (e.g. master, staging, etc.). Depending on your plan, you might not have environments. In that case use "master".',
 	},
 	{
 		displayName: 'Return All',
diff --git a/packages/nodes-base/nodes/Contentful/SearchParameterDescription.ts b/packages/nodes-base/nodes/Contentful/SearchParameterDescription.ts
index 9e89c340e..7a05ebc9e 100644
--- a/packages/nodes-base/nodes/Contentful/SearchParameterDescription.ts
+++ b/packages/nodes-base/nodes/Contentful/SearchParameterDescription.ts
@@ -21,17 +21,17 @@ export const fields = [
 						name: 'name',
 						type: 'string',
 						default: '',
-						description: 'Name of the search parameter to set.'
+						description: 'Name of the search parameter to set.',
 					},
 					{
 						displayName: 'Parameter Value',
 						name: 'value',
 						type: 'string',
 						default: '',
-						description: 'Value of the search parameter to set.'
+						description: 'Value of the search parameter to set.',
 					},
 				],
 			},
 		],
-	}
+	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Contentful/contentful.png b/packages/nodes-base/nodes/Contentful/contentful.png
index 4448da65a..475857593 100644
Binary files a/packages/nodes-base/nodes/Contentful/contentful.png and b/packages/nodes-base/nodes/Contentful/contentful.png differ
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index 7933379ad..9241dcece 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -7,8 +7,8 @@ import {
 	IDataObject,
 	INodeExecutionData,
 	INodePropertyOptions,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -59,7 +59,7 @@ export class ConvertKit implements INodeType {
 			{
 				name: 'convertKitApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -89,7 +89,7 @@ export class ConvertKit implements INodeType {
 					},
 				],
 				default: 'form',
-				description: 'The resource to operate on.'
+				description: 'The resource to operate on.',
 			},
 			//--------------------
 			// Field Description
@@ -170,7 +170,7 @@ export class ConvertKit implements INodeType {
 
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -389,7 +389,7 @@ export class ConvertKit implements INodeType {
 					const names = ((this.getNodeParameter('name', i) as string).split(',') as string[]).map((e) => ({ name: e }));
 
 					const body: IDataObject = {
-						tag: names
+						tag: names,
 					};
 
 					responseData = await convertKitApiRequest.call(this, 'POST', '/tags', body);
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
index 84fa78c93..b8f6706a8 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
@@ -7,8 +7,8 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -254,7 +254,7 @@ export class ConvertKitTrigger implements INodeType {
 
 				return returnData;
 			},
-		}
+		},
 	};
 
 	// @ts-ignore (because of request)
@@ -290,7 +290,7 @@ export class ConvertKitTrigger implements INodeType {
 				const body: IDataObject = {
 					target_url: webhookUrl as string,
 					event: {
-						name: event
+						name: event,
 					},
 				};
 
diff --git a/packages/nodes-base/nodes/ConvertKit/convertKit.png b/packages/nodes-base/nodes/ConvertKit/convertKit.png
index 2dc9cf3ee..556d9cdfc 100644
Binary files a/packages/nodes-base/nodes/ConvertKit/convertKit.png and b/packages/nodes-base/nodes/ConvertKit/convertKit.png differ
diff --git a/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts b/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
index 2c95c25eb..36ab84d6d 100644
--- a/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
+++ b/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -33,7 +33,7 @@ export class CopperTrigger implements INodeType {
 			{
 				name: 'copperApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
index 31bd1379c..7c9a86619 100644
--- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
@@ -30,7 +30,7 @@ export async function copperApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs,
 		body,
 		uri: uri ||`https://api.prosperworks.com/developer_api/v1${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index daddda129..a93c0c222 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -21,7 +21,7 @@ export class CrateDb implements INodeType {
 		icon: 'file:cratedb.png',
 		group: ['input'],
 		version: 1,
-		description: 'Gets, add and update data in CrateDB.',
+		description: 'Add and update data in CrateDB.',
 		defaults: {
 			name: 'CrateDB',
 			color: '#47889f',
@@ -43,17 +43,17 @@ export class CrateDb implements INodeType {
 					{
 						name: 'Execute Query',
 						value: 'executeQuery',
-						description: 'Executes a SQL query.',
+						description: 'Execute an SQL query',
 					},
 					{
 						name: 'Insert',
 						value: 'insert',
-						description: 'Insert rows in database.',
+						description: 'Insert rows in database',
 					},
 					{
 						name: 'Update',
 						value: 'update',
-						description: 'Updates rows in database.',
+						description: 'Update rows in database',
 					},
 				],
 				default: 'insert',
diff --git a/packages/nodes-base/nodes/Cron.node.ts b/packages/nodes-base/nodes/Cron.node.ts
index 7f91b401e..20af9b84a 100644
--- a/packages/nodes-base/nodes/Cron.node.ts
+++ b/packages/nodes-base/nodes/Cron.node.ts
@@ -234,21 +234,21 @@ export class Cron implements INodeType {
 								options: [
 									{
 										name: 'Minutes',
-										value: 'minutes'
+										value: 'minutes',
 									},
 									{
 										name: 'Hours',
-										value: 'hours'
+										value: 'hours',
 									},
 								],
 								default: 'hours',
 								description: 'If it should trigger all X minutes or hours.',
 							},
-						]
+						],
 					},
 				],
-			}
-		]
+			},
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/Crypto.node.ts b/packages/nodes-base/nodes/Crypto.node.ts
index 511a8a18d..beb90f3ff 100644
--- a/packages/nodes-base/nodes/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto.node.ts
@@ -1,12 +1,11 @@
 import { set } from 'lodash';
 import { IExecuteFunctions } from 'n8n-core';
 import {
+	ILoadOptionsFunctions,
 	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodePropertyOptions,
 } from 'n8n-workflow';
 
 import {
@@ -41,17 +40,17 @@ export class Crypto implements INodeType {
 					{
 						name: 'Hash',
 						description: 'Hash a text in a specified format.',
-						value: 'hash'
+						value: 'hash',
 					},
 					{
 						name: 'Hmac',
 						description: 'Hmac a text in a specified format.',
-						value: 'hmac'
+						value: 'hmac',
 					},
 					{
 						name: 'Sign',
 						description: 'Sign a string using a private key.',
-						value: 'sign'
+						value: 'sign',
 					},
 				],
 				default: 'hash',
@@ -62,7 +61,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'hash'
+							'hash',
 						],
 					},
 				},
@@ -91,7 +90,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'hash'
+							'hash',
 						],
 					},
 				},
@@ -109,7 +108,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action: [
-							'hash'
+							'hash',
 						],
 					},
 				},
@@ -121,7 +120,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'hash'
+							'hash',
 						],
 					},
 				},
@@ -145,7 +144,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'hmac'
+							'hmac',
 						],
 					},
 				},
@@ -174,7 +173,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'hmac'
+							'hmac',
 						],
 					},
 				},
@@ -192,7 +191,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action: [
-							'hmac'
+							'hmac',
 						],
 					},
 				},
@@ -204,7 +203,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'hmac'
+							'hmac',
 						],
 					},
 				},
@@ -242,7 +241,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'sign'
+							'sign',
 						],
 					},
 				},
@@ -260,7 +259,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action: [
-							'sign'
+							'sign',
 						],
 					},
 				},
@@ -313,7 +312,7 @@ export class Crypto implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'sign'
+							'sign',
 						],
 					},
 				},
@@ -345,7 +344,7 @@ export class Crypto implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/CustomerIo/CampaignDescription.ts b/packages/nodes-base/nodes/CustomerIo/CampaignDescription.ts
index 0893a9f21..7898a9289 100644
--- a/packages/nodes-base/nodes/CustomerIo/CampaignDescription.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CampaignDescription.ts
@@ -48,7 +48,7 @@ export const campaignFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier for the campaign',
@@ -69,7 +69,7 @@ export const campaignFields = [
 				],
 				operation: [
 					'getMetrics',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier for the campaign',
@@ -86,7 +86,7 @@ export const campaignFields = [
 				],
 				operation: [
 					'getMetrics',
-				]
+				],
 			},
 		},
 		description: 'Specify metric period',
@@ -107,7 +107,7 @@ export const campaignFields = [
 				name: 'Months',
 				value: 'months',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'JSON Parameters',
@@ -138,7 +138,7 @@ export const campaignFields = [
 					'campaign',
 				],
 				operation: [
-					'getMetrics'
+					'getMetrics',
 				],
 				jsonParameters: [
 					false,
@@ -155,7 +155,7 @@ export const campaignFields = [
 				typeOptions: {
 					minValue: 0,
 					maxValue: 120,
-				}
+				},
 			},
 			{
 				displayName: 'Type',
@@ -192,7 +192,7 @@ export const campaignFields = [
 						name: 'Webhook',
 						value: 'webhook',
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerDescription.ts b/packages/nodes-base/nodes/CustomerIo/CustomerDescription.ts
index a6a9576a9..abb0dcbb1 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerDescription.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerDescription.ts
@@ -47,7 +47,7 @@ export const customerFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier for the customer.',
@@ -69,7 +69,7 @@ export const customerFields = [
 				],
 				operation: [
 					'upsert',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier for the customer.',
@@ -168,7 +168,7 @@ export const customerFields = [
 							},
 						],
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Email',
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
index f664820bb..f97efc052 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
@@ -3,15 +3,30 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
-import { customerIoApiRequest, validateJSON } from './GenericFunctions';
-import { campaignOperations, campaignFields } from './CampaignDescription';
-import { customerOperations, customerFields } from './CustomerDescription';
-import { eventOperations, eventFields } from './EventDescription';
-import { segmentOperations, segmentFields } from './SegmentDescription';
+import {
+	customerIoApiRequest,
+	validateJSON,
+} from './GenericFunctions';
+import {
+	campaignFields,
+	campaignOperations,
+} from './CampaignDescription';
+import {
+	customerFields,
+	customerOperations,
+} from './CustomerDescription';
+import {
+	eventFields,
+	eventOperations,
+} from './EventDescription';
+import {
+	segmentFields,
+	segmentOperations,
+} from './SegmentDescription';
 
 
 export class CustomerIo implements INodeType {
@@ -33,7 +48,7 @@ export class CustomerIo implements INodeType {
 			{
 				name: 'customerIoApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -72,7 +87,7 @@ export class CustomerIo implements INodeType {
 			...eventFields,
 			// SEGMENT
 			...segmentOperations,
-			...segmentFields
+			...segmentFields,
 		],
 	};
 
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
index 08990d17b..eb258a20b 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
@@ -4,9 +4,9 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
-	INodeType,
 	IDataObject,
+	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -315,14 +315,14 @@ export class CustomerIoTrigger implements INodeType {
 				}
 				return true;
 			},
-		}
+		},
 	};
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const bodyData = this.getBodyData();
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(bodyData)
+				this.helpers.returnJsonArray(bodyData),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/CustomerIo/EventDescription.ts b/packages/nodes-base/nodes/CustomerIo/EventDescription.ts
index ac73dde9f..208228afb 100644
--- a/packages/nodes-base/nodes/CustomerIo/EventDescription.ts
+++ b/packages/nodes-base/nodes/CustomerIo/EventDescription.ts
@@ -47,7 +47,7 @@ export const eventFields = [
 				],
 				operation: [
 					'track',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier for the customer.',
@@ -64,7 +64,7 @@ export const eventFields = [
 				],
 				operation: [
 					'track',
-				]
+				],
 			},
 		},
 		description: 'Name of the event to track.',
@@ -125,7 +125,7 @@ export const eventFields = [
 				],
 				jsonParameters: [
 					false,
-				]
+				],
 			},
 		},
 		options: [
@@ -163,7 +163,7 @@ export const eventFields = [
 							},
 						],
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Type',
@@ -190,7 +190,7 @@ export const eventFields = [
 				],
 				operation: [
 					'trackAnonymous',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier for the customer.',
@@ -251,7 +251,7 @@ export const eventFields = [
 				],
 				jsonParameters: [
 					false,
-				]
+				],
 			},
 		},
 		options: [
@@ -288,7 +288,7 @@ export const eventFields = [
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/CustomerIo/SegmentDescription.ts b/packages/nodes-base/nodes/CustomerIo/SegmentDescription.ts
index 9586c1373..3f1e691f2 100644
--- a/packages/nodes-base/nodes/CustomerIo/SegmentDescription.ts
+++ b/packages/nodes-base/nodes/CustomerIo/SegmentDescription.ts
@@ -46,7 +46,7 @@ export const segmentFields = [
 				operation: [
 					'add',
 					'remove',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier of the segment.',
@@ -65,7 +65,7 @@ export const segmentFields = [
 				operation: [
 					'add',
 					'remove',
-				]
+				],
 			},
 		},
 		description: 'A list of customer ids to add to the segment.',
diff --git a/packages/nodes-base/nodes/CustomerIo/customerio.png b/packages/nodes-base/nodes/CustomerIo/customerio.png
index 8ff1d817b..0e733e592 100644
Binary files a/packages/nodes-base/nodes/CustomerIo/customerio.png and b/packages/nodes-base/nodes/CustomerIo/customerio.png differ
diff --git a/packages/nodes-base/nodes/DateTime.node.ts b/packages/nodes-base/nodes/DateTime.node.ts
index 15c33dcff..019ff3d4a 100644
--- a/packages/nodes-base/nodes/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime.node.ts
@@ -6,9 +6,9 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	INodePropertyOptions,
 } from 'n8n-workflow';
 
 
@@ -35,7 +35,7 @@ export class DateTime implements INodeType {
 					{
 						name: 'Format a Date',
 						description: 'Convert a date to a different format',
-						value: 'format'
+						value: 'format',
 					},
 				],
 				default: 'format',
@@ -162,7 +162,7 @@ export class DateTime implements INodeType {
 				displayOptions: {
 					show: {
 						action:[
-							'format'
+							'format',
 						],
 					},
 				},
@@ -218,7 +218,7 @@ export class DateTime implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Discord/Discord.node.ts b/packages/nodes-base/nodes/Discord/Discord.node.ts
index fcd701f27..995c0e7e0 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.ts
+++ b/packages/nodes-base/nodes/Discord/Discord.node.ts
@@ -2,9 +2,9 @@ import { get } from 'lodash';
 import { IExecuteFunctions } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 export class Discord implements INodeType {
@@ -41,7 +41,7 @@ export class Discord implements INodeType {
 				},
 				default: '',
 				description: 'The text to send.',
-			}
+			},
 		],
 	};
 
@@ -67,9 +67,9 @@ export class Discord implements INodeType {
 				body,
 				uri: `${webhookUri}`,
 				headers: {
-					'content-type': 'application/json; charset=utf-8'
+					'content-type': 'application/json; charset=utf-8',
 				},
-				json: true
+				json: true,
 			};
 
 			let maxTries = 5;
diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.ts b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
index 22746cfd3..8278f3997 100644
--- a/packages/nodes-base/nodes/Disqus/Disqus.node.ts
+++ b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
@@ -3,9 +3,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import { disqusApiRequest, disqusApiRequestAllItems } from './GenericFunctions';
@@ -30,7 +30,7 @@ export class Disqus implements INodeType {
 			{
 				name: 'disqusApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -81,7 +81,7 @@ export class Disqus implements INodeType {
 						name: 'Get All Posts',
 						value: 'getPosts',
 						description: 'Return a list of posts within a forum',
-					}
+					},
 				],
 				default: 'get',
 				description: 'The operation to perform.',
@@ -316,7 +316,7 @@ export class Disqus implements INodeType {
 							},
 						],
 						default: [],
-						description: 'You may specify filters for your response.'
+						description: 'You may specify filters for your response.',
 					},
 					{
 						displayName: 'Include',
@@ -343,7 +343,7 @@ export class Disqus implements INodeType {
 							{
 								name: 'DESC',
 								value: 'desc',
-							}
+							},
 						],
 						default: 'asc',
 						description: 'You may specify order to sort your response.',
@@ -469,7 +469,7 @@ export class Disqus implements INodeType {
 							{
 								name: 'DESC',
 								value: 'desc',
-							}
+							},
 						],
 						default: 'asc',
 						description: 'You may specify order to sort your response.',
@@ -606,7 +606,7 @@ export class Disqus implements INodeType {
 							{
 								name: 'DESC',
 								value: 'desc',
-							}
+							},
 						],
 						default: 'asc',
 						description: 'You may specify order to sort your response.',
@@ -626,7 +626,7 @@ export class Disqus implements INodeType {
 						description: 'Looks up a thread by ID. You may pass us the "ident"<br />query type instead of an ID by including "forum". You may<br />pass us the "link" query type to filter by URL. You must pass<br />the "forum" if you do not have the Pro API Access addon.',
 					},
 				],
-			}
+			},
 		],
 	};
 
diff --git a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
index 5f5f88bfd..b9bb22207 100644
--- a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
@@ -38,7 +38,7 @@ export async function disqusApiRequest(
 		method,
 		body,
 		uri: `https://disqus.com/api/3.0/${uri}?${queryStringElements.join('&')}`,
-		json: true
+		json: true,
 	};
 
 	options = Object.assign({}, options, option);
diff --git a/packages/nodes-base/nodes/Drift/ContactDescription.ts b/packages/nodes-base/nodes/Drift/ContactDescription.ts
index 146adefa7..26d6598bb 100644
--- a/packages/nodes-base/nodes/Drift/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Drift/ContactDescription.ts
@@ -116,7 +116,7 @@ export const contactFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the contact.',
@@ -159,7 +159,7 @@ export const contactFields = [
 				default: '',
 				description: 'The phone number associated with the contact.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 contact:get                                */
@@ -177,7 +177,7 @@ export const contactFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the contact.',
@@ -198,7 +198,7 @@ export const contactFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the contact.',
diff --git a/packages/nodes-base/nodes/Drift/Drift.node.ts b/packages/nodes-base/nodes/Drift/Drift.node.ts
index 46afa3d51..f91de6897 100644
--- a/packages/nodes-base/nodes/Drift/Drift.node.ts
+++ b/packages/nodes-base/nodes/Drift/Drift.node.ts
@@ -2,10 +2,10 @@ import {
 	IExecuteFunctions,
 } from 'n8n-core';
 import {
-	INodeTypeDescription,
-	INodeType,
-	INodeExecutionData,
 	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	driftApiRequest,
diff --git a/packages/nodes-base/nodes/Drift/GenericFunctions.ts b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
index 904fc4c6b..f021a01d3 100644
--- a/packages/nodes-base/nodes/Drift/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
@@ -18,7 +18,7 @@ export async function driftApiRequest(this: IExecuteFunctions | IWebhookFunction
 		body,
 		qs: query,
 		uri: uri || `https://driftapi.com${resource}`,
-		json: true
+		json: true,
 	};
 
 	if (!Object.keys(body).length) {
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index 6e05fa5c5..1c7efac40 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -5,9 +5,9 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -66,7 +66,7 @@ export class Dropbox implements INodeType {
 					{
 						name: 'OAuth2',
 						value: 'oAuth2',
-					}
+					},
 				],
 				default: 'accessToken',
 				description: 'Means of authenticating with the service.',
@@ -192,7 +192,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'copy'
+							'copy',
 						],
 						resource: [
 							'file',
@@ -212,7 +212,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'copy'
+							'copy',
 						],
 						resource: [
 							'file',
@@ -236,7 +236,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'delete'
+							'delete',
 						],
 						resource: [
 							'file',
@@ -261,7 +261,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'move'
+							'move',
 						],
 						resource: [
 							'file',
@@ -281,7 +281,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'move'
+							'move',
 						],
 						resource: [
 							'file',
@@ -305,7 +305,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'download'
+							'download',
 						],
 						resource: [
 							'file',
@@ -324,7 +324,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'download'
+							'download',
 						],
 						resource: [
 							'file',
@@ -346,7 +346,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
@@ -364,7 +364,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
@@ -381,13 +381,13 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
 						],
 						binaryData: [
-							false
+							false,
 						],
 					},
 
@@ -404,13 +404,13 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
 						],
 						binaryData: [
-							true
+							true,
 						],
 					},
 
@@ -437,7 +437,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'folder',
@@ -459,7 +459,7 @@ export class Dropbox implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'list'
+							'list',
 						],
 						resource: [
 							'folder',
@@ -502,7 +502,7 @@ export class Dropbox implements INodeType {
 					requestMethod = 'POST';
 
 					query.arg = JSON.stringify({
-						path: this.getNodeParameter('path', i) as string
+						path: this.getNodeParameter('path', i) as string,
 					});
 
 					endpoint = 'https://content.dropboxapi.com/2/files/download';
@@ -517,7 +517,7 @@ export class Dropbox implements INodeType {
 
 					query.arg = JSON.stringify({
 						mode: 'overwrite',
-						path: this.getNodeParameter('path', i) as string
+						path: this.getNodeParameter('path', i) as string,
 					});
 
 					endpoint = 'https://content.dropboxapi.com/2/files/upload';
diff --git a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
index bf24762df..880ec6bc8 100644
--- a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
@@ -59,7 +59,7 @@ export async function dropboxApiRequest(this: IHookFunctions | IExecuteFunctions
 		if (error.error && error.error.error_summary) {
 			// Try to return the error prettier
 			throw new Error(
-				`Dropbox error response [${error.statusCode}]: ${error.error.error_summary}`
+				`Dropbox error response [${error.statusCode}]: ${error.error.error_summary}`,
 			);
 		}
 
diff --git a/packages/nodes-base/nodes/EditImage.node.ts b/packages/nodes-base/nodes/EditImage.node.ts
index 88db92421..9e10000ff 100644
--- a/packages/nodes-base/nodes/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage.node.ts
@@ -95,7 +95,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'text'
+							'text',
 						],
 					},
 				},
@@ -109,7 +109,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'text'
+							'text',
 						],
 					},
 				},
@@ -123,7 +123,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'text'
+							'text',
 						],
 					},
 				},
@@ -137,7 +137,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'text'
+							'text',
 						],
 					},
 				},
@@ -151,7 +151,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'text'
+							'text',
 						],
 					},
 				},
@@ -168,7 +168,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'text'
+							'text',
 						],
 					},
 				},
@@ -191,7 +191,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'blur'
+							'blur',
 						],
 					},
 				},
@@ -209,7 +209,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'blur'
+							'blur',
 						],
 					},
 				},
@@ -228,7 +228,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'border'
+							'border',
 						],
 					},
 				},
@@ -242,7 +242,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'border'
+							'border',
 						],
 					},
 				},
@@ -256,7 +256,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'border'
+							'border',
 						],
 					},
 				},
@@ -275,7 +275,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'crop'
+							'crop',
 						],
 					},
 				},
@@ -289,7 +289,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'crop'
+							'crop',
 						],
 					},
 				},
@@ -303,7 +303,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'crop'
+							'crop',
 						],
 					},
 				},
@@ -317,7 +317,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'crop'
+							'crop',
 						],
 					},
 				},
@@ -335,7 +335,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'resize'
+							'resize',
 						],
 					},
 				},
@@ -349,7 +349,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'resize'
+							'resize',
 						],
 					},
 				},
@@ -390,7 +390,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'resize'
+							'resize',
 						],
 					},
 				},
@@ -412,7 +412,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'rotate'
+							'rotate',
 						],
 					},
 				},
@@ -426,7 +426,7 @@ export class EditImage implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'rotate'
+							'rotate',
 						],
 					},
 				},
@@ -506,7 +506,7 @@ export class EditImage implements INodeType {
 
 				],
 			},
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/EmailReadImap.node.ts b/packages/nodes-base/nodes/EmailReadImap.node.ts
index 920c0d41f..22aee855c 100644
--- a/packages/nodes-base/nodes/EmailReadImap.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap.node.ts
@@ -9,7 +9,13 @@ import {
 	ITriggerResponse,
 } from 'n8n-workflow';
 
-import { connect as imapConnect, ImapSimple, ImapSimpleOptions, getParts, Message } from 'imap-simple';
+import {
+	connect as imapConnect,
+	getParts,
+	ImapSimple,
+	ImapSimpleOptions,
+	Message,
+} from 'imap-simple';
 import {
 	simpleParser,
 	Source as ParserSource,
@@ -35,7 +41,7 @@ export class EmailReadImap implements INodeType {
 			{
 				name: 'imap',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -83,7 +89,7 @@ export class EmailReadImap implements INodeType {
 					{
 						name: 'RAW',
 						value: 'raw',
-						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.'
+						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.',
 					},
 					{
 						name: 'Resolved',
@@ -137,6 +143,13 @@ export class EmailReadImap implements INodeType {
 				placeholder: 'Add Option',
 				default: {},
 				options: [
+					{
+						displayName: 'Custom email rules',
+						name: 'customEmailConfig',
+						type: 'string',
+						default: '["UNSEEN"]',
+						description: 'Custom email fetching rules. See <a href="https://github.com/mscdex/node-imap">node-imap</a>\'s search function for more details',
+					},
 					{
 						displayName: 'Ignore SSL Issues',
 						name: 'allowUnauthorizedCerts',
@@ -162,6 +175,16 @@ export class EmailReadImap implements INodeType {
 		const postProcessAction = this.getNodeParameter('postProcessAction') as string;
 		const options = this.getNodeParameter('options', {}) as IDataObject;
 
+		let searchCriteria = [
+			'UNSEEN',
+		];
+		if (options.customEmailConfig !== undefined) {
+			try {
+				searchCriteria = JSON.parse(options.customEmailConfig as string);
+			} catch (err) {
+				throw new Error(`Custom email config is not valid JSON.`);
+			}
+		}
 
 		// Returns the email text
 		const getText = async (parts: any[], message: Message, subtype: string) => { // tslint:disable-line:no-any
@@ -177,7 +200,11 @@ export class EmailReadImap implements INodeType {
 				return '';
 			}
 
-			return await connection.getPartData(message, textParts[0]);
+			try{
+				return await connection.getPartData(message, textParts[0]);
+			} catch {
+				return '';
+			}
 		};
 
 
@@ -209,11 +236,8 @@ export class EmailReadImap implements INodeType {
 
 
 		// Returns all the new unseen messages
-		const getNewEmails = async (connection: ImapSimple): Promise<INodeExecutionData[]> => {
+		const getNewEmails = async (connection: ImapSimple, searchCriteria: string[]): Promise<INodeExecutionData[]> => {
 			const format = this.getNodeParameter('format', 0) as string;
-			const searchCriteria = [
-				'UNSEEN'
-			];
 
 			let fetchOptions = {};
 
@@ -238,8 +262,6 @@ export class EmailReadImap implements INodeType {
 			let attachments: IBinaryData[];
 			let propertyName: string;
 
-
-
 			// All properties get by default moved to metadata except the ones
 			// which are defined here which get set on the top level.
 			const topLevelProperties = [
@@ -279,7 +301,7 @@ export class EmailReadImap implements INodeType {
 							textHtml: await getText(parts, message, 'html'),
 							textPlain: await getText(parts, message, 'plain'),
 							metadata: {} as IDataObject,
-						}
+						},
 					};
 
 					messageHeader = message.parts.filter((part) => {
@@ -320,8 +342,8 @@ export class EmailReadImap implements INodeType {
 					// Return base64 string
 					newEmail = {
 						json: {
-							raw: part.body
-						}
+							raw: part.body,
+						},
 					};
 
 					newEmails.push(newEmail);
@@ -331,8 +353,6 @@ export class EmailReadImap implements INodeType {
 			return newEmails;
 		};
 
-
-
 		let connection: ImapSimple;
 
 		const config: ImapSimpleOptions = {
@@ -342,10 +362,10 @@ export class EmailReadImap implements INodeType {
 				host: credentials.host as string,
 				port: credentials.port as number,
 				tls: credentials.secure as boolean,
-				authTimeout: 3000
+				authTimeout: 3000,
 			},
 			onmail: async () => {
-				const returnData = await getNewEmails(connection);
+				const returnData = await getNewEmails(connection, searchCriteria);
 
 				if (returnData.length) {
 					this.emit([returnData]);
@@ -355,7 +375,7 @@ export class EmailReadImap implements INodeType {
 
 		if (options.allowUnauthorizedCerts === true) {
 			config.imap.tlsOptions = {
-				rejectUnauthorized: false
+				rejectUnauthorized: false,
 			};
 		}
 
@@ -364,7 +384,6 @@ export class EmailReadImap implements INodeType {
 		connection = await imapConnect(config);
 		await connection.openBox(mailbox);
 
-
 		// When workflow and so node gets set to inactive close the connectoin
 		async function closeFunction() {
 			await connection.end();
diff --git a/packages/nodes-base/nodes/EmailSend.node.ts b/packages/nodes-base/nodes/EmailSend.node.ts
index 209706845..f2ca08ad4 100644
--- a/packages/nodes-base/nodes/EmailSend.node.ts
+++ b/packages/nodes-base/nodes/EmailSend.node.ts
@@ -4,9 +4,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import { createTransport } from 'nodemailer';
@@ -30,7 +30,7 @@ export class EmailSend implements INodeType {
 			{
 				name: 'smtp',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			// TODO: Add choice for text as text or html  (maybe also from name)
@@ -152,14 +152,14 @@ export class EmailSend implements INodeType {
 		if(credentials.user || credentials.password) {
 			// @ts-ignore
 			connectionOptions.auth = {
-				user: credentials.user,
-				pass: credentials.password
+				user: credentials.user as string,
+				pass: credentials.password as string,
 			};
 		}
 
 		if (options.allowUnauthorizedCerts === true) {
 			connectionOptions.tls = {
-				rejectUnauthorized: false
+				rejectUnauthorized: false,
 			};
 		}
 
diff --git a/packages/nodes-base/nodes/ErrorTrigger.node.ts b/packages/nodes-base/nodes/ErrorTrigger.node.ts
index 4899c20e8..aa55dfd37 100644
--- a/packages/nodes-base/nodes/ErrorTrigger.node.ts
+++ b/packages/nodes-base/nodes/ErrorTrigger.node.ts
@@ -21,7 +21,7 @@ export class ErrorTrigger implements INodeType {
 		},
 		inputs: [],
 		outputs: ['main'],
-		properties: []
+		properties: [],
 	};
 
 
@@ -49,15 +49,15 @@ export class ErrorTrigger implements INodeType {
 					retryOf: '34',
 					error: {
 						message: 'Example Error Message',
-						stack: 'Stacktrace'
+						stack: 'Stacktrace',
 					},
 					lastNodeExecuted: 'Node With Error',
-					mode: 'manual'
+					mode: 'manual',
 				},
 				workflow: {
 					id: '1',
-					name: 'Example Workflow'
-				}
+					name: 'Example Workflow',
+				},
 			};
 		}
 
diff --git a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
index 0c9158b6c..26d8d7c2b 100644
--- a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
+++ b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
@@ -7,8 +7,8 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -87,7 +87,7 @@ export class EventbriteTrigger implements INodeType {
 				type: 'options',
 				required: true,
 				typeOptions: {
-					loadOptionsMethod: 'getOrganizations'
+					loadOptionsMethod: 'getOrganizations',
 				},
 				default: '',
 				description: '',
@@ -101,7 +101,7 @@ export class EventbriteTrigger implements INodeType {
 					loadOptionsDependsOn: [
 						'organization',
 					],
-					loadOptionsMethod: 'getEvents'
+					loadOptionsMethod: 'getEvents',
 				},
 				default: '',
 				description: '',
@@ -113,63 +113,63 @@ export class EventbriteTrigger implements INodeType {
 				options: [
 					{
 						name: 'attendee.updated',
-						value: 'attendee.updated'
+						value: 'attendee.updated',
 					},
 					{
 						name: 'attendee.checked_in',
-						value: 'attendee.checked_in'
+						value: 'attendee.checked_in',
 					},
 					{
 						name: 'attendee.checked_out',
-						value: 'attendee.checked_out'
+						value: 'attendee.checked_out',
 					},
 					{
 						name: 'event.created',
-						value: 'event.created'
+						value: 'event.created',
 					},
 					{
 						name: 'event.published',
-						value: 'event.published'
+						value: 'event.published',
 					},
 					{
 						name: 'event.unpublished',
-						value: 'event.unpublished'
+						value: 'event.unpublished',
 					},
 					{
 						name: 'event.updated',
-						value: 'event.updated'
+						value: 'event.updated',
 					},
 					{
 						name: 'order.placed',
-						value: 'order.placed'
+						value: 'order.placed',
 					},
 					{
 						name: 'order.refunded',
-						value: 'order.refunded'
+						value: 'order.refunded',
 					},
 					{
 						name: 'order.updated',
-						value: 'order.updated'
+						value: 'order.updated',
 					},
 					{
 						name: 'organizer.updated',
-						value: 'organizer.updated'
+						value: 'organizer.updated',
 					},
 					{
 						name: 'ticket_class.created',
-						value: 'ticket_class.created'
+						value: 'ticket_class.created',
 					},
 					{
 						name: 'ticket_class.deleted',
-						value: 'ticket_class.deleted'
+						value: 'ticket_class.deleted',
 					},
 					{
 						name: 'ticket_class.updated',
-						value: 'ticket_class.updated'
+						value: 'ticket_class.updated',
 					},
 					{
 						name: 'venue.updated',
-						value: 'venue.updated'
+						value: 'venue.updated',
 					},
 				],
 				required: true,
@@ -311,7 +311,7 @@ export class EventbriteTrigger implements INodeType {
 				workflowData: [
 					this.helpers.returnJsonArray({
 						placeholder: 'Test received. To display actual data of object get the webhook triggered by performing the action which triggers it.',
-					})
+					}),
 				],
 			};
 		}
diff --git a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
index 2392a0ae2..3916aece6 100644
--- a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
@@ -21,7 +21,7 @@ export async function eventbriteApiRequest(this: IHookFunctions | IExecuteFuncti
 		qs,
 		body,
 		uri: uri ||`https://www.eventbriteapi.com/v3${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Example.node.ts b/packages/nodes-base/nodes/Example.node.ts
new file mode 100644
index 000000000..fcc025197
--- /dev/null
+++ b/packages/nodes-base/nodes/Example.node.ts
@@ -0,0 +1,68 @@
+import { IExecuteFunctions } from 'n8n-core';
+import {
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+
+export class Example implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Example',
+		name: 'example',
+		group: ['input'],
+		version: 1,
+		description: 'Example',
+		defaults: {
+			name: 'Example',
+			color: '#0000FF',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Age',
+				name: 'age',
+				type: 'number',
+				default: 0,
+			},
+			{
+				displayName: 'Brand Name',
+				name: 'brandName',
+				type: 'string',
+				default: '',
+			},
+		],
+	};
+
+
+	execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+
+		const items = this.getInputData();
+
+		if (items.length === 0) {
+			items.push({json: {}});
+		}
+
+		const returnData: INodeExecutionData[] = [];
+		let item: INodeExecutionData;
+
+		for (let i = 0; i < items.length; i++) {
+			const age = this.getNodeParameter('age', i) as number | undefined;
+			const brandName = this.getNodeParameter('brandName', i) as string | undefined;
+
+			item = items[i];
+
+			const newItem: INodeExecutionData = {
+				json: {
+					age: age || item.json.age,
+					brandName: brandName || item.json.brandName,
+				},
+			};
+
+			returnData.push(newItem);
+		}
+
+		return this.prepareOutputData(returnData);
+	}
+}
diff --git a/packages/nodes-base/nodes/ExecuteCommand.node.ts b/packages/nodes-base/nodes/ExecuteCommand.node.ts
index 1d57e9084..55494ce9f 100644
--- a/packages/nodes-base/nodes/ExecuteCommand.node.ts
+++ b/packages/nodes-base/nodes/ExecuteCommand.node.ts
@@ -77,7 +77,7 @@ export class ExecuteCommand implements INodeType {
 				placeholder: 'echo "test"',
 				description: 'The command to execute',
 			},
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
index ec1c161a0..4e4988331 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
@@ -7,10 +7,10 @@ const fsReadFileAsync = promisify(fsReadFile);
 
 import { IExecuteFunctions } from 'n8n-core';
 import {
+	IExecuteWorkflowInfo,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IExecuteWorkflowInfo,
 	IWorkflowBase,
 } from 'n8n-workflow';
 
@@ -143,7 +143,7 @@ export class ExecuteWorkflow implements INodeType {
 				required: true,
 				description: 'The URL from which to load the workflow from.',
 			},
-		]
+		],
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 74171fd69..42d13cc87 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -45,7 +45,7 @@ export class FacebookGraphApi implements INodeType {
 					{
 						name: 'Video Uploads',
 						value: 'graph-video.facebook.com',
-					}
+					},
 				],
 				default: 'graph.facebook.com',
 				description: 'The Host URL of the request. Almost all requests are passed to the graph.facebook.com host URL. The single exception is video uploads, which use graph-video.facebook.com.',
@@ -265,7 +265,7 @@ export class FacebookGraphApi implements INodeType {
 						placeholder: '{\"field_name\": \"field_value\"}',
 						description: 'The query parameters to send, defined as a JSON object',
 						required: false,
-					}
+					},
 				],
 			},
 		],
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index 8eb772b2d..57f48559d 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -9,17 +9,17 @@ import {
 
 import {OptionsWithUri} from 'request';
 import {
-	layoutsApiRequest,
 	getFields,
 	getPortals,
 	getScripts,
 	getToken,
-	parseSort,
+	layoutsApiRequest,
+	logout,
+	parseFields,
 	parsePortals,
 	parseQuery,
 	parseScripts,
-	parseFields,
-	logout
+	parseSort,
 } from "./GenericFunctions";
 
 export class FileMaker implements INodeType {
@@ -143,7 +143,7 @@ export class FileMaker implements INodeType {
 							'records',
 						],
 					},
-				}
+				},
 			},
 			{
 				displayName: 'Limit',
@@ -159,7 +159,7 @@ export class FileMaker implements INodeType {
 							'records',
 						],
 					},
-				}
+				},
 			},
 			{
 				displayName: 'Get portals',
@@ -219,7 +219,7 @@ export class FileMaker implements INodeType {
 				displayOptions: {
 					show: {
 						action: [
-							'find'
+							'find',
 						],
 					},
 				},
@@ -277,8 +277,8 @@ export class FileMaker implements INodeType {
 											default: '',
 											description: 'Value to search',
 										},
-									]
-								}
+									],
+								},
 								],
 								description: 'Field Name',
 							},
@@ -286,9 +286,9 @@ export class FileMaker implements INodeType {
 								displayName: 'Omit',
 								name: 'omit',
 								type: 'boolean',
-								default: false
+								default: false,
 							},
-						]
+						],
 					},
 				],
 			},
@@ -353,16 +353,16 @@ export class FileMaker implements INodeType {
 								options: [
 									{
 										name: 'Ascend',
-										value: 'ascend'
+										value: 'ascend',
 									},
 									{
 										name: 'Descend',
-										value: 'descend'
+										value: 'descend',
 									},
 								],
 								description: 'Sort order.',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -379,7 +379,7 @@ export class FileMaker implements INodeType {
 							'record',
 							'records',
 						],
-					}
+					},
 				},
 			},
 			{
@@ -400,7 +400,7 @@ export class FileMaker implements INodeType {
 							'records',
 						],
 						setScriptBefore: [
-							true
+							true,
 						],
 					},
 				},
@@ -421,7 +421,7 @@ export class FileMaker implements INodeType {
 							'records',
 						],
 						setScriptBefore: [
-							true
+							true,
 						],
 					},
 				},
@@ -441,7 +441,7 @@ export class FileMaker implements INodeType {
 							'record',
 							'records',
 						],
-					}
+					},
 				},
 			},
 			{
@@ -462,7 +462,7 @@ export class FileMaker implements INodeType {
 							'records',
 						],
 						setScriptSort: [
-							true
+							true,
 						],
 					},
 				},
@@ -483,7 +483,7 @@ export class FileMaker implements INodeType {
 							'records',
 						],
 						setScriptSort: [
-							true
+							true,
 						],
 					},
 				},
@@ -503,7 +503,7 @@ export class FileMaker implements INodeType {
 							'record',
 							'records',
 						],
-					}
+					},
 				},
 			},
 			{
@@ -524,7 +524,7 @@ export class FileMaker implements INodeType {
 							'records',
 						],
 						setScriptAfter: [
-							true
+							true,
 						],
 					},
 				},
@@ -545,7 +545,7 @@ export class FileMaker implements INodeType {
 							'records',
 						],
 						setScriptAfter: [
-							true
+							true,
 						],
 					},
 				},
@@ -583,7 +583,7 @@ export class FileMaker implements INodeType {
 							'edit',
 						],
 					},
-				}
+				},
 			},
 			{
 				displayName: 'Fields',
@@ -625,7 +625,7 @@ export class FileMaker implements INodeType {
 								type: 'string',
 								default: '',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -645,7 +645,7 @@ export class FileMaker implements INodeType {
 				displayOptions: {
 					show: {
 						action: [
-							'performscript'
+							'performscript',
 						],
 					},
 				},
@@ -661,14 +661,14 @@ export class FileMaker implements INodeType {
 				displayOptions: {
 					show: {
 						action: [
-							'performscript'
+							'performscript',
 						],
 					},
 				},
 				placeholder: 'Script Parameters',
 				description: 'A parameter for the FileMaker script.',
 			},
-		]
+		],
 	};
 
 	methods = {
@@ -803,7 +803,7 @@ export class FileMaker implements INodeType {
 						'Authorization': `Bearer ${token}`,
 					},
 					method: 'GET',
-					json: true
+					json: true,
 				};
 
 				const layout = this.getNodeParameter('layout', i) as string;
@@ -813,7 +813,7 @@ export class FileMaker implements INodeType {
 					requestOptions.uri = url + `/databases/${database}/layouts/${layout}/records/${recid}`;
 					requestOptions.qs = {
 						'portal': JSON.stringify(parsePortals.call(this, i)),
-						...parseScripts.call(this, i)
+						...parseScripts.call(this, i),
 					};
 				} else if (action === 'records') {
 					requestOptions.uri = url + `/databases/${database}/layouts/${layout}/records`;
@@ -821,7 +821,7 @@ export class FileMaker implements INodeType {
 						'_offset': this.getNodeParameter('offset', i),
 						'_limit': this.getNodeParameter('limit', i),
 						'portal': JSON.stringify(parsePortals.call(this, i)),
-						...parseScripts.call(this, i)
+						...parseScripts.call(this, i),
 					};
 					const sort = parseSort.call(this, i);
 					if (sort) {
@@ -835,7 +835,7 @@ export class FileMaker implements INodeType {
 						'offset': this.getNodeParameter('offset', i),
 						'limit': this.getNodeParameter('limit', i),
 						'layout.response': this.getNodeParameter('responseLayout', i),
-						...parseScripts.call(this, i)
+						...parseScripts.call(this, i),
 					};
 					const sort = parseSort.call(this, i);
 					if (sort) {
@@ -850,7 +850,7 @@ export class FileMaker implements INodeType {
 					requestOptions.body = {
 						fieldData: {...parseFields.call(this, i)},
 						portalData: {},
-						...parseScripts.call(this, i)
+						...parseScripts.call(this, i),
 					};
 				} else if (action === 'edit') {
 					const recid = this.getNodeParameter('recid', i) as string;
@@ -862,7 +862,7 @@ export class FileMaker implements INodeType {
 					requestOptions.body = {
 						fieldData: {...parseFields.call(this, i)},
 						portalData: {},
-						...parseScripts.call(this, i)
+						...parseScripts.call(this, i),
 					};
 				} else if (action === 'performscript') {
 					const scriptName = this.getNodeParameter('script', i) as string;
@@ -876,14 +876,14 @@ export class FileMaker implements INodeType {
 					requestOptions.method = 'POST';
 					requestOptions.headers!['Content-Type'] = 'application/json';
 					requestOptions.qs = {
-						...parseScripts.call(this, i)
+						...parseScripts.call(this, i),
 					};
 				} else if (action === 'delete') {
 					const recid = this.getNodeParameter('recid', i) as string;
 					requestOptions.uri = url + `/databases/${database}/layouts/${layout}/records/${recid}`;
 					requestOptions.method = 'DELETE';
 					requestOptions.qs = {
-						...parseScripts.call(this, i)
+						...parseScripts.call(this, i),
 					};
 				} else {
 					throw new Error(`The action "${action}" is not implemented yet!`);
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index a3144fc3d..294c53c16 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -1,7 +1,7 @@
 import {
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions
 } from 'n8n-core';
 
 import {
@@ -9,7 +9,6 @@ import {
 } from 'n8n-workflow';
 
 import {OptionsWithUri} from 'request';
-import {Url} from "url";
 
 interface ScriptsOptions {
 	script?: any; //tslint:disable-line:no-any
@@ -49,7 +48,7 @@ export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFu
 		},
 		method: 'GET',
 		uri: url,
-		json: true
+		json: true,
 	};
 
 	try {
@@ -101,7 +100,7 @@ export async function getFields(this: ILoadOptionsFunctions): Promise<any> { //
 		},
 		method: 'GET',
 		uri: url,
-		json: true
+		json: true,
 	};
 
 	try {
@@ -138,7 +137,7 @@ export async function getPortals(this: ILoadOptionsFunctions): Promise<any> { //
 		},
 		method: 'GET',
 		uri: url,
-		json: true
+		json: true,
 	};
 
 	try {
@@ -173,7 +172,7 @@ export async function getScripts(this: ILoadOptionsFunctions): Promise<any> { //
 		},
 		method: 'GET',
 		uri: url,
-		json: true
+		json: true,
 	};
 
 	try {
@@ -205,7 +204,7 @@ export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions |
 		uri: url,
 		headers: {},
 		method: 'POST',
-		json: true
+		json: true,
 		//rejectUnauthorized: !this.getNodeParameter('allowUnauthorizedCerts', itemIndex, false) as boolean,
 	};
 	requestOptions.auth = {
@@ -217,9 +216,9 @@ export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions |
 			{
 				"database": host,
 				"username": login as string,
-				"password": password as string
-			}
-		]
+				"password": password as string,
+			},
+		],
 	};
 
 	try {
@@ -263,7 +262,7 @@ export async function logout(this: ILoadOptionsFunctions | IExecuteFunctions | I
 		uri: url,
 		headers: {},
 		method: 'DELETE',
-		json: true
+		json: true,
 		//rejectUnauthorized: !this.getNodeParameter('allowUnauthorizedCerts', itemIndex, false) as boolean,
 	};
 
@@ -301,7 +300,7 @@ export function parseSort(this: IExecuteFunctions, i: number): object | null {
 				// @ts-ignore
 				sort.push({
 					'fieldName': parameterData!.name as string,
-					'sortOrder': parameterData!.value
+					'sortOrder': parameterData!.value,
 				});
 			}
 		}
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.ts b/packages/nodes-base/nodes/Flow/Flow.node.ts
index 0d97a5aab..eb6f6728f 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.ts
+++ b/packages/nodes-base/nodes/Flow/Flow.node.ts
@@ -3,17 +3,17 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	flowApiRequest,
 	FlowApiRequestAllItems,
 } from './GenericFunctions';
 import {
-	taskOpeations,
 	taskFields,
+	taskOpeations,
 } from './TaskDescription';
 import {
 	ITask, TaskInfo,
@@ -38,7 +38,7 @@ export class Flow implements INodeType {
 			{
 				name: 'flowApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -87,7 +87,7 @@ export class Flow implements INodeType {
 					};
 					const task: TaskInfo = {
 						name,
-						workspace_id: parseInt(workspaceId, 10)
+						workspace_id: parseInt(workspaceId, 10),
 					};
 					if (additionalFields.ownerId) {
 						task.owner_id = parseInt(additionalFields.ownerId as string, 10);
diff --git a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
index 88f07f829..e9b724088 100644
--- a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -32,7 +32,7 @@ export class FlowTrigger implements INodeType {
 			{
 				name: 'flowApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
@@ -52,11 +52,11 @@ export class FlowTrigger implements INodeType {
 					[
 						{
 							name: 'Project',
-							value: 'list'
+							value: 'list',
 						},
 						{
 							name: 'Task',
-							value: 'task'
+							value: 'task',
 						},
 					],
 				description: 'Resource that triggers the webhook',
@@ -70,14 +70,14 @@ export class FlowTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						resource:[
-							'list'
-						]
+							'list',
+						],
 					},
 					hide: {
 						resource: [
-							'task'
-						]
-					}
+							'task',
+						],
+					},
 				},
 				description: `Lists ids, perhaps known better as "Projects" separated by ,`,
 			},
@@ -90,14 +90,14 @@ export class FlowTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						resource:[
-							'task'
-						]
+							'task',
+						],
 					},
 					hide: {
 						resource: [
-							'list'
-						]
-					}
+							'list',
+						],
+					},
 				},
 				description: `Task ids separated by ,`,
 			},
@@ -168,7 +168,7 @@ export class FlowTrigger implements INodeType {
 							url: webhookUrl,
 							resource_type: resource,
 							resource_id: parseInt(resourceId, 10),
-						}
+						},
 					};
 					try {
 						 responseData = await flowApiRequest.call(this, 'POST', endpoint, body);
@@ -217,7 +217,7 @@ export class FlowTrigger implements INodeType {
 		const req = this.getRequestObject();
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Flow/GenericFunctions.ts b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
index 96edf3f32..20d045385 100644
--- a/packages/nodes-base/nodes/Flow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
@@ -1,9 +1,9 @@
 import { OptionsWithUri } from 'request';
 import {
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions,
 } from 'n8n-core';
 import { IDataObject } from 'n8n-workflow';
 
@@ -19,7 +19,7 @@ export async function flowApiRequest(this: IHookFunctions | IExecuteFunctions |
 		qs,
 		body,
 		uri: uri ||`https://api.getflow.com/v2${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Flow/TaskDescription.ts b/packages/nodes-base/nodes/Flow/TaskDescription.ts
index 506fc4102..49b18f064 100644
--- a/packages/nodes-base/nodes/Flow/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Flow/TaskDescription.ts
@@ -55,8 +55,8 @@ export const taskFields = [
 					'task',
 				],
 				operation: [
-					'create'
-				]
+					'create',
+				],
 			},
 		},
 		description: 'Create resources under the given workspace.',
@@ -72,8 +72,8 @@ export const taskFields = [
 					'task',
 				],
 				operation: [
-					'create'
-				]
+					'create',
+				],
 			},
 		},
 		description: 'The title of the task.',
@@ -171,7 +171,7 @@ export const taskFields = [
 					{
 						name: 'text/html',
 						value: 'text/html',
-					}
+					},
 				],
 				description: `Identify which markup language is used to format the given note`,
 			},
@@ -240,8 +240,8 @@ export const taskFields = [
 					'task',
 				],
 				operation: [
-					'update'
-				]
+					'update',
+				],
 			},
 		},
 		description: 'Create resources under the given workspace.',
@@ -257,8 +257,8 @@ export const taskFields = [
 					'task',
 				],
 				operation: [
-					'update'
-				]
+					'update',
+				],
 			},
 		},
 		description: '',
@@ -364,7 +364,7 @@ export const taskFields = [
 					{
 						name: 'text/html',
 						value: 'text/html',
-					}
+					},
 				],
 				description: `Identify which markup language is used to format the given note`,
 			},
@@ -426,8 +426,8 @@ export const taskFields = [
 					'task',
 				],
 				operation: [
-					'get'
-				]
+					'get',
+				],
 			},
 		},
 		description: '',
@@ -471,7 +471,7 @@ export const taskFields = [
 						name: 'Parent',
 						value: 'parent',
 					},
-				]
+				],
 			},
 		],
 	},
@@ -488,8 +488,8 @@ export const taskFields = [
 					'task',
 				],
 				operation: [
-					'getAll'
-				]
+					'getAll',
+				],
 			},
 		},
 		default: false,
@@ -505,7 +505,7 @@ export const taskFields = [
 					'task',
 				],
 				operation: [
-					'getAll'
+					'getAll',
 				],
 				returnAll: [
 					false,
@@ -558,7 +558,7 @@ export const taskFields = [
 						name: 'Parent',
 						value: 'parent',
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Order',
@@ -610,7 +610,7 @@ export const taskFields = [
 						name: 'Updated At',
 						value: 'updated_at',
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Workspace ID',
diff --git a/packages/nodes-base/nodes/Freshdesk/ContactDescription.ts b/packages/nodes-base/nodes/Freshdesk/ContactDescription.ts
new file mode 100644
index 000000000..22fe28a8d
--- /dev/null
+++ b/packages/nodes-base/nodes/Freshdesk/ContactDescription.ts
@@ -0,0 +1,431 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const contactOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new contact',
+			},
+			{
+				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: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const contactFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                contact:create/update                       */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		placeholder: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: '',
+		description: 'Name of the contact.',
+		required: true,
+	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		description: `Primary email address of the contact. If you want to associate<br>
+		additional email(s) with this contact, use the other_emails attribute.`,
+	},
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+					'update',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Address',
+				name: 'address',
+				type: 'string',
+				default: '',
+				description: 'Address of the contact.',
+			},
+			// {
+			// 	displayName: 'Avatar',
+			// 	name: 'avatar',
+			// 	type: '',
+			// 	default: '',
+			// 	description: `Avatar image of the contact The maximum file size is 5MB<br>
+			// 	and the supported file types are .jpg, .jpeg, .jpe, and .png.`,
+			// },
+			{
+				displayName: 'Company ID',
+				name: 'company_id',
+				type: 'number',
+				default: '',
+				description: 'ID of the primary company to which this contact belongs.',
+			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFields',
+				type: 'fixedCollection',
+				placeholder: 'Add Custom Field',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: `Key value pairs containing the name and value of the custom field.<br>
+				Only dates in the format YYYY-MM-DD are accepted as input for custom date fields.`,
+				default: [],
+				options: [
+					{
+						displayName: 'Custom Field',
+						name: 'customField',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: `Custom Field\'s name.`,
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: `Custom Field\'s values.`,
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'A small description of the contact.',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						'/operation': [
+							'update',
+						],
+					},
+				},
+				description: `Primary email address of the contact. If you want to associate<br>
+				additional email(s) with this contact, use the other_emails attribute.`,
+			},
+			{
+				displayName: 'Job Title',
+				name: 'job_title',
+				type: 'string',
+				default: '',
+				description: 'Job title of the contact.',
+			},
+			{
+				displayName: 'Language',
+				name: 'language',
+				type: 'string',
+				default: '',
+				description: `Language of the contact. Default language is "en".<br>
+				This attribute can only be set if the Multiple Language feature is<br>
+				enabled (Garden plan and above).`,
+			},
+			{
+				displayName: 'Mobile',
+				name: 'mobile',
+				type: 'string',
+				default: '',
+				description: 'Mobile number of the contact.',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						'/operation': [
+							'update',
+						],
+					},
+				},
+				description: 'Name of the contact.',
+			},
+			{
+				displayName: 'Other Companies',
+				name: 'other_companies',
+				type: 'string',
+				default: [],
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Company',
+				description: `Additional companies associated with the contact.<br>
+				This attribute can only be set if the Multiple Companies feature<br>
+				is enabled (Estate plan and above).`,
+			},
+			{
+				displayName: 'Other Emails',
+				name: 'other_emails',
+				type: 'string',
+				default: [],
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Email',
+				description: 'Additional emails associated with the contact.',
+			},
+			{
+				displayName: 'Phone',
+				name: 'phone',
+				type: 'string',
+				default: '',
+				description: 'Telephone number of the contact.',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'string',
+				default: [],
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Tags associated with this contact.',
+			},
+			{
+				displayName: 'Time Zone',
+				name: 'time_zone',
+				type: 'string',
+				default: '',
+				description: `Time zone of the contact. Default value is the time zone of the domain.<br>
+				This attribute can only be set if the Multiple Time Zone feature is enabled (Garden plan and above)];`,
+			},
+			{
+				displayName: 'Twitter ID',
+				name: 'twitter_id',
+				type: 'string',
+				default: '',
+				description: 'Twitter handle of the contact.',
+			},
+			{
+				displayName: 'Unique External ID',
+				name: 'unique_external_id',
+				type: 'string',
+				default: '',
+				description: 'External ID of the contact.',
+			},
+			{
+				displayName: 'View All Tickets',
+				name: 'view_all_tickets',
+				type: 'boolean',
+				default: false,
+				description: `Set to true if the contact can see all the tickets<br>
+				that are associated with the company to which he belong.`,
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                contact:delete                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		required: true,
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                contact:get                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		required: true,
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                contact:getAll                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'contact',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Company ID',
+				name: 'company_id',
+				type: 'number',
+				default: '',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Mobile',
+				name: 'mobile',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				type: 'options',
+				default: '',
+				options: [
+					{
+						name: 'Blocked',
+						value: 'blocked',
+					},
+					{
+						name: 'Deleted',
+						value: 'deleted',
+					},
+					{
+						name: 'Unverified',
+						value: 'unverified',
+					},
+					{
+						name: 'Verified',
+						value: 'verified',
+					},
+				],
+			},
+			{
+				displayName: 'Updated Since',
+				name: 'updated_since',
+				type: 'dateTime',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Freshdesk/ContactInterface.ts b/packages/nodes-base/nodes/Freshdesk/ContactInterface.ts
new file mode 100644
index 000000000..431f1589f
--- /dev/null
+++ b/packages/nodes-base/nodes/Freshdesk/ContactInterface.ts
@@ -0,0 +1,24 @@
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export interface ICreateContactBody {
+	address?: string;
+	// avatar?: object;
+	company_id?: number;
+	custom_fields?: IDataObject;
+	description?: string;
+	email?: string;
+	job_title?: string;
+	language?: string;
+	mobile?: string;
+	name?: string;
+	other_companies?: string[];
+	other_emails?: string[];
+	phone?: string;
+	tags?: string[];
+	time_zone?: string;
+	twitter_id?: string;
+	unique_external_id?: string;
+	view_all_tickets?: boolean;
+}
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index 3e9217d3a..3b7d26f40 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -1,21 +1,32 @@
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
+
 import {
 	IExecuteFunctions,
 } from 'n8n-core';
+
 import {
+	capitalize,
 	freshdeskApiRequest,
 	freshdeskApiRequestAllItems,
 	// validateJSON,
-	capitalize
 } from './GenericFunctions';
 
+import {
+	ICreateContactBody,
+} from './ContactInterface';
+
+import {
+	contactFields,
+	contactOperations,
+} from './ContactDescription';
+
 enum Status {
 	Open = 2,
 	Pending = 3,
@@ -27,7 +38,7 @@ enum Priority {
 	Low = 1,
 	Medium = 2,
 	High = 3,
-	Urgent = 4
+	Urgent = 4,
 }
 
 enum Source {
@@ -77,7 +88,7 @@ export class Freshdesk implements INodeType {
 		description: 'Consume Freshdesk API',
 		defaults: {
 			name: 'Freshdesk',
-			color: '#c02428',
+			color: '#25c10b',
 		},
 		inputs: ['main'],
 		outputs: ['main'],
@@ -94,6 +105,10 @@ export class Freshdesk implements INodeType {
 				type: 'options',
 				required: true,
 				options: [
+					{
+						name: 'Contact',
+						value: 'contact',
+					},
 					{
 						name: 'Ticket',
 						value: 'ticket',
@@ -111,7 +126,7 @@ export class Freshdesk implements INodeType {
 					show: {
 						resource: [
 							'ticket',
-						]
+						],
 					},
 				},
 				options: [
@@ -156,7 +171,7 @@ export class Freshdesk implements INodeType {
 						],
 						operation: [
 							'create',
-						]
+						],
 					},
 				},
 				options: [
@@ -206,7 +221,7 @@ export class Freshdesk implements INodeType {
 						],
 						operation: [
 							'create',
-						]
+						],
 					},
 				},
 				default: '',
@@ -224,7 +239,7 @@ export class Freshdesk implements INodeType {
 						],
 						operation: [
 							'create',
-						]
+						],
 					},
 				},
 				options: [
@@ -259,8 +274,8 @@ export class Freshdesk implements INodeType {
 							'ticket',
 						],
 						operation: [
-							'create'
-						]
+							'create',
+						],
 					},
 				},
 				options: [
@@ -279,7 +294,7 @@ export class Freshdesk implements INodeType {
 					{
 						name: 'Urgent',
 						value: 'urgent',
-					}
+					},
 				],
 				default: 'low',
 				description: 'Priority',
@@ -295,8 +310,8 @@ export class Freshdesk implements INodeType {
 							'ticket',
 						],
 						operation: [
-							'create'
-						]
+							'create',
+						],
 					},
 				},
 				options: [
@@ -433,7 +448,7 @@ export class Freshdesk implements INodeType {
 						type: 'options',
 						default: '',
 						typeOptions: {
-							loadOptionsMethod: 'getGroups'
+							loadOptionsMethod: 'getGroups',
 						},
 						description: `ID of the group to which the ticket has been assigned. The default value is the ID of the group that is associated with the given email_config_id`,
 					},
@@ -451,7 +466,7 @@ export class Freshdesk implements INodeType {
 						type: 'options',
 						default: '',
 						typeOptions: {
-							loadOptionsMethod: 'getProducts'
+							loadOptionsMethod: 'getProducts',
 						},
 						description: `ID of the product to which the ticket is associated.
 						It will be ignored if the email_config_id attribute is set in the request.`,
@@ -498,9 +513,9 @@ export class Freshdesk implements INodeType {
 								name: 'Refund',
 								value: 'Refund',
 							},
-						]
+						],
 					},
-				]
+				],
 			},
 			// {
 			// 	displayName: 'Custom Fields',
@@ -588,7 +603,7 @@ export class Freshdesk implements INodeType {
 						],
 						operation: [
 							'update',
-						]
+						],
 					},
 				},
 				default: '',
@@ -710,7 +725,7 @@ export class Freshdesk implements INodeType {
 							{
 								name: 'Urgent',
 								value: 'urgent',
-							}
+							},
 						],
 						default: 'low',
 						description: 'Priority',
@@ -782,7 +797,7 @@ export class Freshdesk implements INodeType {
 							{
 								name: 'Closed',
 								value: 'closed',
-							}
+							},
 						],
 						default: 'pending',
 						description: 'Status',
@@ -842,27 +857,27 @@ export class Freshdesk implements INodeType {
 						options: [
 							{
 								name: 'Feature Request',
-								value: 'Feature Request'
+								value: 'Feature Request',
 							},
 							{
 								name: 'Incident',
-								value: 'Incident'
+								value: 'Incident',
 							},
 							{
 								name: 'Problem',
-								value: 'Problem'
+								value: 'Problem',
 							},
 							{
 								name: 'Question',
-								value: 'Question'
+								value: 'Question',
 							},
 							{
 								name: 'Refund',
-								value: 'Refund'
+								value: 'Refund',
 							},
-						]
+						],
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Ticket ID',
@@ -875,8 +890,8 @@ export class Freshdesk implements INodeType {
 							'ticket',
 						],
 						operation: [
-							'get'
-						]
+							'get',
+						],
 					},
 				},
 				default: '',
@@ -1026,7 +1041,7 @@ export class Freshdesk implements INodeType {
 						type: 'dateTime',
 						default: '',
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Ticket ID',
@@ -1039,14 +1054,17 @@ export class Freshdesk implements INodeType {
 							'ticket',
 						],
 						operation: [
-							'delete'
-						]
+							'delete',
+						],
 					},
 				},
 				default: '',
 				description: 'Ticket ID',
 			},
-		]
+			// CONTACTS
+			...contactOperations,
+			...contactFields,
+		],
 	};
 
 	methods = {
@@ -1145,7 +1163,7 @@ export class Freshdesk implements INodeType {
 						// @ts-ignore
 						priority: Priority[capitalize(priority)],
 						// @ts-ignore
-						source: Source[capitalize(source)]
+						source: Source[capitalize(source)],
 					};
 
 					if (requester === 'requesterId') {
@@ -1342,14 +1360,67 @@ export class Freshdesk implements INodeType {
 					const ticketId = this.getNodeParameter('ticketId', i) as string;
 					responseData = await freshdeskApiRequest.call(this, 'DELETE', `/tickets/${ticketId}`);
 				}
+			} else if (resource === 'contact') {
+				//https://developers.freshdesk.com/api/#create_contact
+				if (operation === 'create') {
+					const name = this.getNodeParameter('name', i) as string;
+					const email = this.getNodeParameter('email', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i, {}) as IDataObject;
+
+					if (additionalFields.customFields) {
+						const metadata = (additionalFields.customFields as IDataObject).customField as IDataObject[];
+						additionalFields.custom_fields = {};
+						for (const data of metadata) {
+							//@ts-ignore
+							additionalFields.custom_fields[data.name as string] = data.value;
+						}
+						delete additionalFields.customFields;
+					}
+
+					const body: ICreateContactBody = additionalFields;
+					body.name = name;
+					if (email) {
+						body.email = email;
+					}
+					responseData = await freshdeskApiRequest.call(this, 'POST', '/contacts', body);
+				//https://developers.freshdesk.com/api/#delete_contact
+				} else if (operation === 'delete') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+					responseData = await freshdeskApiRequest.call(this, 'DELETE', `/contacts/${contactId}`, {});
+				} else if (operation === 'get') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+					responseData = await freshdeskApiRequest.call(this, 'GET', `/contacts/${contactId}`, {});
+				//https://developers.freshdesk.com/api/#list_all_contacts
+				} else if (operation === 'getAll') {
+					const qs = this.getNodeParameter('filters', i, {}) as IDataObject;
+					responseData = await freshdeskApiRequest.call(this, 'GET', '/contacts', {}, qs);
+				//https://developers.freshdesk.com/api/#update_contact
+				} else if (operation === 'update') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i, {}) as IDataObject;
+
+					if (additionalFields.customFields) {
+						const metadata = (additionalFields.customFields as IDataObject).customField as IDataObject[];
+						additionalFields.custom_fields = {};
+						for (const data of metadata) {
+							//@ts-ignore
+							additionalFields.custom_fields[data.name as string] = data.value;
+						}
+						delete additionalFields.customFields;
+					}
+
+					const body: ICreateContactBody = additionalFields;
+					responseData = await freshdeskApiRequest.call(this, 'PUT', `/contacts/${contactId}`, body);
+				}
 			}
+
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
 			} else {
 				if (responseData === undefined) {
-					responseData = { json: {
+					responseData = {
 						success: true,
-					} };
+					};
 				}
 
 				returnData.push(responseData as IDataObject);
diff --git a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
index 50089fdcc..71c9c6110 100644
--- a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
@@ -1,12 +1,16 @@
-import { OptionsWithUri } from 'request';
+import {
+	OptionsWithUri,
+} from 'request';
 
 import {
+	BINARY_ENCODING,
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
-	BINARY_ENCODING
 } from 'n8n-core';
 
-import { IDataObject } from 'n8n-workflow';
+import {
+	IDataObject,
+} from 'n8n-workflow';
 
 export async function freshdeskApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 
@@ -29,7 +33,7 @@ export async function freshdeskApiRequest(this: IExecuteFunctions | ILoadOptions
 		body,
 		qs: query,
 		uri: uri || `https://${credentials.domain}.${endpoint}${resource}`,
-		json: true
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.body;
diff --git a/packages/nodes-base/nodes/Ftp.node.ts b/packages/nodes-base/nodes/Ftp.node.ts
index ae44dbc87..c71b096bf 100644
--- a/packages/nodes-base/nodes/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp.node.ts
@@ -193,7 +193,7 @@ export class Ftp implements INodeType {
 						],
 						binaryData: [
 							true,
-						]
+						],
 					},
 				},
 				name: 'binaryPropertyName',
@@ -211,7 +211,7 @@ export class Ftp implements INodeType {
 						],
 						binaryData: [
 							false,
-						]
+						],
 					},
 				},
 				name: 'fileContent',
@@ -296,7 +296,7 @@ export class Ftp implements INodeType {
 				host: credentials.host as string,
 				port: credentials.port as number,
 				user: credentials.username as string,
-				password: credentials.password as string
+				password: credentials.password as string,
 			});
 		}
 
diff --git a/packages/nodes-base/nodes/Function.node.ts b/packages/nodes-base/nodes/Function.node.ts
index 7f5ea4c1e..7939998e4 100644
--- a/packages/nodes-base/nodes/Function.node.ts
+++ b/packages/nodes-base/nodes/Function.node.ts
@@ -23,7 +23,7 @@ export class Function implements INodeType {
 		outputs: ['main'],
 		properties: [
 			{
-				displayName: 'Function',
+				displayName: 'JavaScript Code',
 				name: 'functionCode',
 				typeOptions: {
 					alwaysOpenEditWindow: true,
@@ -65,7 +65,7 @@ export class Function implements INodeType {
 			require: {
 				external: false as boolean | { modules: string[] },
 				builtin: [] as string[],
-			}
+			},
 		};
 
 		if (process.env.NODE_FUNCTION_ALLOW_BUILTIN) {
diff --git a/packages/nodes-base/nodes/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem.node.ts
index b4573fcca..cd0eae6df 100644
--- a/packages/nodes-base/nodes/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem.node.ts
@@ -25,7 +25,7 @@ export class FunctionItem implements INodeType {
 		outputs: ['main'],
 		properties: [
 			{
-				displayName: 'Function',
+				displayName: 'JavaScript Code',
 				name: 'functionCode',
 				typeOptions: {
 					alwaysOpenEditWindow: true,
@@ -70,7 +70,7 @@ export class FunctionItem implements INodeType {
 			require: {
 				external: false as boolean | { modules: string[] },
 				builtin: [] as string[],
-			}
+			},
 		};
 
 		if (process.env.NODE_FUNCTION_ALLOW_BUILTIN) {
@@ -101,7 +101,7 @@ export class FunctionItem implements INodeType {
 		}
 
 		const returnItem: INodeExecutionData = {
-			json: jsonData
+			json: jsonData,
 		};
 
 		if (item.binary) {
diff --git a/packages/nodes-base/nodes/Github/GenericFunctions.ts b/packages/nodes-base/nodes/Github/GenericFunctions.ts
index de20d3406..505eff071 100644
--- a/packages/nodes-base/nodes/Github/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Github/GenericFunctions.ts
@@ -28,7 +28,7 @@ export async function githubApiRequest(this: IHookFunctions | IExecuteFunctions,
 		body,
 		qs: query,
 		uri: '',
-		json: true
+		json: true,
 	};
 
 	try {
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 22bc7c0e7..f40ad6b9d 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -5,13 +5,13 @@ import {
 import {
 	IDataObject,
 	INodeExecutionData,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
-	githubApiRequest,
 	getFileSha,
+	githubApiRequest,
 } from './GenericFunctions';
 
 export class Github implements INodeType {
@@ -463,7 +463,7 @@ export class Github implements INodeType {
 								default: '',
 								description: 'The email of the author of the commit.',
 							},
-						]
+						],
 					},
 					{
 						name: 'branch',
@@ -476,7 +476,7 @@ export class Github implements INodeType {
 								default: '',
 								description: 'The branch to commit to. If not set the repository’s default branch (usually master) is used.',
 							},
-						]
+						],
 					},
 					{
 						name: 'committer',
@@ -496,7 +496,7 @@ export class Github implements INodeType {
 								default: '',
 								description: 'The email of the committer of the commit.',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -999,7 +999,7 @@ export class Github implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'getIssues'
+							'getIssues',
 						],
 						resource: [
 							'repository',
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 1360d7536..6992da270 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -469,7 +469,7 @@ export class GithubTrigger implements INodeType {
 			// but do not start the workflow.
 
 			return {
-				webhookResponse: 'OK'
+				webhookResponse: 'OK',
 			};
 		}
 
@@ -483,12 +483,12 @@ export class GithubTrigger implements INodeType {
 				body: bodyData,
 				headers: this.getHeaderData(),
 				query: this.getQueryData(),
-			}
+			},
 		);
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(returnData)
+				this.helpers.returnJsonArray(returnData),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
index 19ccaf6aa..3bb0e12c5 100644
--- a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
@@ -25,7 +25,7 @@ export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions,
 		body,
 		qs: query,
 		uri: '',
-		json: true
+		json: true,
 	};
 
 	if (query === undefined) {
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index abb5dcf1a..cd429b48f 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -5,8 +5,8 @@ import {
 import {
 	IDataObject,
 	INodeExecutionData,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -711,7 +711,7 @@ export class Gitlab implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'getIssues'
+							'getIssues',
 						],
 						resource: [
 							'repository',
@@ -790,7 +790,7 @@ export class Gitlab implements INodeType {
 							{
 								name: 'Priority',
 								value: 'priority',
-								description: 'Sort by priority.'
+								description: 'Sort by priority.',
 							},
 						],
 						default: 'created_at',
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 3104a0573..9839e6853 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -110,43 +110,43 @@ export class GitlabTrigger implements INodeType {
 					{
 						name: 'Comment',
 						value: 'note',
-						description: 'Triggered when a new comment is made on commits, merge requests, issues, and code snippets.'
+						description: 'Triggered when a new comment is made on commits, merge requests, issues, and code snippets.',
 					},
 					{
 						name: 'Issue',
 						value: 'issues',
-						description: 'Triggered when a new issue is created or an existing issue was updated/closed/reopened.'
+						description: 'Triggered when a new issue is created or an existing issue was updated/closed/reopened.',
 					},
 					{
 						name: 'Job',
 						value: 'job',
-						description: 'Triggered on status change of a job.'
+						description: 'Triggered on status change of a job.',
 					},
 					{
 						name: 'Merge Request',
 						value: 'merge_requests',
-						description: 'Triggered when a new merge request is created, an existing merge request was updated/merged/closed or a commit is added in the source branch.'
+						description: 'Triggered when a new merge request is created, an existing merge request was updated/merged/closed or a commit is added in the source branch.',
 					},
 					{
 						name: 'Pipeline',
 						value: 'pipeline',
-						description: 'Triggered on status change of Pipeline.'
+						description: 'Triggered on status change of Pipeline.',
 					},
 					{
 						name: 'Push',
 						value: 'push',
-						description: 'Triggered when you push to the repository except when pushing tags.'
+						description: 'Triggered when you push to the repository except when pushing tags.',
 					},
 					{
 						name: 'Tag',
 						value: 'tag_push',
-						description: 'Triggered when you create (or delete) tags to the repository.'
+						description: 'Triggered when you create (or delete) tags to the repository.',
 					},
 					{
 						name: 'Wiki Page',
 						value: 'wiki_page',
-						description: 'Triggered when a wiki page is created, updated or deleted.'
-					}
+						description: 'Triggered when a wiki page is created, updated or deleted.',
+					},
 				],
 				required: true,
 				default: [],
@@ -287,12 +287,12 @@ export class GitlabTrigger implements INodeType {
 				body: bodyData,
 				headers: this.getHeaderData(),
 				query: this.getQueryData(),
-			}
+			},
 		);
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(returnData)
+				this.helpers.returnJsonArray(returnData),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
index 545ed841f..5e178f143 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
@@ -39,11 +39,11 @@ export const eventOperations = [
 				name: 'Update',
 				value: 'update',
 				description: 'Update an event',
-			}
+			},
 		],
 		default: 'create',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const eventFields = [
@@ -55,20 +55,20 @@ export const eventFields = [
 		name: 'calendar',
 		type: 'options',
 		typeOptions: {
-			loadOptionsMethod: 'getCalendars'
+			loadOptionsMethod: 'getCalendars',
 		},
 		required: true,
 		displayOptions: {
 			show: {
 				operation: [
-					'create'
+					'create',
 				],
 				resource: [
-					'event'
+					'event',
 				],
 			},
 		},
-		default: ''
+		default: '',
 	},
 	{
 		displayName: 'Start',
@@ -86,7 +86,7 @@ export const eventFields = [
 			},
 		},
 		default: '',
-		description: 'Start time of the event.'
+		description: 'Start time of the event.',
 	},
 	{
 		displayName: 'End',
@@ -104,7 +104,7 @@ export const eventFields = [
 			},
 		},
 		default: '',
-		description: 'End time of the event.'
+		description: 'End time of the event.',
 	},
 	{
 		displayName: 'Use Default Reminders',
@@ -120,7 +120,7 @@ export const eventFields = [
 				],
 			},
 		},
-		default: true
+		default: true,
 	},
 	{
 		displayName: 'Additional Fields',
@@ -154,7 +154,7 @@ export const eventFields = [
 					},
 				],
 				default: 'no',
-				description: 'Wheater the event is all day or not'
+				description: 'Wheater the event is all day or not',
 			},
 			{
 				displayName: 'Attendees',
@@ -177,6 +177,37 @@ export const eventFields = [
 				default: '',
 				description: 'The color of the event.',
 			},
+			{
+				displayName: 'Conference Data',
+				name: 'conferenceDataUi',
+				placeholder: 'Add Conference',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Conference Link',
+						name: 'conferenceDataValues',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'conferenceSolution',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getConferenceSolutations',
+									loadOptionsDependsOn: [
+										'calendar',
+									],
+								},
+								default: '',
+							},
+						],
+					},
+				],
+				description: 'Creates a conference link (Hangouts, Meet etc) and attachs it to the event',
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -249,7 +280,7 @@ export const eventFields = [
 					{
 						name: 'Yearly',
 						value: 'yearly',
-					}
+					},
 				],
 				default: '',
 			},
@@ -264,9 +295,9 @@ export const eventFields = [
 				name: 'repeatHowManyTimes',
 				type: 'number',
 				typeOptions: {
-					minValue: 1
+					minValue: 1,
 				},
-				default: 1
+				default: 1,
 			},
 			{
 				displayName: 'Send Updates',
@@ -276,7 +307,7 @@ export const eventFields = [
 					{
 						name: 'All',
 						value: 'all',
-						description: 'Notifications are sent to all guests'
+						description: 'Notifications are sent to all guests',
 					},
 					{
 						name: 'External Only',
@@ -287,7 +318,7 @@ export const eventFields = [
 						name: 'None',
 						value: 'none',
 						description: 'No notifications are sent. This value should only be used for migration use case',
-					}
+					},
 				],
 				description: 'Whether to send notifications about the creation of the new event',
 				default: '',
@@ -313,7 +344,7 @@ export const eventFields = [
 						name: 'Busy',
 						value: 'opaque',
 						description: ' The event does block time on the calendar.',
-					}
+					},
 				],
 				default: 'opaque',
 				description: 'Whether the event blocks time on the calendar',
@@ -355,7 +386,7 @@ export const eventFields = [
 					},
 				],
 				default: 'default',
-				description: 'Visibility of the event.'
+				description: 'Visibility of the event.',
 			},
 		],
 	},
@@ -366,7 +397,7 @@ export const eventFields = [
 		default: '',
 		placeholder: 'Add Reminder',
 		typeOptions: {
-			multipleValues: true
+			multipleValues: true,
 		},
 		required: false,
 		displayOptions: {
@@ -416,7 +447,7 @@ export const eventFields = [
 				],
 			},
 		],
-		description: `If the event doesn't use the default reminders, this lists the reminders specific to the event`
+		description: `If the event doesn't use the default reminders, this lists the reminders specific to the event`,
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 event:delete                               */
@@ -439,7 +470,7 @@ export const eventFields = [
 				],
 			},
 		},
-		default: ''
+		default: '',
 	},
 	{
 		displayName: 'Event ID',
@@ -494,7 +525,7 @@ export const eventFields = [
 						name: 'None',
 						value: 'none',
 						description: 'No notifications are sent. This value should only be used for migration use case',
-					}
+					},
 				],
 				description: 'Whether to send notifications about the creation of the new event',
 				default: '',
@@ -522,7 +553,7 @@ export const eventFields = [
 				],
 			},
 		},
-		default: ''
+		default: '',
 	},
 	{
 		displayName: 'Event ID',
@@ -575,8 +606,8 @@ export const eventFields = [
 				},
 				default: '',
 				description: `Time zone used in the response. The default is the time zone of the calendar.`,
-			}
-		]
+			},
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 event:getAll                               */
@@ -599,7 +630,7 @@ export const eventFields = [
 				],
 			},
 		},
-		default: ''
+		default: '',
 	},
 	{
 		displayName: 'Return All',
@@ -688,7 +719,7 @@ export const eventFields = [
 						name: 'Updated',
 						value: 'updated',
 						description: 'Order by last modification time (ascending).',
-					}
+					},
 				],
 				default: '',
 				description: 'The order of the events returned in the result.',
@@ -753,8 +784,8 @@ export const eventFields = [
 				default: '',
 				description: `Lower bound for an event's last modification time (as a RFC3339 timestamp) to filter by.<b/r>
 				When specified, entries deleted since this time will always be included regardless of showDeleted`,
-			}
-		]
+			},
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 event:update                               */
@@ -764,7 +795,7 @@ export const eventFields = [
 		name: 'calendar',
 		type: 'options',
 		typeOptions: {
-			loadOptionsMethod: 'getCalendars'
+			loadOptionsMethod: 'getCalendars',
 		},
 		required: true,
 		displayOptions: {
@@ -810,7 +841,7 @@ export const eventFields = [
 				],
 			},
 		},
-		default: true
+		default: true,
 	},
 	{
 		displayName: 'Update Fields',
@@ -841,7 +872,7 @@ export const eventFields = [
 					{
 						name: 'No',
 						value: 'no',
-					}
+					},
 				],
 				default: 'no',
 				description: 'Wheater the event is all day or not',
@@ -946,7 +977,7 @@ export const eventFields = [
 					{
 						name: 'Yearly',
 						value: 'yearly',
-					}
+					},
 				],
 				default: '',
 			},
@@ -991,7 +1022,7 @@ export const eventFields = [
 						name: 'None',
 						value: 'none',
 						description: 'No notifications are sent. This value should only be used for migration use case',
-					}
+					},
 				],
 				description: 'Whether to send notifications about the creation of the new event',
 				default: '',
@@ -1056,7 +1087,7 @@ export const eventFields = [
 						name: 'Private',
 						value: 'private',
 						description: 'The event is private and only event attendees may view event details.',
-					}
+					},
 				],
 				default: 'default',
 				description: 'Visibility of the event.',
@@ -1070,7 +1101,7 @@ export const eventFields = [
 		default: '',
 		placeholder: 'Add Reminder',
 		typeOptions: {
-			multipleValues: true
+			multipleValues: true,
 		},
 		required: false,
 		displayOptions: {
@@ -1103,7 +1134,7 @@ export const eventFields = [
 							{
 								name: 'Popup',
 								value: 'popup',
-							}
+							},
 						],
 						default: '',
 					},
@@ -1121,5 +1152,5 @@ export const eventFields = [
 			},
 		],
 		description: `If the event doesn't use the default reminders, this lists the reminders specific to the event`,
-	}
+	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts b/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
index 14cda0fe4..2800333a1 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
@@ -7,6 +7,15 @@ export interface IReminder {
 	overrides?: IDataObject[];
 }
 
+export interface IConferenceData {
+	createRequest?: {
+		requestId: string,
+		conferenceSolution: {
+			type: string,
+		}
+	};
+}
+
 export interface IEvent {
 	attendees?: IDataObject[];
 	colorId?: string;
@@ -25,4 +34,5 @@ export interface IEvent {
 	summary?: string;
 	transparency?: string;
 	visibility?: string;
+	conferenceData?: IConferenceData;
 }
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index caf4c9868..a2eed8ea9 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -21,7 +21,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		body,
 		qs,
 		uri: uri || `https://www.googleapis.com${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		if (Object.keys(headers).length !== 0) {
@@ -40,7 +40,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			errors = errors.map((e: IDataObject) => e.message);
 			// Try to return the error prettier
 			throw new Error(
-				`Google Calendar error response [${error.statusCode}]: ${errors.join('|')}`
+				`Google Calendar error response [${error.statusCode}]: ${errors.join('|')}`,
 			);
 		}
 		throw error;
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 4c8208590..65000abc4 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -4,11 +4,11 @@ import {
 
 import {
 	IDataObject,
-	INodeExecutionData,
-	INodeTypeDescription,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -17,8 +17,8 @@ import {
 } from './GenericFunctions';
 
 import {
-	eventOperations,
 	eventFields,
+	eventOperations,
 } from './EventDescription';
 
 import {
@@ -27,6 +27,8 @@ import {
 
 import * as moment from 'moment-timezone';
 
+import * as uuid from 'uuid/v4';
+
 export class GoogleCalendar implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Calendar',
@@ -46,7 +48,7 @@ export class GoogleCalendar implements INodeType {
 			{
 				name: 'googleCalendarOAuth2Api',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -60,7 +62,7 @@ export class GoogleCalendar implements INodeType {
 					},
 				],
 				default: 'event',
-				description: 'The resource to operate on.'
+				description: 'The resource to operate on.',
 			},
 			...eventOperations,
 			...eventFields,
@@ -69,24 +71,49 @@ export class GoogleCalendar implements INodeType {
 
 	methods = {
 		loadOptions: {
+			// Get all the calendars to display them to user so that he can
+			// select them easily
+			async getConferenceSolutations(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const calendar = this.getCurrentNodeParameter('calendar') as string;
+				const posibleSolutions: IDataObject = {
+					'eventHangout': 'Google Hangout',
+					'eventNamedHangout': 'Google Hangout Classic',
+					'hangoutsMeet': 'Google Meet',
+				};
+				const { conferenceProperties: { allowedConferenceSolutionTypes } } = await googleApiRequest.call(
+					this,
+					'GET',
+					`/calendar/v3/users/me/calendarList/${calendar}`,
+				);
+				for (const solution of allowedConferenceSolutionTypes) {
+					returnData.push({
+						name: posibleSolutions[solution] as string,
+						value: solution,
+					});
+				}
+				return returnData;
+			},
 			// Get all the calendars to display them to user so that he can
 			// select them easily
 			async getCalendars(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const calendars = await googleApiRequestAllItems.call(
 					this,
 					'items',
 					'GET',
-					'/calendar/v3/users/me/calendarList'
+					'/calendar/v3/users/me/calendarList',
 				);
 				for (const calendar of calendars) {
 					const calendarName = calendar.summary;
 					const calendarId = calendar.id;
 					returnData.push({
 						name: calendarName,
-						value: calendarId
+						value: calendarId,
 					});
 				}
 				return returnData;
@@ -94,20 +121,20 @@ export class GoogleCalendar implements INodeType {
 			// Get all the colors to display them to user so that he can
 			// select them easily
 			async getColors(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const { event } = await googleApiRequest.call(
 					this,
 					'GET',
-					'/calendar/v3/colors'
+					'/calendar/v3/colors',
 				);
 				for (const key of Object.keys(event)) {
 					const colorName = `Background: ${event[key].background} - Foreground: ${event[key].foreground}`;
 					const colorId = key;
 					returnData.push({
 						name: `${colorName}`,
-						value: colorId
+						value: colorId,
 					});
 				}
 				return returnData;
@@ -115,7 +142,7 @@ export class GoogleCalendar implements INodeType {
 			// Get all the timezones to display them to user so that he can
 			// select them easily
 			async getTimezones(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				for (const timezone of moment.tz.names()) {
@@ -123,12 +150,12 @@ export class GoogleCalendar implements INodeType {
 					const timezoneId = timezone;
 					returnData.push({
 						name: timezoneName,
-						value: timezoneId
+						value: timezoneId,
 					});
 				}
 				return returnData;
-			}
-		}
+			},
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -148,11 +175,11 @@ export class GoogleCalendar implements INodeType {
 					const end = this.getNodeParameter('end', i) as string;
 					const useDefaultReminders = this.getNodeParameter(
 						'useDefaultReminders',
-						i
+						i,
 					) as boolean;
 					const additionalFields = this.getNodeParameter(
 						'additionalFields',
-						i
+						i,
 					) as IDataObject;
 					if (additionalFields.maxAttendees) {
 						qs.maxAttendees = additionalFields.maxAttendees as number;
@@ -166,18 +193,18 @@ export class GoogleCalendar implements INodeType {
 					const body: IEvent = {
 						start: {
 							dateTime: start,
-							timeZone: additionalFields.timeZone || this.getTimezone()
+							timeZone: additionalFields.timeZone || this.getTimezone(),
 						},
 						end: {
 							dateTime: end,
-							timeZone: additionalFields.timeZone || this.getTimezone()
-						}
+							timeZone: additionalFields.timeZone || this.getTimezone(),
+						},
 					};
 					if (additionalFields.attendees) {
 						body.attendees = (additionalFields.attendees as string[]).map(
 							attendee => {
 								return { email: attendee };
-							}
+							},
 						);
 					}
 					if (additionalFields.color) {
@@ -213,10 +240,10 @@ export class GoogleCalendar implements INodeType {
 					if (!useDefaultReminders) {
 						const reminders = (this.getNodeParameter(
 							'remindersUi',
-							i
+							i,
 						) as IDataObject).remindersValues as IDataObject[];
 						body.reminders = {
-							useDefault: false
+							useDefault: false,
 						};
 						if (reminders) {
 							body.reminders.overrides = reminders;
@@ -226,12 +253,12 @@ export class GoogleCalendar implements INodeType {
 						body.start = {
 							date: moment(start)
 								.utc()
-								.format('YYYY-MM-DD')
+								.format('YYYY-MM-DD'),
 						};
 						body.end = {
 							date: moment(end)
 								.utc()
-								.format('YYYY-MM-DD')
+								.format('YYYY-MM-DD'),
 						};
 					}
 					//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
@@ -242,35 +269,52 @@ export class GoogleCalendar implements INodeType {
 						additionalFields.repeatUntil
 					) {
 						throw new Error(
-							`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`
+							`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`,
 						);
 					}
 					if (additionalFields.repeatFrecuency) {
 						body.recurrence?.push(
-							`FREQ=${(additionalFields.repeatFrecuency as string).toUpperCase()};`
+							`FREQ=${(additionalFields.repeatFrecuency as string).toUpperCase()};`,
 						);
 					}
 					if (additionalFields.repeatHowManyTimes) {
 						body.recurrence?.push(
-							`COUNT=${additionalFields.repeatHowManyTimes};`
+							`COUNT=${additionalFields.repeatHowManyTimes};`,
 						);
 					}
 					if (additionalFields.repeatUntil) {
 						body.recurrence?.push(
 							`UNTIL=${moment(additionalFields.repeatUntil as string)
 								.utc()
-								.format('YYYYMMDDTHHmmss')}Z`
+								.format('YYYYMMDDTHHmmss')}Z`,
 						);
 					}
 					if (body.recurrence.length !== 0) {
 						body.recurrence = [`RRULE:${body.recurrence.join('')}`];
 					}
+
+					if (additionalFields.conferenceDataUi) {
+						const conferenceData = (additionalFields.conferenceDataUi as IDataObject).conferenceDataValues as IDataObject;
+						if (conferenceData) {
+
+							qs.conferenceDataVersion = 1;
+							body.conferenceData = {
+								createRequest: {
+									requestId: uuid(),
+									conferenceSolution: {
+										type: conferenceData.conferenceSolution as string,
+									},
+								},
+							};
+						}
+					}
+
 					responseData = await googleApiRequest.call(
 						this,
 						'POST',
 						`/calendar/v3/calendars/${calendarId}/events`,
 						body,
-						qs
+						qs,
 					);
 				}
 				//https://developers.google.com/calendar/v3/reference/events/delete
@@ -285,7 +329,7 @@ export class GoogleCalendar implements INodeType {
 						this,
 						'DELETE',
 						`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
-						{}
+						{},
 					);
 					responseData = { success: true };
 				}
@@ -305,7 +349,7 @@ export class GoogleCalendar implements INodeType {
 						'GET',
 						`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
 						{},
-						qs
+						qs,
 					);
 				}
 				//https://developers.google.com/calendar/v3/reference/events/list
@@ -353,7 +397,7 @@ export class GoogleCalendar implements INodeType {
 							'GET',
 							`/calendar/v3/calendars/${calendarId}/events`,
 							{},
-							qs
+							qs,
 						);
 					} else {
 						qs.maxResults = this.getNodeParameter('limit', i) as number;
@@ -362,7 +406,7 @@ export class GoogleCalendar implements INodeType {
 							'GET',
 							`/calendar/v3/calendars/${calendarId}/events`,
 							{},
-							qs
+							qs,
 						);
 						responseData = responseData.items;
 					}
@@ -373,11 +417,11 @@ export class GoogleCalendar implements INodeType {
 					const eventId = this.getNodeParameter('eventId', i) as string;
 					const useDefaultReminders = this.getNodeParameter(
 						'useDefaultReminders',
-						i
+						i,
 					) as boolean;
 					const updateFields = this.getNodeParameter(
 						'updateFields',
-						i
+						i,
 					) as IDataObject;
 					if (updateFields.maxAttendees) {
 						qs.maxAttendees = updateFields.maxAttendees as number;
@@ -392,20 +436,20 @@ export class GoogleCalendar implements INodeType {
 					if (updateFields.start) {
 						body.start = {
 							dateTime: updateFields.start,
-							timeZone: updateFields.timeZone || this.getTimezone()
+							timeZone: updateFields.timeZone || this.getTimezone(),
 						};
 					}
 					if (updateFields.end) {
 						body.end = {
 							dateTime: updateFields.end,
-							timeZone: updateFields.timeZone || this.getTimezone()
+							timeZone: updateFields.timeZone || this.getTimezone(),
 						};
 					}
 					if (updateFields.attendees) {
 						body.attendees = (updateFields.attendees as string[]).map(
 							attendee => {
 								return { email: attendee };
-							}
+							},
 						);
 					}
 					if (updateFields.color) {
@@ -441,10 +485,10 @@ export class GoogleCalendar implements INodeType {
 					if (!useDefaultReminders) {
 						const reminders = (this.getNodeParameter(
 							'remindersUi',
-							i
+							i,
 						) as IDataObject).remindersValues as IDataObject[];
 						body.reminders = {
-							useDefault: false
+							useDefault: false,
 						};
 						if (reminders) {
 							body.reminders.overrides = reminders;
@@ -454,12 +498,12 @@ export class GoogleCalendar implements INodeType {
 						body.start = {
 							date: moment(updateFields.start as string)
 								.utc()
-								.format('YYYY-MM-DD')
+								.format('YYYY-MM-DD'),
 						};
 						body.end = {
 							date: moment(updateFields.end as string)
 								.utc()
-								.format('YYYY-MM-DD')
+								.format('YYYY-MM-DD'),
 						};
 					}
 					//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
@@ -467,12 +511,12 @@ export class GoogleCalendar implements INodeType {
 					body.recurrence = [];
 					if (updateFields.repeatHowManyTimes && updateFields.repeatUntil) {
 						throw new Error(
-							`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`
+							`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`,
 						);
 					}
 					if (updateFields.repeatFrecuency) {
 						body.recurrence?.push(
-							`FREQ=${(updateFields.repeatFrecuency as string).toUpperCase()};`
+							`FREQ=${(updateFields.repeatFrecuency as string).toUpperCase()};`,
 						);
 					}
 					if (updateFields.repeatHowManyTimes) {
@@ -482,7 +526,7 @@ export class GoogleCalendar implements INodeType {
 						body.recurrence?.push(
 							`UNTIL=${moment(updateFields.repeatUntil as string)
 								.utc()
-								.format('YYYYMMDDTHHmmss')}Z`
+								.format('YYYYMMDDTHHmmss')}Z`,
 						);
 					}
 					if (body.recurrence.length !== 0) {
@@ -495,15 +539,15 @@ export class GoogleCalendar implements INodeType {
 						'PATCH',
 						`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
 						body,
-						qs
+						qs,
 					);
 				}
 			}
-		}
-		if (Array.isArray(responseData)) {
-			returnData.push.apply(returnData, responseData as IDataObject[]);
-		} else if (responseData !== undefined) {
-			returnData.push(responseData as IDataObject);
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+			} else if (responseData !== undefined) {
+				returnData.push(responseData as IDataObject);
+			}
 		}
 		return [this.helpers.returnJsonArray(returnData)];
 	}
diff --git a/packages/nodes-base/nodes/Google/Contacts/ContactDescription.ts b/packages/nodes-base/nodes/Google/Contacts/ContactDescription.ts
index a2c438c90..bec7058c7 100644
--- a/packages/nodes-base/nodes/Google/Contacts/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/ContactDescription.ts
@@ -42,8 +42,8 @@ export const contactOperations = [
 			},
 		],
 		default: 'create',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const contactFields = [
@@ -180,7 +180,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Company',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -222,7 +222,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Custom Field',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -254,7 +254,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Email',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -301,7 +301,7 @@ export const contactFields = [
 				placeholder: 'Add Event',
 				description: 'An event related to the person.',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -386,7 +386,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Phone',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -467,7 +467,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Relation',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -1208,7 +1208,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Company',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -1250,7 +1250,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Custom Field',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -1282,7 +1282,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Email',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -1329,7 +1329,7 @@ export const contactFields = [
 				placeholder: 'Add Event',
 				description: 'An event related to the person.',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -1414,7 +1414,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Phone',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
@@ -1495,7 +1495,7 @@ export const contactFields = [
 				default: '',
 				placeholder: 'Add Relation',
 				typeOptions: {
-					multipleValues: true
+					multipleValues: true,
 				},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
index 2996cfe15..1493adeb2 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
@@ -21,7 +21,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		body,
 		qs,
 		uri: uri || `https://people.googleapis.com/v1${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		if (Object.keys(headers).length !== 0) {
@@ -50,7 +50,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 
 			// Try to return the error prettier
 			throw new Error(
-				`Google Contacts error response [${error.statusCode}]: ${errors}`
+				`Google Contacts error response [${error.statusCode}]: ${errors}`,
 			);
 		}
 		throw error;
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index b7749662a..0caa44bf7 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -4,11 +4,11 @@ import {
 
 import {
 	IDataObject,
-	INodeExecutionData,
-	INodeTypeDescription,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -19,8 +19,8 @@ import {
 } from './GenericFunctions';
 
 import {
-	contactOperations,
 	contactFields,
+	contactOperations,
 } from './ContactDescription';
 
 import * as moment from 'moment';
@@ -58,7 +58,7 @@ export class GoogleContacts implements INodeType {
 					},
 				],
 				default: 'contact',
-				description: 'The resource to operate on.'
+				description: 'The resource to operate on.',
 			},
 			...contactOperations,
 			...contactFields,
@@ -70,7 +70,7 @@ export class GoogleContacts implements INodeType {
 			// Get all the calendars to display them to user so that he can
 			// select them easily
 			async getGroups(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const groups = await googleApiRequestAllItems.call(
@@ -84,12 +84,12 @@ export class GoogleContacts implements INodeType {
 					const groupId = group.resourceName;
 					returnData.push({
 						name: groupName,
-						value: groupId
+						value: groupId,
 					});
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -177,9 +177,9 @@ export class GoogleContacts implements INodeType {
 								date: {
 									day,
 									month,
-									year
-								}
-							}
+									year,
+								},
+							},
 						];
 					}
 
@@ -206,8 +206,8 @@ export class GoogleContacts implements INodeType {
 						const memberships = (additionalFields.group as string[]).map((groupId: string) => {
 							return {
 								contactGroupMembership: {
-									contactGroupResourceName: groupId
-								}
+									contactGroupResourceName: groupId,
+								},
 							};
 						});
 
@@ -219,7 +219,7 @@ export class GoogleContacts implements INodeType {
 						'POST',
 						`/people:createContact`,
 						body,
-						qs
+						qs,
 					);
 
 					responseData.contactId = responseData.resourceName.split('/')[1];
@@ -232,7 +232,7 @@ export class GoogleContacts implements INodeType {
 						this,
 						'DELETE',
 						`/people/${contactId}:deleteContact`,
-						{}
+						{},
 					);
 					responseData = { success: true };
 				}
@@ -425,9 +425,9 @@ export class GoogleContacts implements INodeType {
 								date: {
 									day,
 									month,
-									year
-								}
-							}
+									year,
+								},
+							},
 						];
 
 						updatePersonFields.push('birthdays');
@@ -459,8 +459,8 @@ export class GoogleContacts implements INodeType {
 						const memberships = (updateFields.group as string[]).map((groupId: string) => {
 							return {
 								contactGroupMembership: {
-									contactGroupResourceName: groupId
-								}
+									contactGroupResourceName: groupId,
+								},
 							};
 						});
 
@@ -479,7 +479,7 @@ export class GoogleContacts implements INodeType {
 						'PATCH',
 						`/people/${contactId}:updateContact`,
 						body,
-						qs
+						qs,
 					);
 
 					responseData.contactId = responseData.resourceName.split('/')[1];
diff --git a/packages/nodes-base/nodes/Google/Contacts/googleContacts.png b/packages/nodes-base/nodes/Google/Contacts/googleContacts.png
index 59b632732..c98b5ccaa 100644
Binary files a/packages/nodes-base/nodes/Google/Contacts/googleContacts.png and b/packages/nodes-base/nodes/Google/Contacts/googleContacts.png differ
diff --git a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
index 7d15e492a..cabaa1e7d 100644
--- a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
@@ -121,7 +121,7 @@ function getAccessToken(this: IExecuteFunctions | IExecuteSingleFunctions | ILoa
 				'typ': 'JWT',
 				'alg': 'RS256',
 			},
-		}
+		},
 	);
 
 	const options: OptionsWithUri = {
@@ -134,7 +134,7 @@ function getAccessToken(this: IExecuteFunctions | IExecuteSingleFunctions | ILoa
 			assertion: signature,
 		},
 		uri: 'https://oauth2.googleapis.com/token',
-		json: true
+		json: true,
 	};
 
 	//@ts-ignore
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index aa1ee291f..e1bcc4c35 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -5,9 +5,9 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -124,6 +124,11 @@ export class GoogleDrive implements INodeType {
 						value: 'list',
 						description: 'List files and folders',
 					},
+					{
+						name: 'Share',
+						value: 'share',
+						description: 'Share a file',
+					},
 					{
 						name: 'Upload',
 						value: 'upload',
@@ -156,6 +161,11 @@ export class GoogleDrive implements INodeType {
 						value: 'delete',
 						description: 'Delete a folder',
 					},
+					{
+						name: 'Share',
+						value: 'share',
+						description: 'Share a folder',
+					},
 				],
 				default: 'create',
 				description: 'The operation to perform.',
@@ -178,7 +188,7 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'copy'
+							'copy',
 						],
 						resource: [
 							'file',
@@ -201,7 +211,7 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'delete'
+							'delete',
 						],
 						resource: [
 							'file',
@@ -225,7 +235,7 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'download'
+							'download',
 						],
 						resource: [
 							'file',
@@ -243,7 +253,7 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'download'
+							'download',
 						],
 						resource: [
 							'file',
@@ -265,7 +275,7 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'list'
+							'list',
 						],
 						resource: [
 							'file',
@@ -351,15 +361,15 @@ export class GoogleDrive implements INodeType {
 								options: [
 									{
 										name: 'Contains',
-										value: 'contains'
+										value: 'contains',
 									},
 									{
 										name: 'Is',
-										value: 'is'
+										value: 'is',
 									},
 									{
 										name: 'Is Not',
-										value: 'isNot'
+										value: 'isNot',
 									},
 
 								],
@@ -373,7 +383,7 @@ export class GoogleDrive implements INodeType {
 								default: '',
 								description: 'The value for operation.',
 							},
-						]
+						],
 					},
 					{
 						name: 'mimeType',
@@ -472,12 +482,248 @@ export class GoogleDrive implements INodeType {
 								},
 								description: 'Custom Mime Type',
 							},
-						]
-					}
+						],
+					},
 				],
 			},
 
 
+			// ----------------------------------
+			//         file:share
+			// ----------------------------------
+			{
+				displayName: 'File ID',
+				name: 'fileId',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'share',
+						],
+						resource: [
+							'file',
+							'folder',
+						],
+					},
+				},
+				description: 'The ID of the file or shared drive.',
+			},
+			{
+				displayName: 'Permissions',
+				name: 'permissionsUi',
+				placeholder: 'Add Permission',
+				type: 'fixedCollection',
+				default: '',
+				typeOptions: {
+					multipleValues: false,
+				},
+				displayOptions: {
+					show: {
+						resource: [
+							'file',
+						],
+						operation: [
+							'share',
+							'folder',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Permission',
+						name: 'permissionsValues',
+						values: [
+							{
+								displayName: 'Role',
+								name: 'role',
+								type: 'options',
+								options: [
+									{
+										name: 'Owner',
+										value: 'owner',
+									},
+									{
+										name: 'Organizer',
+										value: 'organizer',
+									},
+									{
+										name: 'File Organizer',
+										value: 'fileOrganizer',
+									},
+									{
+										name: 'Writer',
+										value: 'writer',
+									},
+									{
+										name: 'Commenter',
+										value: 'commenter',
+									},
+									{
+										name: 'Reader',
+										value: 'reader',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'User',
+										value: 'user',
+									},
+									{
+										name: 'Group',
+										value: 'group',
+									},
+									{
+										name: 'Domain',
+										value: 'domain',
+									},
+									{
+										name: 'Anyone',
+										value: 'anyone',
+									},
+								],
+								default: '',
+								description: 'Information about the different types can be found <a href="https://developers.google.com/drive/api/v3/ref-roles" target="_blank">here</a>.',
+							},
+							{
+								displayName: 'Email Address',
+								name: 'emailAddress',
+								type: 'string',
+								displayOptions: {
+									show: {
+										type: [
+											'user',
+											'group',
+										],
+									},
+								},
+								default: '',
+								description: 'The email address of the user or group to which this permission refers',
+							},
+							{
+								displayName: 'Domain',
+								name: 'domain',
+								type: 'string',
+								displayOptions: {
+									show: {
+										type: [
+											'domain',
+										],
+									},
+								},
+								default: '',
+								description: 'The domain to which this permission refers',
+							},
+							{
+								displayName: 'Allow File Discovery',
+								name: 'allowFileDiscovery',
+								type: 'boolean',
+								displayOptions: {
+									show: {
+										type: [
+											'domain',
+											'anyone',
+										],
+									},
+								},
+								default: false,
+								description: 'Whether the permission allows the file to be discovered through search',
+							},
+						],
+					},
+				],
+			},
+
+			{
+				displayName: 'Parents',
+				name: 'parents',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: [],
+				displayOptions: {
+					show: {
+						operation: [
+							'upload',
+						],
+						resource: [
+							'file',
+						],
+					},
+				},
+				description: 'The IDs of the parent folders which contain the file.',
+			},
+			{
+				displayName: 'Binary Data',
+				name: 'binaryData',
+				type: 'boolean',
+				default: false,
+				displayOptions: {
+					show: {
+						operation: [
+							'upload',
+						],
+						resource: [
+							'file',
+						],
+					},
+				},
+				description: 'If the data to upload should be taken from binary field.',
+			},
+			{
+				displayName: 'File Content',
+				name: 'fileContent',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						operation: [
+							'upload',
+						],
+						resource: [
+							'file',
+						],
+						binaryData: [
+							false,
+						],
+					},
+
+				},
+				placeholder: '',
+				description: 'The text content of the file to upload.',
+			},
+			{
+				displayName: 'Binary Property',
+				name: 'binaryPropertyName',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'upload',
+						],
+						resource: [
+							'file',
+						],
+						binaryData: [
+							true,
+						],
+					},
+
+				},
+				placeholder: '',
+				description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
+			},
+
 			// ----------------------------------
 			//         file:upload
 			// ----------------------------------
@@ -490,7 +736,7 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
@@ -528,7 +774,7 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
@@ -545,13 +791,13 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
 						],
 						binaryData: [
-							false
+							false,
 						],
 					},
 
@@ -568,13 +814,13 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
 						],
 						binaryData: [
-							true
+							true,
 						],
 					},
 
@@ -600,7 +846,7 @@ export class GoogleDrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'folder',
@@ -617,10 +863,95 @@ export class GoogleDrive implements INodeType {
 				placeholder: 'Add Option',
 				default: {},
 				options: [
+					{
+						displayName: 'Email Message',
+						name: 'emailMessage',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
+						default: '',
+						description: 'A plain text custom message to include in the notification email.',
+					},
+					{
+						displayName: 'Enforce Single Parent',
+						name: 'enforceSingleParent',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
+						default: false,
+						description: `Set to true to opt in to API behavior that aims for all items to have exactly one parent<br>
+						This parameter only takes effect if the item is not in a shared drive`,
+					},
 					{
 						displayName: 'Fields',
 						name: 'fields',
 						type: 'multiOptions',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
+						options: [
+							{
+								name: '*',
+								value: '*',
+								description: 'All fields.',
+							},
+							{
+								name: 'Email Address',
+								value: 'emailAddress',
+							},
+							{
+								name: 'Display Name',
+								value: 'displayName',
+							},
+							{
+								name: 'Deleted',
+								value: 'deleted',
+							},
+						],
+						default: [],
+						description: 'The fields to return.',
+					},
+					{
+						displayName: 'Fields',
+						name: 'fields',
+						type: 'multiOptions',
+						displayOptions: {
+							hide: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
 						options: [
 							{
 								name: '*',
@@ -696,6 +1027,98 @@ export class GoogleDrive implements INodeType {
 						default: [],
 						description: 'The fields to return.',
 					},
+					{
+						displayName: 'Move To New Owners Root',
+						name: 'moveToNewOwnersRoot',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
+						default: '',
+						description: `This parameter only takes effect if the item is not in a shared drive and the request is attempting to transfer the ownership of the item.<br>
+						When set to true, the item is moved to the new owner's My Drive root folder and all prior parents removed`,
+					},
+					{
+						displayName: 'Send Notification Email',
+						name: 'sendNotificationEmail',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
+						default: '',
+						description: 'Whether to send a notification email when sharing to users or groups',
+					},
+					{
+						displayName: 'Supports All Drives',
+						name: 'supportsAllDrives',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
+						default: false,
+						description: 'Whether the requesting application supports both My Drives and shared drives',
+					},
+					{
+						displayName: 'Transfer Ownership',
+						name: 'transferOwnership',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
+						default: false,
+						description: 'Whether to transfer ownership to the specified user and downgrade the current owner to a writer.',
+					},
+					{
+						displayName: 'Use Domain Admin Access',
+						name: 'useDomainAdminAccess',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'share',
+								],
+								'/resource': [
+									'file',
+									'folder',
+								],
+							},
+						},
+						default: false,
+						description: `Issue the request as a domain administrator; if set to true, then the requester will be granted access if the file ID parameter<br>
+						refers to a shared drive and the requester is an administrator of the domain to which the shared drive belongs.`,
+					},
 
 					{
 						displayName: 'File Name',
@@ -704,7 +1127,7 @@ export class GoogleDrive implements INodeType {
 						displayOptions: {
 							show: {
 								'/operation': [
-									'copy'
+									'copy',
 								],
 								'/resource': [
 									'file',
@@ -744,7 +1167,7 @@ export class GoogleDrive implements INodeType {
 						displayOptions: {
 							show: {
 								'/operation': [
-									'list'
+									'list',
 								],
 								'/resource': [
 									'file',
@@ -781,7 +1204,7 @@ export class GoogleDrive implements INodeType {
 						displayOptions: {
 							show: {
 								'/operation': [
-									'list'
+									'list',
 								],
 								'/resource': [
 									'file',
@@ -823,21 +1246,20 @@ export class GoogleDrive implements INodeType {
 						displayOptions: {
 							show: {
 								'/operation': [
-									'list'
+									'list',
 								],
 								'/resource': [
 									'file',
 								],
 								corpora: [
-									'drive'
-								]
+									'drive',
+								],
 							},
 						},
 						description: 'ID of the shared drive to search. The driveId parameter must be specified if and only if corpora is set to drive.',
 					},
 				],
 			},
-
 		],
 	};
 
@@ -1122,6 +1544,32 @@ export class GoogleDrive implements INodeType {
 						success: true,
 					});
 				}
+				if (operation === 'share') {
+
+					const fileId = this.getNodeParameter('fileId', i) as string;
+
+					const permissions = this.getNodeParameter('permissionsUi', i) as IDataObject;
+
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					const body: IDataObject = {};
+
+					const qs: IDataObject = {};
+
+					if (permissions.permissionsValues) {
+						Object.assign(body, permissions.permissionsValues);
+					}
+
+					Object.assign(qs, options);
+
+					if (qs.fields) {
+						qs.fields = (qs.fields as string[]).join(',');
+					}
+
+					const response = await googleApiRequest.call(this, 'POST', `/drive/v3/files/${fileId}/permissions`, body, qs);
+
+					returnData.push(response as IDataObject);
+				}
 			} else {
 				throw new Error(`The resource "${resource}" is not known!`);
 			}
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
new file mode 100644
index 000000000..1c4d83a69
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
@@ -0,0 +1,460 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	googleApiRequest,
+	googleApiRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	userFields,
+	userOperations,
+} from './UserDescription';
+
+import {
+	groupFields,
+	groupOperations,
+} from './GroupDescripion';
+
+export class GSuiteAdmin implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'G Suite Admin',
+		name: 'gSuiteAdmin',
+		icon: 'file:gSuiteAdmin.png',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume G Suite Admin API',
+		defaults: {
+			name: 'G Suite Admin',
+			color: '#ecbb26',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'gSuiteAdminOAuth2Api',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Group',
+						value: 'group',
+					},
+					{
+						name: 'User',
+						value: 'user',
+					},
+				],
+				default: 'user',
+				description: 'The resource to operate on.',
+			},
+			...groupOperations,
+			...groupFields,
+			...userOperations,
+			...userFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			// Get all the domains to display them to user so that he can
+			// select them easily
+			async getDomains(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const domains = await googleApiRequestAllItems.call(
+					this,
+					'domains',
+					'GET',
+					'/directory/v1/customer/my_customer/domains',
+				);
+				for (const domain of domains) {
+					const domainName = domain.domainName;
+					const domainId = domain.domainName;
+					returnData.push({
+						name: domainName,
+						value: domainId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the schemas to display them to user so that he can
+			// select them easily
+			async getSchemas(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const schemas = await googleApiRequestAllItems.call(
+					this,
+					'schemas',
+					'GET',
+					'/directory/v1/customer/my_customer/schemas',
+				);
+				for (const schema of schemas) {
+					const schemaName = schema.displayName;
+					const schemaId = schema.schemaName;
+					returnData.push({
+						name: schemaName,
+						value: schemaId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+			if (resource === 'group') {
+				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/insert
+				if (operation === 'create') {
+					const email = this.getNodeParameter('email', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						email,
+					};
+
+					Object.assign(body, additionalFields);
+
+					responseData = await googleApiRequest.call(
+						this,
+						'POST',
+						`/directory/v1/groups`,
+						body,
+					);
+				}
+
+				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/delete
+				if (operation === 'delete') {
+					const groupId = this.getNodeParameter('groupId', i) as string;
+
+					responseData = await googleApiRequest.call(
+						this,
+						'DELETE',
+						`/directory/v1/groups/${groupId}`,
+						{},
+					);
+
+					responseData = { success: true };
+				}
+
+				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/get
+				if (operation === 'get') {
+					const groupId = this.getNodeParameter('groupId', i) as string;
+
+					responseData = await googleApiRequest.call(
+						this,
+						'GET',
+						`/directory/v1/groups/${groupId}`,
+						{},
+					);
+				}
+
+				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/list
+				if (operation === 'getAll') {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					Object.assign(qs, options);
+
+					if (qs.customer === undefined) {
+						qs.customer = 'my_customer';
+					}
+
+					if (returnAll) {
+						responseData = await googleApiRequestAllItems.call(
+							this,
+							'groups',
+							'GET',
+							`/directory/v1/groups`,
+							{},
+							qs,
+						);
+
+					} else {
+						qs.maxResults = this.getNodeParameter('limit', i) as number;
+
+						responseData = await googleApiRequest.call(
+							this,
+							'GET',
+							`/directory/v1/groups`,
+							{},
+							qs,
+						);
+
+						responseData = responseData.groups;
+					}
+				}
+
+				//https://developers.google.com/admin-sdk/directory/v1/reference/groups/update
+				if (operation === 'update') {
+					const groupId = this.getNodeParameter('groupId', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body: IDataObject = {};
+
+					Object.assign(body, updateFields);
+
+					responseData = await googleApiRequest.call(
+						this,
+						'PUT',
+						`/directory/v1/groups/${groupId}`,
+						body,
+					);
+				}
+			}
+
+			if (resource === 'user') {
+				//https://developers.google.com/admin-sdk/directory/v1/reference/users/insert
+				if (operation === 'create') {
+					const domain = this.getNodeParameter('domain', i) as string;
+
+					const firstName = this.getNodeParameter('firstName', i) as string;
+
+					const lastName = this.getNodeParameter('lastName', i) as string;
+
+					const password = this.getNodeParameter('password', i) as string;
+
+					const username = this.getNodeParameter('username', i) as string;
+
+					const makeAdmin = this.getNodeParameter('makeAdmin', i) as boolean;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						name: {
+							familyName: lastName,
+							givenName: firstName,
+						},
+						password,
+						primaryEmail: `${username}@${domain}`,
+					};
+
+					Object.assign(body, additionalFields);
+
+					if (additionalFields.phoneUi) {
+						const phones = (additionalFields.phoneUi as IDataObject).phoneValues as IDataObject[];
+
+						body.phones = phones;
+
+						delete body.phoneUi;
+					}
+
+					if (additionalFields.emailUi) {
+						const emails = (additionalFields.emailUi as IDataObject).emailValues as IDataObject[];
+
+						body.emails = emails;
+
+						delete body.emailUi;
+					}
+
+					responseData = await googleApiRequest.call(
+						this,
+						'POST',
+						`/directory/v1/users`,
+						body,
+						qs,
+					);
+
+					if (makeAdmin) {
+						await googleApiRequest.call(
+							this,
+							'POST',
+							`/directory/v1/users/${responseData.id}/makeAdmin`,
+							{ status: true },
+						);
+
+						responseData.isAdmin = true;
+					}
+				}
+
+				//https://developers.google.com/admin-sdk/directory/v1/reference/users/delete
+				if (operation === 'delete') {
+					const userId = this.getNodeParameter('userId', i) as string;
+
+					responseData = await googleApiRequest.call(
+						this,
+						'DELETE',
+						`/directory/v1/users/${userId}`,
+						{},
+					);
+
+					responseData = { success: true };
+				}
+
+				//https://developers.google.com/admin-sdk/directory/v1/reference/users/get
+				if (operation === 'get') {
+					const userId = this.getNodeParameter('userId', i) as string;
+
+					const projection = this.getNodeParameter('projection', i) as string;
+
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					qs.projection = projection;
+
+					Object.assign(qs, options);
+
+					if (qs.customFieldMask) {
+						qs.customFieldMask = (qs.customFieldMask as string[]).join(' ');
+					}
+
+					if (qs.projection === 'custom' && qs.customFieldMask === undefined) {
+						throw new Error('When projection is set to custom, the custom schemas field must be defined');
+					}
+
+					responseData = await googleApiRequest.call(
+						this,
+						'GET',
+						`/directory/v1/users/${userId}`,
+						{},
+						qs,
+					);
+				}
+
+				//https://developers.google.com/admin-sdk/directory/v1/reference/users/list
+				if (operation === 'getAll') {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					const projection = this.getNodeParameter('projection', i) as string;
+
+					const options = this.getNodeParameter('options', i) as IDataObject;
+
+					qs.projection = projection;
+
+					Object.assign(qs, options);
+
+					if (qs.customer === undefined) {
+						qs.customer = 'my_customer';
+					}
+
+					if (qs.customFieldMask) {
+						qs.customFieldMask = (qs.customFieldMask as string[]).join(' ');
+					}
+
+					if (qs.projection === 'custom' && qs.customFieldMask === undefined) {
+						throw new Error('When projection is set to custom, the custom schemas field must be defined');
+					}
+
+					if (returnAll) {
+						responseData = await googleApiRequestAllItems.call(
+							this,
+							'users',
+							'GET',
+							`/directory/v1/users`,
+							{},
+							qs,
+						);
+
+					} else {
+						qs.maxResults = this.getNodeParameter('limit', i) as number;
+
+						responseData = await googleApiRequest.call(
+							this,
+							'GET',
+							`/directory/v1/users`,
+							{},
+							qs,
+						);
+
+						responseData = responseData.users;
+					}
+				}
+
+				//https://developers.google.com/admin-sdk/directory/v1/reference/users/update
+				if (operation === 'update') {
+					const userId = this.getNodeParameter('userId', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body: { name: { givenName?: string, familyName?: string }, emails?: IDataObject[], phones?: IDataObject[] } = { name: {} };
+
+					Object.assign(body, updateFields);
+
+					if (updateFields.firstName) {
+						body.name.givenName = updateFields.firstName as string;
+						//@ts-ignore
+						delete body.firstName;
+					}
+
+					if (updateFields.lastName) {
+						body.name.familyName = updateFields.lastName as string;
+						//@ts-ignore
+						delete body.lastName;
+					}
+
+					if (Object.keys(body.name).length === 0) {
+						//@ts-ignore
+						delete body.name;
+					}
+
+					if (updateFields.phoneUi) {
+						const phones = (updateFields.phoneUi as IDataObject).phoneValues as IDataObject[];
+
+						body.phones = phones;
+
+						//@ts-ignore
+						delete body.phoneUi;
+					}
+
+					if (updateFields.emailUi) {
+						const emails = (updateFields.emailUi as IDataObject).emailValues as IDataObject[];
+
+						body.emails = emails;
+
+						//@ts-ignore
+						delete body.emailUi;
+					}
+
+					//@ts-ignore
+					body['customSchemas'] = { testing: { hasdog: true } };
+
+					responseData = await googleApiRequest.call(
+						this,
+						'PUT',
+						`/directory/v1/users/${userId}`,
+						body,
+						qs,
+					);
+				}
+			}
+		}
+
+		if (Array.isArray(responseData)) {
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+
+		} else if (responseData !== undefined) {
+			returnData.push(responseData as IDataObject);
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
new file mode 100644
index 000000000..81768cfba
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
@@ -0,0 +1,67 @@
+import {
+	OptionsWithUri,
+ } from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+	const options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://www.googleapis.com/admin${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		//@ts-ignore
+		return await this.helpers.requestOAuth2.call(this, 'gSuiteAdminOAuth2Api', options);
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.error) {
+
+			let errors = error.response.body.error.errors;
+
+			errors = errors.map((e: IDataObject) => e.message);
+			// Try to return the error prettier
+			throw new Error(
+				`G Suite Admin error response [${error.statusCode}]: ${errors.join('|')}`,
+			);
+		}
+		throw error;
+	}
+}
+
+export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string ,method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.maxResults = 100;
+
+	do {
+		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
+		query.pageToken = responseData['nextPageToken'];
+		returnData.push.apply(returnData, responseData[propertyName]);
+	} while (
+		responseData['nextPageToken'] !== undefined &&
+		responseData['nextPageToken'] !== ''
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts
new file mode 100644
index 000000000..160cb65f7
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts
@@ -0,0 +1,332 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const groupOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'group',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a group',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a group',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a group',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all groups',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a group',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const groupFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                 group:create                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'group',
+				],
+			},
+		},
+		default: '',
+		description: `The group's email address. If your account has multiple domains, select the appropriate domain for the email address. The email must be unique`,
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'group',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: `An extended description to help users determine the purpose of a group.<br>
+				For example, you can include information about who should join the group,<br>
+				the types of messages to send to the group, links to FAQs about the group, or related groups`,
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: `The group's display name`,
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 group:delete                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Group ID',
+		name: 'groupId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'group',
+				],
+			},
+		},
+		default: '',
+		description: `Identifies the group in the API request. The value can be the group's email address, group alias, or the unique group ID.`,
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 group:get                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Group ID',
+		name: 'groupId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'group',
+				],
+			},
+		},
+		default: '',
+		description: `Identifies the group in the API request. The value can be the group's email address, group alias, or the unique group ID.`,
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 group:getAll                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'group',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'group',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'group',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Customer',
+				name: 'customer',
+				type: 'string',
+				default: '',
+				description: `The unique ID for the customer's G Suite account. In case of a multi-domain account, to fetch all groups for a customer, fill this field instead of domain`,
+			},
+			{
+				displayName: 'Domain',
+				name: 'domain',
+				type: 'string',
+				default: '',
+				description: 'The domain name. Use this field to get fields from only one domain.',
+			},
+			{
+				displayName: 'Order By',
+				name: 'orderBy',
+				type: 'options',
+				options: [
+					{
+						name: 'Email',
+						value: 'email',
+					},
+				],
+				default: '',
+				description: 'Property to use for sorting results.',
+			},
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				default: '',
+				description: `Query string search. Complete documentation is <a href="https://developers.google.com/admin-sdk/directory/v1/guides/search-groups" target="_blank">at</a>`,
+			},
+			{
+				displayName: 'Sort Order',
+				name: 'sortOrder',
+				type: 'options',
+				options: [
+					{
+						name: 'Ascending',
+						value: 'ASCENDING',
+					},
+					{
+						name: 'Descending',
+						value: 'DESCENDING',
+					},
+				],
+				default: '',
+				description: 'Whether to return results in ascending or descending order',
+			},
+			{
+				displayName: 'User ID',
+				name: 'userId',
+				type: 'string',
+				default: '',
+				description: `Email or immutable ID of the user if only those groups are to be listed, the given user is a member of. If it's an ID, it should match with the ID of the user object.`,
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 group:update                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Group ID',
+		name: 'groupId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'group',
+				],
+			},
+		},
+		default: '',
+		description: `Identifies the group in the API request. The value can be the group's email address, group alias, or the unique group ID.`,
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'group',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: `An extended description to help users determine the purpose of a group.<br>
+				For example, you can include information about who should join the group,<br>
+				the types of messages to send to the group, links to FAQs about the group, or related groups`,
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				description: `The group's email address. If your account has multiple domains, select the appropriate domain for the email address. The email must be unique.`,
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: `The group's display name`,
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
new file mode 100644
index 000000000..4222f86c0
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
@@ -0,0 +1,940 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const userOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a user',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a user',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a user',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all users',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a user',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const userFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:create                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'First Name',
+		name: 'firstName',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Password',
+		name: 'password',
+		type: 'string',
+		typeOptions: {
+			password: true,
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: 'Stores the password for the user account. A minimum of 8 characters is required. The maximum length is 100 characters.',
+	},
+	{
+		displayName: 'Domain',
+		name: 'domain',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getDomains',
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Username',
+		name: 'username',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: `The username that will be set to the user. Example: If you domain is example.com and you set the username to jhon then the user's final email address will be jhon@example.com.`,
+	},
+	{
+		displayName: 'Make Admin',
+		name: 'makeAdmin',
+		type: 'boolean',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: false,
+		description: 'Makes a user a super administrator',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Change Password At Next Login',
+				name: 'changePasswordAtNextLogin',
+				type: 'boolean',
+				default: false,
+				description: 'Indicates if the user is forced to change their password at next login.',
+			},
+			{
+				displayName: 'Phones',
+				name: 'phoneUi',
+				placeholder: 'Add Phone',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'phoneValues',
+						displayName: 'Phone',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'Assistant',
+										value: 'assistant',
+									},
+									{
+										name: 'Callback',
+										value: 'callback',
+									},
+									{
+										name: 'Car',
+										value: 'car',
+									},
+									{
+										name: 'Company Main',
+										value: 'company_main',
+									},
+									{
+										name: 'Custom',
+										value: 'custom',
+									},
+									{
+										name: 'Grand Central',
+										value: 'grand_central',
+									},
+									{
+										name: 'Home',
+										value: 'home',
+									},
+									{
+										name: 'Home Fax',
+										value: 'home_fax',
+									},
+									{
+										name: 'isdn',
+										value: 'isdn',
+									},
+									{
+										name: 'Main',
+										value: 'main',
+									},
+									{
+										name: 'Mobile',
+										value: 'mobile',
+									},
+									{
+										name: 'Other',
+										value: 'other',
+									},
+									{
+										name: 'Other Fax',
+										value: 'other_fax',
+									},
+									{
+										name: 'Pager',
+										value: 'pager',
+									},
+									{
+										name: 'Radio',
+										value: 'radio',
+									},
+									{
+										name: 'Telex',
+										value: 'telex',
+									},
+									{
+										name: 'tty tdd',
+										value: 'tty_tdd',
+									},
+									{
+										name: 'Work',
+										value: 'work',
+									},
+									{
+										name: 'Work Fax',
+										value: 'work_fax',
+									},
+									{
+										name: 'Work Mobile',
+										value: 'work_mobile',
+									},
+									{
+										name: 'Work Pager',
+										value: 'work_pager',
+									},
+								],
+								default: 'work',
+								description: 'The type of phone number',
+							},
+							{
+								displayName: 'Phone Number',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Primary',
+								name: 'primary',
+								type: 'boolean',
+								default: false,
+								description: `Indicates if this is the user's primary phone number. A user may only have one primary phone number.`,
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Secondary Emails',
+				name: 'emailUi',
+				placeholder: 'Add Email',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'emailValues',
+						displayName: 'Email',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'Home',
+										value: 'home',
+									},
+									{
+										name: 'Work',
+										value: 'work',
+									},
+									{
+										name: 'Other',
+										value: 'other',
+									},
+								],
+								default: 'work',
+								description: 'The type of the email account',
+							},
+							{
+								displayName: 'Email',
+								name: 'address',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:delete                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: `The value can be the user's primary email address, alias email address, or unique user ID.`,
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:get                                   */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: `The value can be the user's primary email address, alias email address, or unique user ID.`,
+	},
+	{
+		displayName: 'Projection',
+		name: 'projection',
+		type: 'options',
+		required: true,
+		options: [
+			{
+				name: 'Basic',
+				value: 'basic',
+				description: 'Do not include any custom fields for the user',
+			},
+			{
+				name: 'Custom',
+				value: 'custom',
+				description: 'Include custom fields from schemas requested in customField',
+			},
+			{
+				name: 'Full',
+				value: 'full',
+				description: 'Include all fields associated with this user',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: 'basic',
+		description: 'What subset of fields to fetch for this user',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Options',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Custom Schemas',
+				name: 'customFieldMask',
+				type: 'multiOptions',
+				displayOptions: {
+					show: {
+						'/projection': [
+							'custom',
+						],
+					},
+				},
+				typeOptions: {
+					loadOptionsMethod: 'getSchemas',
+				},
+				default: [],
+				description: `A comma-separated list of schema names. All fields from these schemas are fetched. This should only be set when projection=custom.`,
+			},
+			{
+				displayName: 'View Type',
+				name: 'viewType',
+				type: 'options',
+				options: [
+					{
+						name: 'Admin View',
+						value: 'admin_view',
+						description: 'Results include both administrator-only and domain-public fields for the user',
+					},
+					{
+						name: 'Descending',
+						value: 'DESCENDING',
+						description: 'Results only include fields for the user that are publicly visible to other users in the domain',
+					},
+				],
+				default: 'admin_view',
+				description: 'Whether to fetch the administrator-only or domain-wide public view of the user. For more information, see Retrieve a user as a non-administrator.',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'user',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Projection',
+		name: 'projection',
+		type: 'options',
+		required: true,
+		options: [
+			{
+				name: 'Basic',
+				value: 'basic',
+				description: 'Do not include any custom fields for the user',
+			},
+			{
+				name: 'Custom',
+				value: 'custom',
+				description: 'Include custom fields from schemas requested in customField',
+			},
+			{
+				name: 'Full',
+				value: 'full',
+				description: 'Include all fields associated with this user',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: 'basic',
+		description: 'What subset of fields to fetch for this user',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Custom Schemas',
+				name: 'customFieldMask',
+				type: 'multiOptions',
+				displayOptions: {
+					show: {
+						'/projection': [
+							'custom',
+						],
+					},
+				},
+				typeOptions: {
+					loadOptionsMethod: 'getSchemas',
+				},
+				default: [],
+				description: `A comma-separated list of schema names. All fields from these schemas are fetched. This should only be set when projection=custom.`,
+			},
+			{
+				displayName: 'Customer',
+				name: 'customer',
+				type: 'string',
+				default: '',
+				description: `The unique ID for the customer's G Suite account. In case of a multi-domain account, to fetch all groups for a customer, fill this field instead of domain`,
+			},
+			{
+				displayName: 'Domain',
+				name: 'domain',
+				type: 'string',
+				default: '',
+				description: 'The domain name. Use this field to get fields from only one domain.',
+			},
+			{
+				displayName: 'Order By',
+				name: 'orderBy',
+				type: 'options',
+				options: [
+					{
+						name: 'Email',
+						value: 'email',
+					},
+					{
+						name: 'Family Name',
+						value: 'familyName',
+					},
+					{
+						name: 'Given Name',
+						value: 'givenName',
+					},
+				],
+				default: '',
+				description: 'Property to use for sorting results.',
+			},
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				default: '',
+				description: `Free text search terms to find users that match these terms in any field, except for extended properties.</br>
+				For more information on constructing user queries, see <a href="https://developers.google.com/admin-sdk/directory/v1/guides/search-users" target="_blank">Search for Users</a>`,
+			},
+			{
+				displayName: 'Show Deleted',
+				name: 'showDeleted',
+				type: 'boolean',
+				default: false,
+				description: 'If set to true, retrieves the list of deleted users.',
+			},
+			{
+				displayName: 'Sort Order',
+				name: 'sortOrder',
+				type: 'options',
+				options: [
+					{
+						name: 'Ascending',
+						value: 'ASCENDING',
+					},
+					{
+						name: 'Descending',
+						value: 'DESCENDING',
+					},
+				],
+				default: '',
+				description: 'Whether to return results in ascending or descending order',
+			},
+			{
+				displayName: 'View Type',
+				name: 'viewType',
+				type: 'options',
+				options: [
+					{
+						name: 'Admin View',
+						value: 'admin_view',
+						description: 'Results include both administrator-only and domain-public fields for the user',
+					},
+					{
+						name: 'Descending',
+						value: 'DESCENDING',
+						description: 'Results only include fields for the user that are publicly visible to other users in the domain',
+					},
+				],
+				default: 'admin_view',
+				description: 'Whether to fetch the administrator-only or domain-wide public view of the user. For more information, see Retrieve a user as a non-administrator.',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:update                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: `The value can be the user's primary email address, alias email address, or unique user ID.`,
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Archived',
+				name: 'archived',
+				type: 'boolean',
+				default: false,
+				description: 'Indicates if user is archived.',
+			},
+			{
+				displayName: 'Change Password At Next Login',
+				name: 'changePasswordAtNextLogin',
+				type: 'boolean',
+				default: false,
+				description: 'Indicates if the user is forced to change their password at next login.',
+			},
+			{
+				displayName: 'First Name',
+				name: 'firstName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'lastName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				type: 'string',
+				default: '',
+				description: 'Stores the password for the user account. A minimum of 8 characters is required. The maximum length is 100 characters.',
+			},
+			{
+				displayName: 'Phones',
+				name: 'phoneUi',
+				placeholder: 'Add Phone',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'phoneValues',
+						displayName: 'Phone',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'Assistant',
+										value: 'assistant',
+									},
+									{
+										name: 'Callback',
+										value: 'callback',
+									},
+									{
+										name: 'Car',
+										value: 'car',
+									},
+									{
+										name: 'Company Main',
+										value: 'company_main',
+									},
+									{
+										name: 'Custom',
+										value: 'custom',
+									},
+									{
+										name: 'Grand Central',
+										value: 'grand_central',
+									},
+									{
+										name: 'Home',
+										value: 'home',
+									},
+									{
+										name: 'Home Fax',
+										value: 'home_fax',
+									},
+									{
+										name: 'isdn',
+										value: 'isdn',
+									},
+									{
+										name: 'Main',
+										value: 'main',
+									},
+									{
+										name: 'Mobile',
+										value: 'mobile',
+									},
+									{
+										name: 'Other',
+										value: 'other',
+									},
+									{
+										name: 'Other Fax',
+										value: 'other_fax',
+									},
+									{
+										name: 'Pager',
+										value: 'pager',
+									},
+									{
+										name: 'Radio',
+										value: 'radio',
+									},
+									{
+										name: 'Telex',
+										value: 'telex',
+									},
+									{
+										name: 'tty tdd',
+										value: 'tty_tdd',
+									},
+									{
+										name: 'Work',
+										value: 'work',
+									},
+									{
+										name: 'Work Fax',
+										value: 'work_fax',
+									},
+									{
+										name: 'Work Mobile',
+										value: 'work_mobile',
+									},
+									{
+										name: 'Work Pager',
+										value: 'work_pager',
+									},
+								],
+								default: 'work',
+								description: 'The type of phone number',
+							},
+							{
+								displayName: 'Phone Number',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Primary',
+								name: 'primary',
+								type: 'boolean',
+								default: false,
+								description: `Indicates if this is the user's primary phone number. A user may only have one primary phone number.`,
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Primary Email',
+				name: 'primaryEmail',
+				type: 'string',
+				default: '',
+				description: `The user's primary email address. This property is required in a request to create a user account. The primaryEmail must be unique and cannot be an alias of another user.`,
+			},
+			{
+				displayName: 'Secondary Emails',
+				name: 'emailUi',
+				placeholder: 'Add Email',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'emailValues',
+						displayName: 'Email',
+						values: [
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								options: [
+									{
+										name: 'Home',
+										value: 'home',
+									},
+									{
+										name: 'Work',
+										value: 'work',
+									},
+									{
+										name: 'Other',
+										value: 'other',
+									},
+								],
+								default: 'work',
+								description: 'The type of the email account',
+							},
+							{
+								displayName: 'Email',
+								name: 'address',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/gSuiteAdmin.png b/packages/nodes-base/nodes/Google/GSuiteAdmin/gSuiteAdmin.png
new file mode 100644
index 000000000..c9dcda0ce
Binary files /dev/null and b/packages/nodes-base/nodes/Google/GSuiteAdmin/gSuiteAdmin.png differ
diff --git a/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts b/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
index 0f80f9092..f0e0bbbd4 100644
--- a/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
@@ -34,7 +34,7 @@ export const draftOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all drafts',
-			}
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -56,7 +56,7 @@ export const draftFields = [
 				operation: [
 					'delete',
 					'get',
-				]
+				],
 			},
 		},
 		placeholder: 'r-3254521568507167962',
@@ -75,7 +75,7 @@ export const draftFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		placeholder: 'Hello World!',
@@ -94,7 +94,7 @@ export const draftFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		placeholder: 'Hello World!',
@@ -112,7 +112,7 @@ export const draftFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		default: {},
@@ -193,7 +193,7 @@ export const draftFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		default: {},
@@ -238,7 +238,7 @@ export const draftFields = [
 					{
 						name: 'RAW',
 						value: 'raw',
-						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.'
+						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.',
 					},
 					{
 						name: 'Resolved',
@@ -249,7 +249,7 @@ export const draftFields = [
 				default: 'resolved',
 				description: 'The format to return the message in',
 			},
-		]
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -359,7 +359,7 @@ export const draftFields = [
 					{
 						name: 'RAW',
 						value: 'raw',
-						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.'
+						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.',
 					},
 					{
 						name: 'Resolved',
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index eee0111d2..4bc91e346 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -3,8 +3,8 @@ import {
 } from 'request';
 
 import {
+	ParsedMail,
 	simpleParser,
-	Source as ParserSource,
 } from 'mailparser';
 
 import {
@@ -71,11 +71,13 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 }
 
 
-export async function parseRawEmail(this: IExecuteFunctions, messageEncoded: ParserSource, dataPropertyNameDownload: string): Promise<INodeExecutionData> {
+export async function parseRawEmail(this: IExecuteFunctions, messageData: any, dataPropertyNameDownload: string): Promise<INodeExecutionData> { // tslint:disable-line:no-any
 
-	const responseData = await simpleParser(messageEncoded);
+	const messageEncoded = Buffer.from(messageData.raw, 'base64').toString('utf8');
+	let responseData = await simpleParser(messageEncoded);
 
 	const headers: IDataObject = {};
+	// @ts-ignore
 	for (const header of responseData.headerLines) {
 		headers[header.key] = header.line;
 	}
@@ -96,6 +98,22 @@ export async function parseRawEmail(this: IExecuteFunctions, messageEncoded: Par
 		responseData.attachments = undefined;
 	}
 
+	const mailBaseData: IDataObject = {};
+
+	const resolvedModeAddProperties = [
+		'id',
+		'threadId',
+		'labelIds',
+		'sizeEstimate',
+	];
+
+	for (const key of resolvedModeAddProperties) {
+		// @ts-ignore
+		mailBaseData[key] = messageData[key];
+	}
+
+	responseData = Object.assign(mailBaseData, responseData);
+
 	return {
 		json: responseData as unknown as IDataObject,
 		binary: Object.keys(binaryData).length ? binaryData : undefined,
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
index 924ad85c7..78500f8d2 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
@@ -4,8 +4,8 @@ import {
 
 import {
 	IBinaryKeyData,
-	ILoadOptionsFunctions,
 	IDataObject,
+	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
@@ -21,23 +21,23 @@ import {
 } from './GenericFunctions';
 
 import {
-	messageOperations,
 	messageFields,
+	messageOperations,
 } from './MessageDescription';
 
 import {
-	messageLabelOperations,
 	messageLabelFields,
+	messageLabelOperations,
 } from './MessageLabelDescription';
 
 import {
-	labelOperations,
 	labelFields,
+	labelOperations,
 } from './LabelDescription';
 
 import {
-	draftOperations,
 	draftFields,
+	draftOperations,
 } from './DraftDescription';
 
 import {
@@ -136,26 +136,26 @@ export class Gmail implements INodeType {
 			// Get all the labels to display them to user so that he can
 			// select them easily
 			async getLabels(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const labels = await googleApiRequestAllItems.call(
 					this,
 					'labels',
 					'GET',
-					'/gmail/v1/users/me/labels'
+					'/gmail/v1/users/me/labels',
 				);
 				for (const label of labels) {
 					const labelName = label.name;
 					const labelId = label.id;
 					returnData.push({
 						name: labelName,
-						value: labelId
+						value: labelId,
 					});
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -216,7 +216,7 @@ export class Gmail implements INodeType {
 						'GET',
 						`/gmail/v1/users/me/labels`,
 						{},
-						qs
+						qs,
 					);
 
 					responseData = responseData.labels;
@@ -454,10 +454,9 @@ export class Gmail implements INodeType {
 
 					let nodeExecutionData: INodeExecutionData;
 					if (format === 'resolved') {
-						const messageEncoded = Buffer.from(responseData.raw, 'base64').toString('utf8');
 						const dataPropertyNameDownload = additionalFields.dataPropertyAttachmentsPrefixName as string || 'attachment_';
 
-						nodeExecutionData = await parseRawEmail.call(this, messageEncoded, dataPropertyNameDownload);
+						nodeExecutionData = await parseRawEmail.call(this, responseData, dataPropertyNameDownload);
 					} else  {
 						nodeExecutionData = {
 							json: responseData,
@@ -487,7 +486,7 @@ export class Gmail implements INodeType {
 							'GET',
 							`/gmail/v1/users/me/messages`,
 							{},
-							qs
+							qs,
 						);
 					} else {
 						qs.maxResults = this.getNodeParameter('limit', i) as number;
@@ -496,7 +495,7 @@ export class Gmail implements INodeType {
 							'GET',
 							`/gmail/v1/users/me/messages`,
 							{},
-							qs
+							qs,
 						);
 						responseData = responseData.messages;
 					}
@@ -521,13 +520,13 @@ export class Gmail implements INodeType {
 								'GET',
 								`/gmail/v1/users/me/messages/${responseData[i].id}`,
 								body,
-								qs
+								qs,
 							);
 
 							if (format === 'resolved') {
-								const messageEncoded = Buffer.from(responseData[i].raw, 'base64').toString('utf8');
 								const dataPropertyNameDownload = additionalFields.dataPropertyAttachmentsPrefixName as string || 'attachment_';
-								responseData[i] = await parseRawEmail.call(this, messageEncoded, dataPropertyNameDownload);
+
+								responseData[i] = await parseRawEmail.call(this, responseData[i], dataPropertyNameDownload);
 							}
 						}
 					}
@@ -654,10 +653,13 @@ export class Gmail implements INodeType {
 
 					let nodeExecutionData: INodeExecutionData;
 					if (format === 'resolved') {
-						const messageEncoded = Buffer.from(responseData.message.raw, 'base64').toString('utf8');
 						const dataPropertyNameDownload = additionalFields.dataPropertyAttachmentsPrefixName as string || 'attachment_';
 
-						nodeExecutionData = await parseRawEmail.call(this, messageEncoded, dataPropertyNameDownload);
+						nodeExecutionData = await parseRawEmail.call(this, responseData.message, dataPropertyNameDownload);
+
+						// Add the draft-id
+						nodeExecutionData.json.messageId = nodeExecutionData.json.id;
+						nodeExecutionData.json.id = responseData.id;
 					} else {
 						nodeExecutionData = {
 							json: responseData,
@@ -690,7 +692,7 @@ export class Gmail implements INodeType {
 							'GET',
 							`/gmail/v1/users/me/drafts`,
 							{},
-							qs
+							qs,
 						);
 					} else {
 						qs.maxResults = this.getNodeParameter('limit', i) as number;
@@ -699,7 +701,7 @@ export class Gmail implements INodeType {
 							'GET',
 							`/gmail/v1/users/me/drafts`,
 							{},
-							qs
+							qs,
 						);
 						responseData = responseData.drafts;
 					}
@@ -724,13 +726,17 @@ export class Gmail implements INodeType {
 								'GET',
 								`/gmail/v1/users/me/drafts/${responseData[i].id}`,
 								body,
-								qs
+								qs,
 							);
 
 							if (format === 'resolved') {
-								const messageEncoded = Buffer.from(responseData[i].message.raw, 'base64').toString('utf8');
 								const dataPropertyNameDownload = additionalFields.dataPropertyAttachmentsPrefixName as string || 'attachment_';
-								responseData[i] = await parseRawEmail.call(this, messageEncoded, dataPropertyNameDownload);
+								const id = responseData[i].id;
+								responseData[i] = await parseRawEmail.call(this, responseData[i].message, dataPropertyNameDownload);
+
+								// Add the draft-id
+								responseData[i].json.messageId = responseData[i].json.id;
+								responseData[i].json.id = id;
 							}
 						}
 					}
diff --git a/packages/nodes-base/nodes/Google/Gmail/LabelDescription.ts b/packages/nodes-base/nodes/Google/Gmail/LabelDescription.ts
index 7fddc17e9..0b02753f1 100644
--- a/packages/nodes-base/nodes/Google/Gmail/LabelDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/LabelDescription.ts
@@ -34,7 +34,7 @@ export const labelOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all labels',
-			}
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform',
@@ -55,7 +55,7 @@ export const labelFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		placeholder: 'invoices',
diff --git a/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts b/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
index 10ea8e37d..adc52bd66 100644
--- a/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
@@ -61,7 +61,7 @@ export const messageFields = [
 				operation: [
 					'get',
 					'delete',
-				]
+				],
 			},
 		},
 		placeholder: '172ce2c4a72cc243',
@@ -80,7 +80,7 @@ export const messageFields = [
 				],
 				operation: [
 					'reply',
-				]
+				],
 			},
 		},
 		placeholder: '172ce2c4a72cc243',
@@ -99,7 +99,7 @@ export const messageFields = [
 				],
 				operation: [
 					'reply',
-				]
+				],
 			},
 		},
 		placeholder: 'CAHNQoFsC6JMMbOBJgtjsqN0eEc+gDg2a=SQj-tWUebQeHMDgqQ@mail.gmail.com',
@@ -119,7 +119,7 @@ export const messageFields = [
 				operation: [
 					'reply',
 					'send',
-				]
+				],
 			},
 		},
 		placeholder: 'Hello World!',
@@ -139,7 +139,7 @@ export const messageFields = [
 				operation: [
 					'reply',
 					'send',
-				]
+				],
 			},
 		},
 		placeholder: 'Hello World!',
@@ -163,7 +163,7 @@ export const messageFields = [
 				operation: [
 					'reply',
 					'send',
-				]
+				],
 			},
 		},
 		placeholder: 'info@example.com',
@@ -182,7 +182,7 @@ export const messageFields = [
 				operation: [
 					'send',
 					'reply',
-				]
+				],
 			},
 		},
 		default: {},
@@ -237,7 +237,7 @@ export const messageFields = [
 				default: '',
 				description: 'Array of supported attachments to add to the message.',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Additional Fields',
@@ -251,7 +251,7 @@ export const messageFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		default: {},
@@ -279,7 +279,7 @@ export const messageFields = [
 					{
 						name: 'RAW',
 						value: 'raw',
-						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.'
+						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.',
 					},
 					{
 						name: 'Resolved',
@@ -307,7 +307,7 @@ export const messageFields = [
 				},
 				description: 'Prefix for name of the binary property to which to<br />write the attachments. An index starting with 0 will be added.<br />So if name is "attachment_" the first attachment is saved to "attachment_0"',
 			},
-		]
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -417,7 +417,7 @@ export const messageFields = [
 					{
 						name: 'RAW',
 						value: 'raw',
-						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.'
+						description: 'Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used.',
 					},
 					{
 						name: 'Resolved',
diff --git a/packages/nodes-base/nodes/Google/Gmail/MessageLabelDescription.ts b/packages/nodes-base/nodes/Google/Gmail/MessageLabelDescription.ts
index 1215044eb..1481f76b8 100644
--- a/packages/nodes-base/nodes/Google/Gmail/MessageLabelDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/MessageLabelDescription.ts
@@ -46,7 +46,7 @@ export const messageLabelFields = [
 				operation: [
 					'add',
 					'remove',
-				]
+				],
 			},
 		},
 		placeholder: '172ce2c4a72cc243',
@@ -69,7 +69,7 @@ export const messageLabelFields = [
 				operation: [
 					'add',
 					'remove',
-				]
+				],
 			},
 		},
 		description: 'The ID of the label',
diff --git a/packages/nodes-base/nodes/Google/Gmail/gmail.png b/packages/nodes-base/nodes/Google/Gmail/gmail.png
index cb9198dd2..172104807 100644
Binary files a/packages/nodes-base/nodes/Google/Gmail/gmail.png and b/packages/nodes-base/nodes/Google/Gmail/gmail.png differ
diff --git a/packages/nodes-base/nodes/Google/Sheet/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Sheet/GenericFunctions.ts
index dff54fa6a..1ac6a2658 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import {
 	OptionsWithUri,
- } from 'request';
+} from 'request';
 
 import {
 	IExecuteFunctions,
@@ -26,7 +26,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		body,
 		qs,
 		uri: uri || `https://sheets.googleapis.com${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		if (Object.keys(headers).length !== 0) {
@@ -61,7 +61,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 	}
 }
 
-export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string ,method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 
 	const returnData: IDataObject[] = [];
 
@@ -80,7 +80,7 @@ export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOp
 	return returnData;
 }
 
-function getAccessToken(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, credentials: IDataObject) : Promise<IDataObject> {
+function getAccessToken(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, credentials: IDataObject): Promise<IDataObject> {
 	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
 
 	const scopes = [
@@ -93,25 +93,25 @@ function getAccessToken(this: IExecuteFunctions | IExecuteSingleFunctions | ILoa
 
 	const signature = jwt.sign(
 		{
-		  'iss': credentials.email as string,
-		  'sub': credentials.email as string,
-		  'scope': scopes.join(' '),
-		  'aud': `https://oauth2.googleapis.com/token`,
-		  'iat': now,
-		  'exp': now + 3600,
+			'iss': credentials.email as string,
+			'sub': credentials.email as string,
+			'scope': scopes.join(' '),
+			'aud': `https://oauth2.googleapis.com/token`,
+			'iat': now,
+			'exp': now + 3600,
 		},
 		credentials.privateKey as string,
 		{
-		  algorithm: 'RS256',
-		  header: {
-			'kid': credentials.privateKey as string,
-			'typ': 'JWT',
-			'alg': 'RS256',
-		  },
-		}
-	  );
+			algorithm: 'RS256',
+			header: {
+				'kid': credentials.privateKey as string,
+				'typ': 'JWT',
+				'alg': 'RS256',
+			},
+		},
+	);
 
-	  const options: OptionsWithUri = {
+	const options: OptionsWithUri = {
 		headers: {
 			'Content-Type': 'application/x-www-form-urlencoded',
 		},
@@ -121,7 +121,7 @@ function getAccessToken(this: IExecuteFunctions | IExecuteSingleFunctions | ILoa
 			assertion: signature,
 		},
 		uri: 'https://oauth2.googleapis.com/token',
-		json: true
+		json: true,
 	};
 
 	//@ts-ignore
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
index 606867e8e..84453d7a7 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
@@ -5,11 +5,11 @@ import {
 import {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
- } from 'n8n-core';
+} from 'n8n-core';
 
 import {
 	googleApiRequest,
- } from './GenericFunctions';
+} from './GenericFunctions';
 
 import {
 	utils as xlsxUtils,
@@ -65,6 +65,22 @@ export class GoogleSheet {
 	}
 
 
+	/**
+	 * Encodes the range that also none latin character work
+	 *
+	 * @param {string} range
+	 * @returns {string}
+	 * @memberof GoogleSheet
+	 */
+	encodeRange(range: string): string {
+		if (range.includes('!')) {
+			const [sheet, ranges] = range.split('!');
+			range = `${encodeURIComponent(sheet)}!${ranges}`;
+		}
+		return range;
+	}
+
+
 	/**
 	 * Clears values from a sheet
 	 *
@@ -84,9 +100,9 @@ export class GoogleSheet {
 		return response;
 	}
 
-    /**
-     * Returns the cell values
-     */
+	/**
+	 * Returns the cell values
+	 */
 	async getData(range: string, valueRenderMode: ValueRenderOption): Promise<string[][] | undefined> {
 
 		const query = {
@@ -120,7 +136,7 @@ export class GoogleSheet {
 	async spreadsheetBatchUpdate(requests: IDataObject[]) { // tslint:disable-line:no-any
 
 		const body = {
-			requests
+			requests,
 		};
 
 		const response = await googleApiRequest.call(this.executeFunctions, 'POST', `/v4/spreadsheets/${this.id}:batchUpdate`, body);
@@ -129,9 +145,9 @@ export class GoogleSheet {
 	}
 
 
-    /**
-     * Sets the cell values
-     */
+	/**
+	 * Sets the cell values
+	 */
 	async batchUpdate(updateData: ISheetUpdateData[], valueInputMode: ValueInputOption) {
 
 		const body = {
@@ -145,9 +161,9 @@ export class GoogleSheet {
 	}
 
 
-    /**
-     * Sets the cell values
-     */
+	/**
+	 * Sets the cell values
+	 */
 	async setData(range: string, data: string[][], valueInputMode: ValueInputOption) {
 
 		const body = {
@@ -161,13 +177,13 @@ export class GoogleSheet {
 	}
 
 
-    /**
-     * Appends the cell values
-     */
+	/**
+	 * Appends the cell values
+	 */
 	async appendData(range: string, data: string[][], valueInputMode: ValueInputOption) {
 
 		const body = {
-			range,
+			range: decodeURIComponent(range),
 			values: data,
 		};
 
@@ -180,9 +196,9 @@ export class GoogleSheet {
 		return response;
 	}
 
-    /**
-     * Returns the given sheet data in a structured way
-     */
+	/**
+	 * Returns the given sheet data in a structured way
+	 */
 	structureData(inputData: string[][], startRow: number, keys: string[], addEmpty?: boolean): IDataObject[] {
 		const returnData = [];
 
@@ -207,10 +223,10 @@ export class GoogleSheet {
 	}
 
 
-    /**
-     * Returns the given sheet data in a structured way using
-     * the startRow as the one with the name of the key
-     */
+	/**
+	 * Returns the given sheet data in a structured way using
+	 * the startRow as the one with the name of the key
+	 */
 	structureArrayDataByColumn(inputData: string[][], keyRow: number, dataStartRow: number): IDataObject[] {
 
 		const keys: string[] = [];
@@ -235,7 +251,7 @@ export class GoogleSheet {
 	}
 
 
-	getColumnWithOffset (startColumn: string, offset: number): string {
+	getColumnWithOffset(startColumn: string, offset: number): string {
 		const columnIndex = xlsxUtils.decode_col(startColumn) + offset;
 		return xlsxUtils.encode_col(columnIndex);
 	}
@@ -254,12 +270,14 @@ export class GoogleSheet {
 	 */
 	async updateSheetData(inputData: IDataObject[], indexKey: string, range: string, keyRowIndex: number, dataStartRowIndex: number, valueInputMode: ValueInputOption, valueRenderMode: ValueRenderOption): Promise<string[][]> {
 		// Get current data in Google Sheet
-		let rangeStart: string, rangeEnd: string;
+		let rangeStart: string, rangeEnd: string, rangeFull: string;
 		let sheet: string | undefined = undefined;
 		if (range.includes('!')) {
-			[sheet, range] = range.split('!');
+			[sheet, rangeFull] = range.split('!');
+		} else {
+			rangeFull = range;
 		}
-		[rangeStart, rangeEnd] = range.split(':');
+		[rangeStart, rangeEnd] = rangeFull.split(':');
 
 		const rangeStartSplit = rangeStart.match(/([a-zA-Z]{1,10})([0-9]{0,10})/);
 		const rangeEndSplit = rangeEnd.match(/([a-zA-Z]{1,10})([0-9]{0,10})/);
@@ -270,7 +288,7 @@ export class GoogleSheet {
 
 		const keyRowRange = `${sheet ? sheet + '!' : ''}${rangeStartSplit[1]}${dataStartRowIndex}:${rangeEndSplit[1]}${dataStartRowIndex}`;
 
-		const sheetDatakeyRow = await this.getData(keyRowRange, valueRenderMode);
+		const sheetDatakeyRow = await this.getData(this.encodeRange(keyRowRange), valueRenderMode);
 
 		if (sheetDatakeyRow === undefined) {
 			throw new Error('Could not retrieve the key row!');
@@ -290,7 +308,7 @@ export class GoogleSheet {
 		const keyColumn = this.getColumnWithOffset(rangeStartSplit[1], keyIndex);
 		const keyColumnRange = `${sheet ? sheet + '!' : ''}${keyColumn}${startRowIndex}:${keyColumn}${endRowIndex}`;
 
-		const sheetDataKeyColumn = await this.getData(keyColumnRange, valueRenderMode);
+		const sheetDataKeyColumn = await this.getData(this.encodeRange(keyColumnRange), valueRenderMode);
 
 		if (sheetDataKeyColumn === undefined) {
 			throw new Error('Could not retrieve the key column!');
@@ -303,7 +321,7 @@ export class GoogleSheet {
 		sheetDataKeyColumn.shift();
 
 		// Create an Array which all the key-values of the Google Sheet
-		const keyColumnIndexLookup = sheetDataKeyColumn.map((rowContent) => rowContent[0] );
+		const keyColumnIndexLookup = sheetDataKeyColumn.map((rowContent) => rowContent[0]);
 
 		const updateData: ISheetUpdateData[] = [];
 		let itemKey: string | number | undefined | null;
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
index 001a617fb..8096ae53b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
@@ -1,7 +1,7 @@
 
 import {
 	IExecuteFunctions,
- } from 'n8n-core';
+} from 'n8n-core';
 
 import {
 	IDataObject,
@@ -99,17 +99,17 @@ export class GoogleSheets implements INodeType {
 					{
 						name: 'Lookup',
 						value: 'lookup',
-						description: 'Look up a specific column value and return the matching row'
+						description: 'Look up a specific column value and return the matching row',
 					},
 					{
 						name: 'Read',
 						value: 'read',
-						description: 'Read data from a sheet'
+						description: 'Read data from a sheet',
 					},
 					{
 						name: 'Update',
 						value: 'update',
-						description: 'Update rows in a sheet'
+						description: 'Update rows in a sheet',
 					},
 				],
 				default: 'read',
@@ -134,7 +134,7 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					hide: {
 						operation: [
-							'delete'
+							'delete',
 						],
 					},
 				},
@@ -159,7 +159,7 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'delete'
+							'delete',
 						],
 					},
 				},
@@ -201,7 +201,7 @@ export class GoogleSheets implements INodeType {
 								default: 1,
 								description: 'Number of columns to delete.',
 							},
-						]
+						],
 					},
 					{
 						displayName: 'Rows',
@@ -239,7 +239,7 @@ export class GoogleSheets implements INodeType {
 								default: 1,
 								description: 'Number of rows to delete.',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -255,7 +255,7 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'read'
+							'read',
 						],
 					},
 				},
@@ -270,10 +270,10 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'read'
+							'read',
 						],
 						rawData: [
-							true
+							true,
 						],
 					},
 				},
@@ -290,7 +290,7 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 					},
 				},
@@ -305,10 +305,10 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 						rawData: [
-							true
+							true,
 						],
 					},
 				},
@@ -334,7 +334,7 @@ export class GoogleSheets implements INodeType {
 							'delete',
 						],
 						rawData: [
-							true
+							true,
 						],
 					},
 				},
@@ -358,7 +358,7 @@ export class GoogleSheets implements INodeType {
 							'delete',
 						],
 						rawData: [
-							true
+							true,
 						],
 					},
 				},
@@ -380,7 +380,7 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'lookup'
+							'lookup',
 						],
 					},
 				},
@@ -395,7 +395,7 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'lookup'
+							'lookup',
 						],
 					},
 				},
@@ -413,10 +413,10 @@ export class GoogleSheets implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 						rawData: [
-							false
+							false,
 						],
 					},
 				},
@@ -490,7 +490,7 @@ export class GoogleSheets implements INodeType {
 							{
 								name: 'User Entered',
 								value: 'USER_ENTERED',
-								description: 'The values will be parsed as if the user typed them into the UI. Numbers will stay as numbers, but strings may be converted to numbers, dates, etc. following the same rules that are applied when entering text into a cell via the Google Sheets UI.'
+								description: 'The values will be parsed as if the user typed them into the UI. Numbers will stay as numbers, but strings may be converted to numbers, dates, etc. following the same rules that are applied when entering text into a cell via the Google Sheets UI.',
 							},
 						],
 						default: 'RAW',
@@ -522,7 +522,7 @@ export class GoogleSheets implements INodeType {
 							{
 								name: 'Unformatted Value',
 								value: 'UNFORMATTED_VALUE',
-								description: 'Values will be calculated, but not formatted in the reply. For example, if A1 is 1.23 and A2 is =A1 and formatted as currency, then A2 would return the number 1.23.'
+								description: 'Values will be calculated, but not formatted in the reply. For example, if A1 is 1.23 and A2 is =A1 and formatted as currency, then A2 would return the number 1.23.',
 							},
 						],
 						default: 'UNFORMATTED_VALUE',
@@ -538,7 +538,7 @@ export class GoogleSheets implements INodeType {
 									'update',
 								],
 								'/rawData': [
-									false
+									false,
 								],
 							},
 						},
@@ -556,7 +556,7 @@ export class GoogleSheets implements INodeType {
 							{
 								name: 'Unformatted Value',
 								value: 'UNFORMATTED_VALUE',
-								description: 'Values will be calculated, but not formatted in the reply. For example, if A1 is 1.23 and A2 is =A1 and formatted as currency, then A2 would return the number 1.23.'
+								description: 'Values will be calculated, but not formatted in the reply. For example, if A1 is 1.23 and A2 is =A1 and formatted as currency, then A2 would return the number 1.23.',
 							},
 						],
 						default: 'UNFORMATTED_VALUE',
@@ -564,7 +564,7 @@ export class GoogleSheets implements INodeType {
 					},
 
 				],
-			}
+			},
 
 		],
 	};
@@ -632,7 +632,7 @@ export class GoogleSheets implements INodeType {
 			});
 
 			// Convert data into array format
-			const data = await sheet.appendSheetData(setData, range, keyRow, valueInputMode);
+			const data = await sheet.appendSheetData(setData, sheet.encodeRange(range), keyRow, valueInputMode);
 
 			// TODO: Should add this data somewhere
 			// TODO: Should have something like add metadata which does not get passed through
@@ -643,7 +643,7 @@ export class GoogleSheets implements INodeType {
 			//         clear
 			// ----------------------------------
 
-			await sheet.clearData(range);
+			await sheet.clearData(sheet.encodeRange(range));
 
 			const items = this.getInputData();
 			return this.prepareOutputData(items);
@@ -671,8 +671,8 @@ export class GoogleSheets implements INodeType {
 									dimension: deletePropertyToDimensions[propertyName] as string,
 									startIndex: range.startIndex,
 									endIndex: parseInt(range.startIndex.toString(), 10) + parseInt(range.amount.toString(), 10),
-								}
-							}
+								},
+							},
 						});
 					});
 				}
@@ -687,7 +687,7 @@ export class GoogleSheets implements INodeType {
 			//         lookup
 			// ----------------------------------
 
-			const sheetData = await sheet.getData(range, valueRenderMode);
+			const sheetData = await sheet.getData(sheet.encodeRange(range), valueRenderMode);
 
 			if (sheetData === undefined) {
 				return [];
@@ -722,7 +722,7 @@ export class GoogleSheets implements INodeType {
 
 			const rawData = this.getNodeParameter('rawData', 0) as boolean;
 
-			const sheetData = await sheet.getData(range, valueRenderMode);
+			const sheetData = await sheet.getData(sheet.encodeRange(range), valueRenderMode);
 
 			let returnData: IDataObject[];
 			if (!sheetData) {
@@ -732,7 +732,7 @@ export class GoogleSheets implements INodeType {
 				returnData = [
 					{
 						[dataProperty]: sheetData,
-					}
+					},
 				];
 			} else {
 				const dataStartRow = parseInt(this.getNodeParameter('dataStartRow', 0) as string, 10);
diff --git a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
index 55a690ad7..e3dffba25 100644
--- a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
@@ -19,17 +19,17 @@ export async function googleApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
-	headers: IDataObject = {}
+	headers: IDataObject = {},
 ): Promise<any> { // tslint:disable-line:no-any
 	const options: OptionsWithUri = {
 		headers: {
-			'Content-Type': 'application/json'
+			'Content-Type': 'application/json',
 		},
 		method,
 		body,
 		qs,
 		uri: uri || `https://www.googleapis.com${resource}`,
-		json: true
+		json: true,
 	};
 
 	try {
@@ -43,7 +43,7 @@ export async function googleApiRequest(
 		return await this.helpers.requestOAuth2.call(
 			this,
 			'googleTasksOAuth2Api',
-			options
+			options,
 		);
 	} catch (error) {
 		if (error.response && error.response.body && error.response.body.error) {
@@ -53,7 +53,7 @@ export async function googleApiRequest(
 			errors = errors.map((e: IDataObject) => e.message);
 			// Try to return the error prettier
 			throw new Error(
-				`Google Tasks error response [${error.statusCode}]: ${errors.join('|')}`
+				`Google Tasks error response [${error.statusCode}]: ${errors.join('|')}`,
 			);
 		}
 		throw error;
@@ -66,7 +66,7 @@ export async function googleApiRequestAllItems(
 	method: string,
 	endpoint: string,
 	body: IDataObject = {},
-	query: IDataObject = {}
+	query: IDataObject = {},
 ): Promise<any> { // tslint:disable-line:no-any
 	const returnData: IDataObject[] = [];
 
@@ -79,7 +79,7 @@ export async function googleApiRequestAllItems(
 			method,
 			endpoint,
 			body,
-			query
+			query,
 		);
 		query.pageToken = responseData['nextPageToken'];
 		returnData.push.apply(returnData, responseData[propertyName]);
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index 603bc1af5..ae711478c 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -17,8 +17,8 @@ import {
 } from './GenericFunctions';
 
 import {
-	taskOperations,
 	taskFields,
+	taskOperations,
 } from './TaskDescription';
 
 export class GoogleTasks implements INodeType {
@@ -32,15 +32,15 @@ export class GoogleTasks implements INodeType {
 		description: 'Consume Google Tasks API.',
 		defaults: {
 			name: 'Google Tasks',
-			color: '#3E87E4'
+			color: '#3E87E4',
 		},
 		inputs: ['main'],
 		outputs: ['main'],
 		credentials: [
 			{
 				name: 'googleTasksOAuth2Api',
-				required: true
-			}
+				required: true,
+			},
 		],
 		properties: [
 			{
@@ -50,41 +50,41 @@ export class GoogleTasks implements INodeType {
 				options: [
 					{
 						name: 'Task',
-						value: 'task'
-					}
+						value: 'task',
+					},
 				],
 				default: 'task',
-				description: 'The resource to operate on.'
+				description: 'The resource to operate on.',
 			},
 			...taskOperations,
-			...taskFields
-		]
+			...taskFields,
+		],
 	};
 	methods = {
 		loadOptions: {
 			// Get all the tasklists to display them to user so that he can select them easily
 
 			async getTasks(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const tasks = await googleApiRequestAllItems.call(
 					this,
 					'items',
 					'GET',
-					'/tasks/v1/users/@me/lists'
+					'/tasks/v1/users/@me/lists',
 				);
 				for (const task of tasks) {
 					const taskName = task.title;
 					const taskId = task.id;
 					returnData.push({
 						name: taskName,
-						value: taskId
+						value: taskId,
 					});
 				}
 				return returnData;
-			}
-		}
+			},
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -105,7 +105,7 @@ export class GoogleTasks implements INodeType {
 					body.title = this.getNodeParameter('title', i) as string;
 					const additionalFields = this.getNodeParameter(
 						'additionalFields',
-						i
+						i,
 					) as IDataObject;
 
 					if (additionalFields.parent) {
@@ -139,7 +139,7 @@ export class GoogleTasks implements INodeType {
 						'POST',
 						`/tasks/v1/lists/${taskId}/tasks`,
 						body,
-						qs
+						qs,
 					);
 				}
 				if (operation === 'delete') {
@@ -151,7 +151,7 @@ export class GoogleTasks implements INodeType {
 						this,
 						'DELETE',
 						`/tasks/v1/lists/${taskListId}/tasks/${taskId}`,
-						{}
+						{},
 					);
 					responseData = { success: true };
 				}
@@ -164,7 +164,7 @@ export class GoogleTasks implements INodeType {
 						'GET',
 						`/tasks/v1/lists/${taskListId}/tasks/${taskId}`,
 						{},
-						qs
+						qs,
 					);
 				}
 				if (operation === 'getAll') {
@@ -173,7 +173,7 @@ export class GoogleTasks implements INodeType {
 					const taskListId = this.getNodeParameter('task', i) as string;
 					const options = this.getNodeParameter(
 						'additionalFields',
-						i
+						i,
 					) as IDataObject;
 					if (options.completedMax) {
 						qs.completedMax = options.completedMax as string;
@@ -207,7 +207,7 @@ export class GoogleTasks implements INodeType {
 							'GET',
 							`/tasks/v1/lists/${taskListId}/tasks`,
 							{},
-							qs
+							qs,
 						);
 					} else {
 						qs.maxResults = this.getNodeParameter('limit', i) as number;
@@ -216,7 +216,7 @@ export class GoogleTasks implements INodeType {
 							'GET',
 							`/tasks/v1/lists/${taskListId}/tasks`,
 							{},
-							qs
+							qs,
 						);
 						responseData = responseData.items;
 					}
@@ -228,7 +228,7 @@ export class GoogleTasks implements INodeType {
 					const taskId = this.getNodeParameter('taskId', i) as string;
 					const updateFields = this.getNodeParameter(
 						'updateFields',
-						i
+						i,
 					) as IDataObject;
 
 					if (updateFields.previous) {
@@ -264,7 +264,7 @@ export class GoogleTasks implements INodeType {
 						'PATCH',
 						`/tasks/v1/lists/${taskListId}/tasks/${taskId}`,
 						body,
-						qs
+						qs,
 					);
 				}
 			}
diff --git a/packages/nodes-base/nodes/Google/Task/TaskDescription.ts b/packages/nodes-base/nodes/Google/Task/TaskDescription.ts
index 3300572f2..aaf2892ab 100644
--- a/packages/nodes-base/nodes/Google/Task/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Google/Task/TaskDescription.ts
@@ -39,11 +39,11 @@ export const taskOperations = [
 				name: 'Update',
 				value: 'update',
 				description: 'Update a task',
-			}
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
-	}
+	},
 ] as INodeProperties[];
 
 export const taskFields = [
@@ -91,7 +91,7 @@ export const taskFields = [
 				resource: [
 					'task',
 				],
-			}
+			},
 		},
 		options: [
 			{
@@ -148,7 +148,7 @@ export const taskFields = [
 					{
 						name: 'Completed',
 						value: 'completed',
-					}
+					},
 				],
 				default: '',
 				description: 'Current status of the task.',
@@ -215,7 +215,7 @@ export const taskFields = [
 				resource: [
 					'task',
 				],
-			}
+			},
 		},
 		default: '',
 	},
@@ -295,7 +295,7 @@ export const taskFields = [
 		},
 		typeOptions: {
 			minValue: 1,
-			maxValue: 100
+			maxValue: 100,
 		},
 		default: 20,
 		description: 'How many results to return.',
@@ -373,7 +373,7 @@ export const taskFields = [
 				default: '',
 				description: 'Lower bound for a task last modification time (as a RFC 3339 timestamp) to filter by.',
 			},
-		]
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 task:update                                */
@@ -429,7 +429,7 @@ export const taskFields = [
 				resource: [
 					'task',
 				],
-			}
+			},
 		},
 		options: [
 			{
@@ -476,7 +476,7 @@ export const taskFields = [
 					{
 						name: 'Completed',
 						value: 'completed',
-					}
+					},
 				],
 				default: '',
 				description: 'Current status of the task.',
diff --git a/packages/nodes-base/nodes/Google/Task/googleTasks.png b/packages/nodes-base/nodes/Google/Task/googleTasks.png
index bbc31280a..77d9a0835 100644
Binary files a/packages/nodes-base/nodes/Google/Task/googleTasks.png and b/packages/nodes-base/nodes/Google/Task/googleTasks.png differ
diff --git a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
new file mode 100644
index 000000000..11ccf4d48
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
@@ -0,0 +1,128 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+import * as moment from 'moment-timezone';
+
+import * as jwt from 'jsonwebtoken';
+
+export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+	const authenticationMethod = this.getNodeParameter('authentication', 0, 'serviceAccount') as string;
+	const options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://translation.googleapis.com${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+
+		if (authenticationMethod === 'serviceAccount') {
+			const credentials = this.getCredentials('googleApi');
+
+			if (credentials === undefined) {
+				throw new Error('No credentials got returned!');
+			}
+
+			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
+
+			options.headers!.Authorization = `Bearer ${access_token}`;
+			//@ts-ignore
+			return await this.helpers.request(options);
+		} else {
+			//@ts-ignore
+			return await this.helpers.requestOAuth2.call(this, 'googleTranslateOAuth2Api', options);
+		}
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.message) {
+			// Try to return the error prettier
+			throw new Error(`Google Translate error response [${error.statusCode}]: ${error.response.body.message}`);
+		}
+		throw error;
+	}
+}
+
+export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.maxResults = 100;
+
+	do {
+		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
+		query.pageToken = responseData['nextPageToken'];
+		returnData.push.apply(returnData, responseData[propertyName]);
+	} while (
+		responseData['nextPageToken'] !== undefined &&
+		responseData['nextPageToken'] !== ''
+	);
+
+	return returnData;
+}
+
+function getAccessToken(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, credentials: IDataObject): Promise<IDataObject> {
+	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
+
+	const scopes = [
+		'https://www.googleapis.com/auth/cloud-translation',
+		'https://www.googleapis.com/auth/cloud-platform',
+	];
+
+	const now = moment().unix();
+
+	const signature = jwt.sign(
+		{
+			'iss': credentials.email as string,
+			'sub': credentials.email as string,
+			'scope': scopes.join(' '),
+			'aud': `https://oauth2.googleapis.com/token`,
+			'iat': now,
+			'exp': now + 3600,
+		},
+		credentials.privateKey as string,
+		{
+			algorithm: 'RS256',
+			header: {
+				'kid': credentials.privateKey as string,
+				'typ': 'JWT',
+				'alg': 'RS256',
+			},
+		},
+	);
+
+	const options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+		method: 'POST',
+		form: {
+			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+			assertion: signature,
+		},
+		uri: 'https://oauth2.googleapis.com/token',
+		json: true,
+	};
+
+	//@ts-ignore
+	return this.helpers.request(options);
+}
diff --git a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
new file mode 100644
index 000000000..724bce094
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
@@ -0,0 +1,194 @@
+
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	googleApiRequest,
+} from './GenericFunctions';
+
+export interface IGoogleAuthCredentials {
+	email: string;
+	privateKey: string;
+}
+
+export class GoogleTranslate implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Google Translate',
+		name: 'googleTranslate',
+		icon: 'file:googletranslate.png',
+		group: ['input', 'output'],
+		version: 1,
+		description: 'Translate data using Google Translate',
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		defaults: {
+			name: 'Google Translate',
+			color: '#5390f5',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'googleApi',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'serviceAccount',
+						],
+					},
+				},
+			},
+			{
+				name: 'googleTranslateOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
+			},
+		],
+		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Service Account',
+						value: 'serviceAccount',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'serviceAccount',
+			},
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Language',
+						value: 'language',
+					},
+				],
+				default: 'language',
+				description: 'The operation to perform',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'language',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Translate',
+						value: 'translate',
+						description: 'Translate data',
+					},
+				],
+				default: 'translate',
+				description: 'The operation to perform',
+			},
+			// ----------------------------------
+			//         All
+			// ----------------------------------
+			{
+				displayName: 'Text',
+				name: 'text',
+				type: 'string',
+				default: '',
+				description: 'The input text to translate',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'translate',
+						],
+					},
+				},
+			},
+			{
+				displayName: 'Translate To',
+				name: 'translateTo',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getLanguages',
+				},
+				default: '',
+				description: 'The language to use for translation of the input text, set to one of the<br/> language codes listed in <a href="https://cloud.google.com/translate/docs/languages">Language Support</a>',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'translate',
+						],
+					},
+				},
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getLanguages(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data: { languages } } = await googleApiRequest.call(
+					this,
+					'GET',
+					'/language/translate/v2/languages',
+				);
+				for (const language of languages) {
+					returnData.push({
+						name: language.language.toUpperCase(),
+						value: language.language,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const length = items.length as unknown as number;
+
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		const responseData = [];
+		for (let i = 0; i < length; i++) {
+			if (resource === 'language') {
+				if (operation === 'translate') {
+					const text = this.getNodeParameter('text', i) as string;
+					const translateTo = this.getNodeParameter('translateTo', i) as string;
+
+					const response = await googleApiRequest.call(this, 'POST', `/language/translate/v2`, { q: text, target: translateTo });
+					responseData.push(response.data.translations[0]);
+				}
+			}
+		}
+		return [this.helpers.returnJsonArray(responseData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Google/Translate/googletranslate.png b/packages/nodes-base/nodes/Google/Translate/googletranslate.png
new file mode 100644
index 000000000..ccc593b1e
Binary files /dev/null and b/packages/nodes-base/nodes/Google/Translate/googletranslate.png differ
diff --git a/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
index 4c6a5188f..cdd660872 100644
--- a/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
@@ -34,11 +34,11 @@ export const channelOperations = [
 				name: 'Upload Banner',
 				value: 'uploadBanner',
 				description: 'Upload a channel banner',
-			}
+			},
 		],
 		default: 'getAll',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const channelFields = [
@@ -215,7 +215,7 @@ export const channelFields = [
 				name: 'h1',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getLanguages'
+					loadOptionsMethod: 'getLanguages',
 				},
 				default: '',
 				description: `The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports.`,
diff --git a/packages/nodes-base/nodes/Google/YouTube/CountryCodes.ts b/packages/nodes-base/nodes/Google/YouTube/CountryCodes.ts
index 3c41a76c7..4c37abc6b 100644
--- a/packages/nodes-base/nodes/Google/YouTube/CountryCodes.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/CountryCodes.ts
@@ -3,291 +3,291 @@ export const countriesCodes = [
 		'name': 'Afghanistan',
 		'alpha2': 'AF',
 		'alpha3': 'AFG',
-		'numeric': '004'
+		'numeric': '004',
 	},
 	{
 		'name': 'Åland Islands',
 		'alpha2': 'AX',
 		'alpha3': 'ALA',
 		'numeric': '248',
-		'altName': 'Aland Islands'
+		'altName': 'Aland Islands',
 	},
 	{
 		'name': 'Albania',
 		'alpha2': 'AL',
 		'alpha3': 'ALB',
-		'numeric': '008'
+		'numeric': '008',
 	},
 	{
 		'name': 'Algeria',
 		'alpha2': 'DZ',
 		'alpha3': 'DZA',
-		'numeric': '012'
+		'numeric': '012',
 	},
 	{
 		'name': 'American Samoa',
 		'alpha2': 'AS',
 		'alpha3': 'ASM',
-		'numeric': '016'
+		'numeric': '016',
 	},
 	{
 		'name': 'Andorra',
 		'alpha2': 'AD',
 		'alpha3': 'AND',
-		'numeric': '020'
+		'numeric': '020',
 	},
 	{
 		'name': 'Angola',
 		'alpha2': 'AO',
 		'alpha3': 'AGO',
-		'numeric': '024'
+		'numeric': '024',
 	},
 	{
 		'name': 'Anguilla',
 		'alpha2': 'AI',
 		'alpha3': 'AIA',
-		'numeric': '660'
+		'numeric': '660',
 	},
 	{
 		'name': 'Antarctica',
 		'alpha2': 'AQ',
 		'alpha3': 'ATA',
-		'numeric': '010'
+		'numeric': '010',
 	},
 	{
 		'name': 'Antigua and Barbuda',
 		'alpha2': 'AG',
 		'alpha3': 'ATG',
-		'numeric': '028'
+		'numeric': '028',
 	},
 	{
 		'name': 'Argentina',
 		'alpha2': 'AR',
 		'alpha3': 'ARG',
-		'numeric': '032'
+		'numeric': '032',
 	},
 	{
 		'name': 'Armenia',
 		'alpha2': 'AM',
 		'alpha3': 'ARM',
-		'numeric': '051'
+		'numeric': '051',
 	},
 	{
 		'name': 'Aruba',
 		'alpha2': 'AW',
 		'alpha3': 'ABW',
-		'numeric': '533'
+		'numeric': '533',
 	},
 	{
 		'name': 'Australia',
 		'alpha2': 'AU',
 		'alpha3': 'AUS',
-		'numeric': '036'
+		'numeric': '036',
 	},
 	{
 		'name': 'Austria',
 		'alpha2': 'AT',
 		'alpha3': 'AUT',
-		'numeric': '040'
+		'numeric': '040',
 	},
 	{
 		'name': 'Azerbaijan',
 		'alpha2': 'AZ',
 		'alpha3': 'AZE',
-		'numeric': '031'
+		'numeric': '031',
 	},
 	{
 		'name': 'Bahamas (the)',
 		'alpha2': 'BS',
 		'alpha3': 'BHS',
 		'numeric': '044',
-		'altName': 'Bahamas'
+		'altName': 'Bahamas',
 	},
 	{
 		'name': 'Bahrain',
 		'alpha2': 'BH',
 		'alpha3': 'BHR',
-		'numeric': '048'
+		'numeric': '048',
 	},
 	{
 		'name': 'Bangladesh',
 		'alpha2': 'BD',
 		'alpha3': 'BGD',
-		'numeric': '050'
+		'numeric': '050',
 	},
 	{
 		'name': 'Barbados',
 		'alpha2': 'BB',
 		'alpha3': 'BRB',
-		'numeric': '052'
+		'numeric': '052',
 	},
 	{
 		'name': 'Belarus',
 		'alpha2': 'BY',
 		'alpha3': 'BLR',
-		'numeric': '112'
+		'numeric': '112',
 	},
 	{
 		'name': 'Belgium',
 		'alpha2': 'BE',
 		'alpha3': 'BEL',
-		'numeric': '056'
+		'numeric': '056',
 	},
 	{
 		'name': 'Belize',
 		'alpha2': 'BZ',
 		'alpha3': 'BLZ',
-		'numeric': '084'
+		'numeric': '084',
 	},
 	{
 		'name': 'Benin',
 		'alpha2': 'BJ',
 		'alpha3': 'BEN',
-		'numeric': '204'
+		'numeric': '204',
 	},
 	{
 		'name': 'Bermuda',
 		'alpha2': 'BM',
 		'alpha3': 'BMU',
-		'numeric': '060'
+		'numeric': '060',
 	},
 	{
 		'name': 'Bhutan',
 		'alpha2': 'BT',
 		'alpha3': 'BTN',
-		'numeric': '064'
+		'numeric': '064',
 	},
 	{
 		'name': 'Bolivia (Plurinational State of)',
 		'alpha2': 'BO',
 		'alpha3': 'BOL',
 		'numeric': '068',
-		'altName': 'Bolivia'
+		'altName': 'Bolivia',
 	},
 	{
 		'name': 'Bonaire, Sint Eustatius and Saba',
 		'alpha2': 'BQ',
 		'alpha3': 'BES',
-		'numeric': '535'
+		'numeric': '535',
 	},
 	{
 		'name': 'Bosnia and Herzegovina',
 		'alpha2': 'BA',
 		'alpha3': 'BIH',
-		'numeric': '070'
+		'numeric': '070',
 	},
 	{
 		'name': 'Botswana',
 		'alpha2': 'BW',
 		'alpha3': 'BWA',
-		'numeric': '072'
+		'numeric': '072',
 	},
 	{
 		'name': 'Bouvet Island',
 		'alpha2': 'BV',
 		'alpha3': 'BVT',
-		'numeric': '074'
+		'numeric': '074',
 	},
 	{
 		'name': 'Brazil',
 		'alpha2': 'BR',
 		'alpha3': 'BRA',
-		'numeric': '076'
+		'numeric': '076',
 	},
 	{
 		'name': 'British Indian Ocean Territory (the)',
 		'alpha2': 'IO',
 		'alpha3': 'IOT',
 		'numeric': '086',
-		'altName': 'British Indian Ocean Territory'
+		'altName': 'British Indian Ocean Territory',
 	},
 	{
 		'name': 'Brunei Darussalam',
 		'alpha2': 'BN',
 		'alpha3': 'BRN',
 		'numeric': '096',
-		'shortName': 'Brunei'
+		'shortName': 'Brunei',
 	},
 	{
 		'name': 'Bulgaria',
 		'alpha2': 'BG',
 		'alpha3': 'BGR',
-		'numeric': '100'
+		'numeric': '100',
 	},
 	{
 		'name': 'Burkina Faso',
 		'alpha2': 'BF',
 		'alpha3': 'BFA',
-		'numeric': '854'
+		'numeric': '854',
 	},
 	{
 		'name': 'Burundi',
 		'alpha2': 'BI',
 		'alpha3': 'BDI',
-		'numeric': '108'
+		'numeric': '108',
 	},
 	{
 		'name': 'Cabo Verde',
 		'alpha2': 'CV',
 		'alpha3': 'CPV',
 		'numeric': '132',
-		'altName': 'Cape Verde'
+		'altName': 'Cape Verde',
 	},
 	{
 		'name': 'Cambodia',
 		'alpha2': 'KH',
 		'alpha3': 'KHM',
-		'numeric': '116'
+		'numeric': '116',
 	},
 	{
 		'name': 'Cameroon',
 		'alpha2': 'CM',
 		'alpha3': 'CMR',
-		'numeric': '120'
+		'numeric': '120',
 	},
 	{
 		'name': 'Canada',
 		'alpha2': 'CA',
 		'alpha3': 'CAN',
-		'numeric': '124'
+		'numeric': '124',
 	},
 	{
 		'name': 'Cayman Islands (the)',
 		'alpha2': 'KY',
 		'alpha3': 'CYM',
 		'numeric': '136',
-		'altName': 'Cayman Islands'
+		'altName': 'Cayman Islands',
 	},
 	{
 		'name': 'Central African Republic (the)',
 		'alpha2': 'CF',
 		'alpha3': 'CAF',
 		'numeric': '140',
-		'altName': 'Central African Republic'
+		'altName': 'Central African Republic',
 	},
 	{
 		'name': 'Chad',
 		'alpha2': 'TD',
 		'alpha3': 'TCD',
-		'numeric': '148'
+		'numeric': '148',
 	},
 	{
 		'name': 'Chile',
 		'alpha2': 'CL',
 		'alpha3': 'CHL',
-		'numeric': '152'
+		'numeric': '152',
 	},
 	{
 		'name': 'China',
 		'alpha2': 'CN',
 		'alpha3': 'CHN',
-		'numeric': '156'
+		'numeric': '156',
 	},
 	{
 		'name': 'Christmas Island',
 		'alpha2': 'CX',
 		'alpha3': 'CXR',
-		'numeric': '162'
+		'numeric': '162',
 	},
 	{
 		'name': 'Cocos (Keeling) Islands (the)',
@@ -295,20 +295,20 @@ export const countriesCodes = [
 		'alpha3': 'CCK',
 		'numeric': '166',
 		'altName': 'Cocos (Keeling) Islands',
-		'shortName': 'Cocos Islands'
+		'shortName': 'Cocos Islands',
 	},
 	{
 		'name': 'Colombia',
 		'alpha2': 'CO',
 		'alpha3': 'COL',
-		'numeric': '170'
+		'numeric': '170',
 	},
 	{
 		'name': 'Comoros (the)',
 		'alpha2': 'KM',
 		'alpha3': 'COM',
 		'numeric': '174',
-		'altName': 'Comoros'
+		'altName': 'Comoros',
 	},
 	{
 		'name': 'Congo (the Democratic Republic of the)',
@@ -316,7 +316,7 @@ export const countriesCodes = [
 		'alpha3': 'COD',
 		'numeric': '180',
 		'altName': 'Congo, (Kinshasa)',
-		'shortName': 'Democratic Republic of the Congo'
+		'shortName': 'Democratic Republic of the Congo',
 	},
 	{
 		'name': 'Congo (the)',
@@ -324,126 +324,126 @@ export const countriesCodes = [
 		'alpha3': 'COG',
 		'numeric': '178',
 		'altName': 'Congo (Brazzaville)',
-		'shortName': 'Republic of the Congo'
+		'shortName': 'Republic of the Congo',
 	},
 	{
 		'name': 'Cook Islands (the)',
 		'alpha2': 'CK',
 		'alpha3': 'COK',
 		'numeric': '184',
-		'altName': 'Cook Islands'
+		'altName': 'Cook Islands',
 	},
 	{
 		'name': 'Costa Rica',
 		'alpha2': 'CR',
 		'alpha3': 'CRI',
-		'numeric': '188'
+		'numeric': '188',
 	},
 	{
 		'name': 'Côte d\'Ivoire',
 		'alpha2': 'CI',
 		'alpha3': 'CIV',
 		'numeric': '384',
-		'shortName': 'Ivory Coast'
+		'shortName': 'Ivory Coast',
 	},
 	{
 		'name': 'Croatia',
 		'alpha2': 'HR',
 		'alpha3': 'HRV',
-		'numeric': '191'
+		'numeric': '191',
 	},
 	{
 		'name': 'Cuba',
 		'alpha2': 'CU',
 		'alpha3': 'CUB',
-		'numeric': '192'
+		'numeric': '192',
 	},
 	{
 		'name': 'Curaçao',
 		'alpha2': 'CW',
 		'alpha3': 'CUW',
 		'numeric': '531',
-		'shortName': 'Curacao'
+		'shortName': 'Curacao',
 	},
 	{
 		'name': 'Cyprus',
 		'alpha2': 'CY',
 		'alpha3': 'CYP',
-		'numeric': '196'
+		'numeric': '196',
 	},
 	{
 		'name': 'Czechia',
 		'alpha2': 'CZ',
 		'alpha3': 'CZE',
 		'numeric': '203',
-		'altName': 'Czech Republic'
+		'altName': 'Czech Republic',
 	},
 	{
 		'name': 'Denmark',
 		'alpha2': 'DK',
 		'alpha3': 'DNK',
-		'numeric': '208'
+		'numeric': '208',
 	},
 	{
 		'name': 'Djibouti',
 		'alpha2': 'DJ',
 		'alpha3': 'DJI',
-		'numeric': '262'
+		'numeric': '262',
 	},
 	{
 		'name': 'Dominica',
 		'alpha2': 'DM',
 		'alpha3': 'DMA',
-		'numeric': '212'
+		'numeric': '212',
 	},
 	{
 		'name': 'Dominican Republic (the)',
 		'alpha2': 'DO',
 		'alpha3': 'DOM',
 		'numeric': '214',
-		'altName': 'Dominican Republic'
+		'altName': 'Dominican Republic',
 	},
 	{
 		'name': 'Ecuador',
 		'alpha2': 'EC',
 		'alpha3': 'ECU',
-		'numeric': '218'
+		'numeric': '218',
 	},
 	{
 		'name': 'Egypt',
 		'alpha2': 'EG',
 		'alpha3': 'EGY',
-		'numeric': '818'
+		'numeric': '818',
 	},
 	{
 		'name': 'El Salvador',
 		'alpha2': 'SV',
 		'alpha3': 'SLV',
-		'numeric': '222'
+		'numeric': '222',
 	},
 	{
 		'name': 'Equatorial Guinea',
 		'alpha2': 'GQ',
 		'alpha3': 'GNQ',
-		'numeric': '226'
+		'numeric': '226',
 	},
 	{
 		'name': 'Eritrea',
 		'alpha2': 'ER',
 		'alpha3': 'ERI',
-		'numeric': '232'
+		'numeric': '232',
 	},
 	{
 		'name': 'Estonia',
 		'alpha2': 'EE',
 		'alpha3': 'EST',
-		'numeric': '233'
+		'numeric': '233',
 	},
 	{
 		'name': 'Ethiopia',
 		'alpha2': 'ET',
 		'alpha3': 'ETH',
-		'numeric': '231'
+		'numeric': '231',
 	},
 	{
 		'name': 'Falkland Islands (the) [Malvinas]',
@@ -451,161 +451,161 @@ export const countriesCodes = [
 		'alpha3': 'FLK',
 		'numeric': '238',
 		'altName': 'Falkland Islands (Malvinas)',
-		'shortName': 'Falkland Islands'
+		'shortName': 'Falkland Islands',
 	},
 	{
 		'name': 'Faroe Islands (the)',
 		'alpha2': 'FO',
 		'alpha3': 'FRO',
 		'numeric': '234',
-		'altName': 'Faroe Islands'
+		'altName': 'Faroe Islands',
 	},
 	{
 		'name': 'Fiji',
 		'alpha2': 'FJ',
 		'alpha3': 'FJI',
-		'numeric': '242'
+		'numeric': '242',
 	},
 	{
 		'name': 'Finland',
 		'alpha2': 'FI',
 		'alpha3': 'FIN',
-		'numeric': '246'
+		'numeric': '246',
 	},
 	{
 		'name': 'France',
 		'alpha2': 'FR',
 		'alpha3': 'FRA',
-		'numeric': '250'
+		'numeric': '250',
 	},
 	{
 		'name': 'French Guiana',
 		'alpha2': 'GF',
 		'alpha3': 'GUF',
-		'numeric': '254'
+		'numeric': '254',
 	},
 	{
 		'name': 'French Polynesia',
 		'alpha2': 'PF',
 		'alpha3': 'PYF',
-		'numeric': '258'
+		'numeric': '258',
 	},
 	{
 		'name': 'French Southern Territories (the)',
 		'alpha2': 'TF',
 		'alpha3': 'ATF',
 		'numeric': '260',
-		'altName': 'French Southern Territories'
+		'altName': 'French Southern Territories',
 	},
 	{
 		'name': 'Gabon',
 		'alpha2': 'GA',
 		'alpha3': 'GAB',
-		'numeric': '266'
+		'numeric': '266',
 	},
 	{
 		'name': 'Gambia (the)',
 		'alpha2': 'GM',
 		'alpha3': 'GMB',
 		'numeric': '270',
-		'altName': 'Gambia'
+		'altName': 'Gambia',
 	},
 	{
 		'name': 'Georgia',
 		'alpha2': 'GE',
 		'alpha3': 'GEO',
-		'numeric': '268'
+		'numeric': '268',
 	},
 	{
 		'name': 'Germany',
 		'alpha2': 'DE',
 		'alpha3': 'DEU',
-		'numeric': '276'
+		'numeric': '276',
 	},
 	{
 		'name': 'Ghana',
 		'alpha2': 'GH',
 		'alpha3': 'GHA',
-		'numeric': '288'
+		'numeric': '288',
 	},
 	{
 		'name': 'Gibraltar',
 		'alpha2': 'GI',
 		'alpha3': 'GIB',
-		'numeric': '292'
+		'numeric': '292',
 	},
 	{
 		'name': 'Greece',
 		'alpha2': 'GR',
 		'alpha3': 'GRC',
-		'numeric': '300'
+		'numeric': '300',
 	},
 	{
 		'name': 'Greenland',
 		'alpha2': 'GL',
 		'alpha3': 'GRL',
-		'numeric': '304'
+		'numeric': '304',
 	},
 	{
 		'name': 'Grenada',
 		'alpha2': 'GD',
 		'alpha3': 'GRD',
-		'numeric': '308'
+		'numeric': '308',
 	},
 	{
 		'name': 'Guadeloupe',
 		'alpha2': 'GP',
 		'alpha3': 'GLP',
-		'numeric': '312'
+		'numeric': '312',
 	},
 	{
 		'name': 'Guam',
 		'alpha2': 'GU',
 		'alpha3': 'GUM',
-		'numeric': '316'
+		'numeric': '316',
 	},
 	{
 		'name': 'Guatemala',
 		'alpha2': 'GT',
 		'alpha3': 'GTM',
-		'numeric': '320'
+		'numeric': '320',
 	},
 	{
 		'name': 'Guernsey',
 		'alpha2': 'GG',
 		'alpha3': 'GGY',
-		'numeric': '831'
+		'numeric': '831',
 	},
 	{
 		'name': 'Guinea',
 		'alpha2': 'GN',
 		'alpha3': 'GIN',
-		'numeric': '324'
+		'numeric': '324',
 	},
 	{
 		'name': 'Guinea-Bissau',
 		'alpha2': 'GW',
 		'alpha3': 'GNB',
-		'numeric': '624'
+		'numeric': '624',
 	},
 	{
 		'name': 'Guyana',
 		'alpha2': 'GY',
 		'alpha3': 'GUY',
-		'numeric': '328'
+		'numeric': '328',
 	},
 	{
 		'name': 'Haiti',
 		'alpha2': 'HT',
 		'alpha3': 'HTI',
-		'numeric': '332'
+		'numeric': '332',
 	},
 	{
 		'name': 'Heard Island and McDonald Islands',
 		'alpha2': 'HM',
 		'alpha3': 'HMD',
 		'numeric': '334',
-		'altName': 'Heard and Mcdonald Islands'
+		'altName': 'Heard and Mcdonald Islands',
 	},
 	{
 		'name': 'Holy See (the)',
@@ -613,44 +613,44 @@ export const countriesCodes = [
 		'alpha3': 'VAT',
 		'numeric': '336',
 		'altName': 'Holy See (Vatican City State)',
-		'shortName': 'Vatican'
+		'shortName': 'Vatican',
 	},
 	{
 		'name': 'Honduras',
 		'alpha2': 'HN',
 		'alpha3': 'HND',
-		'numeric': '340'
+		'numeric': '340',
 	},
 	{
 		'name': 'Hong Kong',
 		'alpha2': 'HK',
 		'alpha3': 'HKG',
 		'numeric': '344',
-		'altName': 'Hong Kong, SAR China'
+		'altName': 'Hong Kong, SAR China',
 	},
 	{
 		'name': 'Hungary',
 		'alpha2': 'HU',
 		'alpha3': 'HUN',
-		'numeric': '348'
+		'numeric': '348',
 	},
 	{
 		'name': 'Iceland',
 		'alpha2': 'IS',
 		'alpha3': 'ISL',
-		'numeric': '352'
+		'numeric': '352',
 	},
 	{
 		'name': 'India',
 		'alpha2': 'IN',
 		'alpha3': 'IND',
-		'numeric': '356'
+		'numeric': '356',
 	},
 	{
 		'name': 'Indonesia',
 		'alpha2': 'ID',
 		'alpha3': 'IDN',
-		'numeric': '360'
+		'numeric': '360',
 	},
 	{
 		'name': 'Iran (Islamic Republic of)',
@@ -658,79 +658,79 @@ export const countriesCodes = [
 		'alpha3': 'IRN',
 		'numeric': '364',
 		'altName': 'Iran, Islamic Republic of',
-		'shortName': 'Iran'
+		'shortName': 'Iran',
 	},
 	{
 		'name': 'Iraq',
 		'alpha2': 'IQ',
 		'alpha3': 'IRQ',
-		'numeric': '368'
+		'numeric': '368',
 	},
 	{
 		'name': 'Ireland',
 		'alpha2': 'IE',
 		'alpha3': 'IRL',
-		'numeric': '372'
+		'numeric': '372',
 	},
 	{
 		'name': 'Isle of Man',
 		'alpha2': 'IM',
 		'alpha3': 'IMN',
-		'numeric': '833'
+		'numeric': '833',
 	},
 	{
 		'name': 'Israel',
 		'alpha2': 'IL',
 		'alpha3': 'ISR',
-		'numeric': '376'
+		'numeric': '376',
 	},
 	{
 		'name': 'Italy',
 		'alpha2': 'IT',
 		'alpha3': 'ITA',
-		'numeric': '380'
+		'numeric': '380',
 	},
 	{
 		'name': 'Jamaica',
 		'alpha2': 'JM',
 		'alpha3': 'JAM',
-		'numeric': '388'
+		'numeric': '388',
 	},
 	{
 		'name': 'Japan',
 		'alpha2': 'JP',
 		'alpha3': 'JPN',
-		'numeric': '392'
+		'numeric': '392',
 	},
 	{
 		'name': 'Jersey',
 		'alpha2': 'JE',
 		'alpha3': 'JEY',
-		'numeric': '832'
+		'numeric': '832',
 	},
 	{
 		'name': 'Jordan',
 		'alpha2': 'JO',
 		'alpha3': 'JOR',
-		'numeric': '400'
+		'numeric': '400',
 	},
 	{
 		'name': 'Kazakhstan',
 		'alpha2': 'KZ',
 		'alpha3': 'KAZ',
-		'numeric': '398'
+		'numeric': '398',
 	},
 	{
 		'name': 'Kenya',
 		'alpha2': 'KE',
 		'alpha3': 'KEN',
-		'numeric': '404'
+		'numeric': '404',
 	},
 	{
 		'name': 'Kiribati',
 		'alpha2': 'KI',
 		'alpha3': 'KIR',
-		'numeric': '296'
+		'numeric': '296',
 	},
 	{
 		'name': 'Korea (the Democratic People\'s Republic of)',
@@ -738,7 +738,7 @@ export const countriesCodes = [
 		'alpha3': 'PRK',
 		'numeric': '408',
 		'altName': 'Korea (North)',
-		'shortName': 'North Korea'
+		'shortName': 'North Korea',
 	},
 	{
 		'name': 'Korea (the Republic of)',
@@ -746,19 +746,19 @@ export const countriesCodes = [
 		'alpha3': 'KOR',
 		'numeric': '410',
 		'altName': 'Korea (South)',
-		'shortName': 'South Korea'
+		'shortName': 'South Korea',
 	},
 	{
 		'name': 'Kuwait',
 		'alpha2': 'KW',
 		'alpha3': 'KWT',
-		'numeric': '414'
+		'numeric': '414',
 	},
 	{
 		'name': 'Kyrgyzstan',
 		'alpha2': 'KG',
 		'alpha3': 'KGZ',
-		'numeric': '417'
+		'numeric': '417',
 	},
 	{
 		'name': 'Lao People\'s Democratic Republic (the)',
@@ -766,55 +766,55 @@ export const countriesCodes = [
 		'alpha3': 'LAO',
 		'numeric': '418',
 		'altName': 'Lao PDR',
-		'shortName': 'Laos'
+		'shortName': 'Laos',
 	},
 	{
 		'name': 'Latvia',
 		'alpha2': 'LV',
 		'alpha3': 'LVA',
-		'numeric': '428'
+		'numeric': '428',
 	},
 	{
 		'name': 'Lebanon',
 		'alpha2': 'LB',
 		'alpha3': 'LBN',
-		'numeric': '422'
+		'numeric': '422',
 	},
 	{
 		'name': 'Lesotho',
 		'alpha2': 'LS',
 		'alpha3': 'LSO',
-		'numeric': '426'
+		'numeric': '426',
 	},
 	{
 		'name': 'Liberia',
 		'alpha2': 'LR',
 		'alpha3': 'LBR',
-		'numeric': '430'
+		'numeric': '430',
 	},
 	{
 		'name': 'Libya',
 		'alpha2': 'LY',
 		'alpha3': 'LBY',
-		'numeric': '434'
+		'numeric': '434',
 	},
 	{
 		'name': 'Liechtenstein',
 		'alpha2': 'LI',
 		'alpha3': 'LIE',
-		'numeric': '438'
+		'numeric': '438',
 	},
 	{
 		'name': 'Lithuania',
 		'alpha2': 'LT',
 		'alpha3': 'LTU',
-		'numeric': '440'
+		'numeric': '440',
 	},
 	{
 		'name': 'Luxembourg',
 		'alpha2': 'LU',
 		'alpha3': 'LUX',
-		'numeric': '442'
+		'numeric': '442',
 	},
 	{
 		'name': 'Macao',
@@ -822,7 +822,7 @@ export const countriesCodes = [
 		'alpha3': 'MAC',
 		'numeric': '446',
 		'altName': 'Macao, SAR China',
-		'shortName': 'Macau'
+		'shortName': 'Macau',
 	},
 	{
 		'name': 'Macedonia (the former Yugoslav Republic of)',
@@ -830,80 +830,80 @@ export const countriesCodes = [
 		'alpha3': 'MKD',
 		'numeric': '807',
 		'altName': 'Macedonia, Republic of',
-		'shortName': 'Macedonia'
+		'shortName': 'Macedonia',
 	},
 	{
 		'name': 'Madagascar',
 		'alpha2': 'MG',
 		'alpha3': 'MDG',
-		'numeric': '450'
+		'numeric': '450',
 	},
 	{
 		'name': 'Malawi',
 		'alpha2': 'MW',
 		'alpha3': 'MWI',
-		'numeric': '454'
+		'numeric': '454',
 	},
 	{
 		'name': 'Malaysia',
 		'alpha2': 'MY',
 		'alpha3': 'MYS',
-		'numeric': '458'
+		'numeric': '458',
 	},
 	{
 		'name': 'Maldives',
 		'alpha2': 'MV',
 		'alpha3': 'MDV',
-		'numeric': '462'
+		'numeric': '462',
 	},
 	{
 		'name': 'Mali',
 		'alpha2': 'ML',
 		'alpha3': 'MLI',
-		'numeric': '466'
+		'numeric': '466',
 	},
 	{
 		'name': 'Malta',
 		'alpha2': 'MT',
 		'alpha3': 'MLT',
-		'numeric': '470'
+		'numeric': '470',
 	},
 	{
 		'name': 'Marshall Islands (the)',
 		'alpha2': 'MH',
 		'alpha3': 'MHL',
 		'numeric': '584',
-		'altName': 'Marshall Islands'
+		'altName': 'Marshall Islands',
 	},
 	{
 		'name': 'Martinique',
 		'alpha2': 'MQ',
 		'alpha3': 'MTQ',
-		'numeric': '474'
+		'numeric': '474',
 	},
 	{
 		'name': 'Mauritania',
 		'alpha2': 'MR',
 		'alpha3': 'MRT',
-		'numeric': '478'
+		'numeric': '478',
 	},
 	{
 		'name': 'Mauritius',
 		'alpha2': 'MU',
 		'alpha3': 'MUS',
-		'numeric': '480'
+		'numeric': '480',
 	},
 	{
 		'name': 'Mayotte',
 		'alpha2': 'YT',
 		'alpha3': 'MYT',
-		'numeric': '175'
+		'numeric': '175',
 	},
 	{
 		'name': 'Mexico',
 		'alpha2': 'MX',
 		'alpha3': 'MEX',
-		'numeric': '484'
+		'numeric': '484',
 	},
 	{
 		'name': 'Micronesia (Federated States of)',
@@ -911,155 +911,155 @@ export const countriesCodes = [
 		'alpha3': 'FSM',
 		'numeric': '583',
 		'altName': 'Micronesia, Federated States of',
-		'shortName': 'Micronesia'
+		'shortName': 'Micronesia',
 	},
 	{
 		'name': 'Moldova (the Republic of)',
 		'alpha2': 'MD',
 		'alpha3': 'MDA',
 		'numeric': '498',
-		'altName': 'Moldova'
+		'altName': 'Moldova',
 	},
 	{
 		'name': 'Monaco',
 		'alpha2': 'MC',
 		'alpha3': 'MCO',
-		'numeric': '492'
+		'numeric': '492',
 	},
 	{
 		'name': 'Mongolia',
 		'alpha2': 'MN',
 		'alpha3': 'MNG',
-		'numeric': '496'
+		'numeric': '496',
 	},
 	{
 		'name': 'Montenegro',
 		'alpha2': 'ME',
 		'alpha3': 'MNE',
-		'numeric': '499'
+		'numeric': '499',
 	},
 	{
 		'name': 'Montserrat',
 		'alpha2': 'MS',
 		'alpha3': 'MSR',
-		'numeric': '500'
+		'numeric': '500',
 	},
 	{
 		'name': 'Morocco',
 		'alpha2': 'MA',
 		'alpha3': 'MAR',
-		'numeric': '504'
+		'numeric': '504',
 	},
 	{
 		'name': 'Mozambique',
 		'alpha2': 'MZ',
 		'alpha3': 'MOZ',
-		'numeric': '508'
+		'numeric': '508',
 	},
 	{
 		'name': 'Myanmar',
 		'alpha2': 'MM',
 		'alpha3': 'MMR',
-		'numeric': '104'
+		'numeric': '104',
 	},
 	{
 		'name': 'Namibia',
 		'alpha2': 'NA',
 		'alpha3': 'NAM',
-		'numeric': '516'
+		'numeric': '516',
 	},
 	{
 		'name': 'Nauru',
 		'alpha2': 'NR',
 		'alpha3': 'NRU',
-		'numeric': '520'
+		'numeric': '520',
 	},
 	{
 		'name': 'Nepal',
 		'alpha2': 'NP',
 		'alpha3': 'NPL',
-		'numeric': '524'
+		'numeric': '524',
 	},
 	{
 		'name': 'Netherlands (the)',
 		'alpha2': 'NL',
 		'alpha3': 'NLD',
 		'numeric': '528',
-		'altName': 'Netherlands'
+		'altName': 'Netherlands',
 	},
 	{
 		'name': 'New Caledonia',
 		'alpha2': 'NC',
 		'alpha3': 'NCL',
-		'numeric': '540'
+		'numeric': '540',
 	},
 	{
 		'name': 'New Zealand',
 		'alpha2': 'NZ',
 		'alpha3': 'NZL',
-		'numeric': '554'
+		'numeric': '554',
 	},
 	{
 		'name': 'Nicaragua',
 		'alpha2': 'NI',
 		'alpha3': 'NIC',
-		'numeric': '558'
+		'numeric': '558',
 	},
 	{
 		'name': 'Niger (the)',
 		'alpha2': 'NE',
 		'alpha3': 'NER',
 		'numeric': '562',
-		'altName': 'Niger'
+		'altName': 'Niger',
 	},
 	{
 		'name': 'Nigeria',
 		'alpha2': 'NG',
 		'alpha3': 'NGA',
-		'numeric': '566'
+		'numeric': '566',
 	},
 	{
 		'name': 'Niue',
 		'alpha2': 'NU',
 		'alpha3': 'NIU',
-		'numeric': '570'
+		'numeric': '570',
 	},
 	{
 		'name': 'Norfolk Island',
 		'alpha2': 'NF',
 		'alpha3': 'NFK',
-		'numeric': '574'
+		'numeric': '574',
 	},
 	{
 		'name': 'Northern Mariana Islands (the)',
 		'alpha2': 'MP',
 		'alpha3': 'MNP',
 		'numeric': '580',
-		'altName': 'Northern Mariana Islands'
+		'altName': 'Northern Mariana Islands',
 	},
 	{
 		'name': 'Norway',
 		'alpha2': 'NO',
 		'alpha3': 'NOR',
-		'numeric': '578'
+		'numeric': '578',
 	},
 	{
 		'name': 'Oman',
 		'alpha2': 'OM',
 		'alpha3': 'OMN',
-		'numeric': '512'
+		'numeric': '512',
 	},
 	{
 		'name': 'Pakistan',
 		'alpha2': 'PK',
 		'alpha3': 'PAK',
-		'numeric': '586'
+		'numeric': '586',
 	},
 	{
 		'name': 'Palau',
 		'alpha2': 'PW',
 		'alpha3': 'PLW',
-		'numeric': '585'
+		'numeric': '585',
 	},
 	{
 		'name': 'Palestine, State of',
@@ -1067,81 +1067,81 @@ export const countriesCodes = [
 		'alpha3': 'PSE',
 		'numeric': '275',
 		'altName': 'Palestinian Territory',
-		'shortName': 'Palestine'
+		'shortName': 'Palestine',
 	},
 	{
 		'name': 'Panama',
 		'alpha2': 'PA',
 		'alpha3': 'PAN',
-		'numeric': '591'
+		'numeric': '591',
 	},
 	{
 		'name': 'Papua New Guinea',
 		'alpha2': 'PG',
 		'alpha3': 'PNG',
-		'numeric': '598'
+		'numeric': '598',
 	},
 	{
 		'name': 'Paraguay',
 		'alpha2': 'PY',
 		'alpha3': 'PRY',
-		'numeric': '600'
+		'numeric': '600',
 	},
 	{
 		'name': 'Peru',
 		'alpha2': 'PE',
 		'alpha3': 'PER',
-		'numeric': '604'
+		'numeric': '604',
 	},
 	{
 		'name': 'Philippines (the)',
 		'alpha2': 'PH',
 		'alpha3': 'PHL',
 		'numeric': '608',
-		'altName': 'Philippines'
+		'altName': 'Philippines',
 	},
 	{
 		'name': 'Pitcairn',
 		'alpha2': 'PN',
 		'alpha3': 'PCN',
-		'numeric': '612'
+		'numeric': '612',
 	},
 	{
 		'name': 'Poland',
 		'alpha2': 'PL',
 		'alpha3': 'POL',
-		'numeric': '616'
+		'numeric': '616',
 	},
 	{
 		'name': 'Portugal',
 		'alpha2': 'PT',
 		'alpha3': 'PRT',
-		'numeric': '620'
+		'numeric': '620',
 	},
 	{
 		'name': 'Puerto Rico',
 		'alpha2': 'PR',
 		'alpha3': 'PRI',
-		'numeric': '630'
+		'numeric': '630',
 	},
 	{
 		'name': 'Qatar',
 		'alpha2': 'QA',
 		'alpha3': 'QAT',
-		'numeric': '634'
+		'numeric': '634',
 	},
 	{
 		'name': 'Réunion',
 		'alpha2': 'RE',
 		'alpha3': 'REU',
 		'numeric': '638',
-		'shortName': 'Reunion'
+		'shortName': 'Reunion',
 	},
 	{
 		'name': 'Romania',
 		'alpha2': 'RO',
 		'alpha3': 'ROU',
-		'numeric': '642'
+		'numeric': '642',
 	},
 	{
 		'name': 'Russian Federation (the)',
@@ -1149,13 +1149,13 @@ export const countriesCodes = [
 		'alpha3': 'RUS',
 		'numeric': '643',
 		'altName': 'Russian Federation',
-		'shortName': 'Russia'
+		'shortName': 'Russia',
 	},
 	{
 		'name': 'Rwanda',
 		'alpha2': 'RW',
 		'alpha3': 'RWA',
-		'numeric': '646'
+		'numeric': '646',
 	},
 	{
 		'name': 'Saint Barthélemy',
@@ -1163,26 +1163,26 @@ export const countriesCodes = [
 		'alpha3': 'BLM',
 		'numeric': '652',
 		'altName': 'Saint-Barthélemy',
-		'shortName': 'Saint Barthelemy'
+		'shortName': 'Saint Barthelemy',
 	},
 	{
 		'name': 'Saint Helena, Ascension and Tristan da Cunha',
 		'alpha2': 'SH',
 		'alpha3': 'SHN',
 		'numeric': '654',
-		'altName': 'Saint Helena'
+		'altName': 'Saint Helena',
 	},
 	{
 		'name': 'Saint Kitts and Nevis',
 		'alpha2': 'KN',
 		'alpha3': 'KNA',
-		'numeric': '659'
+		'numeric': '659',
 	},
 	{
 		'name': 'Saint Lucia',
 		'alpha2': 'LC',
 		'alpha3': 'LCA',
-		'numeric': '662'
+		'numeric': '662',
 	},
 	{
 		'name': 'Saint Martin (French part)',
@@ -1190,173 +1190,173 @@ export const countriesCodes = [
 		'alpha3': 'MAF',
 		'numeric': '663',
 		'altName': 'Saint-Martin (French part)',
-		'shortName': 'Saint Martin'
+		'shortName': 'Saint Martin',
 	},
 	{
 		'name': 'Saint Pierre and Miquelon',
 		'alpha2': 'PM',
 		'alpha3': 'SPM',
-		'numeric': '666'
+		'numeric': '666',
 	},
 	{
 		'name': 'Saint Vincent and the Grenadines',
 		'alpha2': 'VC',
 		'alpha3': 'VCT',
 		'numeric': '670',
-		'altName': 'Saint Vincent and Grenadines'
+		'altName': 'Saint Vincent and Grenadines',
 	},
 	{
 		'name': 'Samoa',
 		'alpha2': 'WS',
 		'alpha3': 'WSM',
-		'numeric': '882'
+		'numeric': '882',
 	},
 	{
 		'name': 'San Marino',
 		'alpha2': 'SM',
 		'alpha3': 'SMR',
-		'numeric': '674'
+		'numeric': '674',
 	},
 	{
 		'name': 'Sao Tome and Principe',
 		'alpha2': 'ST',
 		'alpha3': 'STP',
-		'numeric': '678'
+		'numeric': '678',
 	},
 	{
 		'name': 'Saudi Arabia',
 		'alpha2': 'SA',
 		'alpha3': 'SAU',
-		'numeric': '682'
+		'numeric': '682',
 	},
 	{
 		'name': 'Senegal',
 		'alpha2': 'SN',
 		'alpha3': 'SEN',
-		'numeric': '686'
+		'numeric': '686',
 	},
 	{
 		'name': 'Serbia',
 		'alpha2': 'RS',
 		'alpha3': 'SRB',
-		'numeric': '688'
+		'numeric': '688',
 	},
 	{
 		'name': 'Seychelles',
 		'alpha2': 'SC',
 		'alpha3': 'SYC',
-		'numeric': '690'
+		'numeric': '690',
 	},
 	{
 		'name': 'Sierra Leone',
 		'alpha2': 'SL',
 		'alpha3': 'SLE',
-		'numeric': '694'
+		'numeric': '694',
 	},
 	{
 		'name': 'Singapore',
 		'alpha2': 'SG',
 		'alpha3': 'SGP',
-		'numeric': '702'
+		'numeric': '702',
 	},
 	{
 		'name': 'Sint Maarten (Dutch part)',
 		'alpha2': 'SX',
 		'alpha3': 'SXM',
 		'numeric': '534',
-		'shortName': 'Sint Maarten'
+		'shortName': 'Sint Maarten',
 	},
 	{
 		'name': 'Slovakia',
 		'alpha2': 'SK',
 		'alpha3': 'SVK',
-		'numeric': '703'
+		'numeric': '703',
 	},
 	{
 		'name': 'Slovenia',
 		'alpha2': 'SI',
 		'alpha3': 'SVN',
-		'numeric': '705'
+		'numeric': '705',
 	},
 	{
 		'name': 'Solomon Islands',
 		'alpha2': 'SB',
 		'alpha3': 'SLB',
-		'numeric': '090'
+		'numeric': '090',
 	},
 	{
 		'name': 'Somalia',
 		'alpha2': 'SO',
 		'alpha3': 'SOM',
-		'numeric': '706'
+		'numeric': '706',
 	},
 	{
 		'name': 'South Africa',
 		'alpha2': 'ZA',
 		'alpha3': 'ZAF',
-		'numeric': '710'
+		'numeric': '710',
 	},
 	{
 		'name': 'South Georgia and the South Sandwich Islands',
 		'alpha2': 'GS',
 		'alpha3': 'SGS',
-		'numeric': '239'
+		'numeric': '239',
 	},
 	{
 		'name': 'South Sudan',
 		'alpha2': 'SS',
 		'alpha3': 'SSD',
-		'numeric': '728'
+		'numeric': '728',
 	},
 	{
 		'name': 'Spain',
 		'alpha2': 'ES',
 		'alpha3': 'ESP',
-		'numeric': '724'
+		'numeric': '724',
 	},
 	{
 		'name': 'Sri Lanka',
 		'alpha2': 'LK',
 		'alpha3': 'LKA',
-		'numeric': '144'
+		'numeric': '144',
 	},
 	{
 		'name': 'Sudan (the)',
 		'alpha2': 'SD',
 		'alpha3': 'SDN',
 		'numeric': '729',
-		'altName': 'Sudan'
+		'altName': 'Sudan',
 	},
 	{
 		'name': 'Suriname',
 		'alpha2': 'SR',
 		'alpha3': 'SUR',
-		'numeric': '740'
+		'numeric': '740',
 	},
 	{
 		'name': 'Svalbard and Jan Mayen',
 		'alpha2': 'SJ',
 		'alpha3': 'SJM',
 		'numeric': '744',
-		'altName': 'Svalbard and Jan Mayen Islands'
+		'altName': 'Svalbard and Jan Mayen Islands',
 	},
 	{
 		'name': 'Swaziland',
 		'alpha2': 'SZ',
 		'alpha3': 'SWZ',
-		'numeric': '748'
+		'numeric': '748',
 	},
 	{
 		'name': 'Sweden',
 		'alpha2': 'SE',
 		'alpha3': 'SWE',
-		'numeric': '752'
+		'numeric': '752',
 	},
 	{
 		'name': 'Switzerland',
 		'alpha2': 'CH',
 		'alpha3': 'CHE',
-		'numeric': '756'
+		'numeric': '756',
 	},
 	{
 		'name': 'Syrian Arab Republic',
@@ -1364,7 +1364,7 @@ export const countriesCodes = [
 		'alpha3': 'SYR',
 		'numeric': '760',
 		'altName': 'Syrian Arab Republic (Syria)',
-		'shortName': 'Syria'
+		'shortName': 'Syria',
 	},
 	{
 		'name': 'Taiwan (Province of China)',
@@ -1372,121 +1372,121 @@ export const countriesCodes = [
 		'alpha3': 'TWN',
 		'numeric': '158',
 		'altName': 'Taiwan, Republic of China',
-		'shortName': 'Taiwan'
+		'shortName': 'Taiwan',
 	},
 	{
 		'name': 'Tajikistan',
 		'alpha2': 'TJ',
 		'alpha3': 'TJK',
-		'numeric': '762'
+		'numeric': '762',
 	},
 	{
 		'name': 'Tanzania, United Republic of',
 		'alpha2': 'TZ',
 		'alpha3': 'TZA',
 		'numeric': '834',
-		'shortName': 'Tanzania'
+		'shortName': 'Tanzania',
 	},
 	{
 		'name': 'Thailand',
 		'alpha2': 'TH',
 		'alpha3': 'THA',
-		'numeric': '764'
+		'numeric': '764',
 	},
 	{
 		'name': 'Timor-Leste',
 		'alpha2': 'TL',
 		'alpha3': 'TLS',
 		'numeric': '626',
-		'shortName': 'East Timor'
+		'shortName': 'East Timor',
 	},
 	{
 		'name': 'Togo',
 		'alpha2': 'TG',
 		'alpha3': 'TGO',
-		'numeric': '768'
+		'numeric': '768',
 	},
 	{
 		'name': 'Tokelau',
 		'alpha2': 'TK',
 		'alpha3': 'TKL',
-		'numeric': '772'
+		'numeric': '772',
 	},
 	{
 		'name': 'Tonga',
 		'alpha2': 'TO',
 		'alpha3': 'TON',
-		'numeric': '776'
+		'numeric': '776',
 	},
 	{
 		'name': 'Trinidad and Tobago',
 		'alpha2': 'TT',
 		'alpha3': 'TTO',
-		'numeric': '780'
+		'numeric': '780',
 	},
 	{
 		'name': 'Tunisia',
 		'alpha2': 'TN',
 		'alpha3': 'TUN',
-		'numeric': '788'
+		'numeric': '788',
 	},
 	{
 		'name': 'Turkey',
 		'alpha2': 'TR',
 		'alpha3': 'TUR',
-		'numeric': '792'
+		'numeric': '792',
 	},
 	{
 		'name': 'Turkmenistan',
 		'alpha2': 'TM',
 		'alpha3': 'TKM',
-		'numeric': '795'
+		'numeric': '795',
 	},
 	{
 		'name': 'Turks and Caicos Islands (the)',
 		'alpha2': 'TC',
 		'alpha3': 'TCA',
 		'numeric': '796',
-		'altName': 'Turks and Caicos Islands'
+		'altName': 'Turks and Caicos Islands',
 	},
 	{
 		'name': 'Tuvalu',
 		'alpha2': 'TV',
 		'alpha3': 'TUV',
-		'numeric': '798'
+		'numeric': '798',
 	},
 	{
 		'name': 'Uganda',
 		'alpha2': 'UG',
 		'alpha3': 'UGA',
-		'numeric': '800'
+		'numeric': '800',
 	},
 	{
 		'name': 'Ukraine',
 		'alpha2': 'UA',
 		'alpha3': 'UKR',
-		'numeric': '804'
+		'numeric': '804',
 	},
 	{
 		'name': 'United Arab Emirates (the)',
 		'alpha2': 'AE',
 		'alpha3': 'ARE',
 		'numeric': '784',
-		'altName': 'United Arab Emirates'
+		'altName': 'United Arab Emirates',
 	},
 	{
 		'name': 'United Kingdom of Great Britain and Northern Ireland (the)',
 		'alpha2': 'GB',
 		'alpha3': 'GBR',
 		'numeric': '826',
-		'altName': 'United Kingdom'
+		'altName': 'United Kingdom',
 	},
 	{
 		'name': 'United States Minor Outlying Islands (the)',
 		'alpha2': 'UM',
 		'alpha3': 'UMI',
 		'numeric': '581',
-		'altName': 'US Minor Outlying Islands'
+		'altName': 'US Minor Outlying Islands',
 	},
 	{
 		'name': 'United States of America (the)',
@@ -1494,25 +1494,25 @@ export const countriesCodes = [
 		'alpha3': 'USA',
 		'numeric': '840',
 		'altName': 'United States of America',
-		'shortName': 'United States'
+		'shortName': 'United States',
 	},
 	{
 		'name': 'Uruguay',
 		'alpha2': 'UY',
 		'alpha3': 'URY',
-		'numeric': '858'
+		'numeric': '858',
 	},
 	{
 		'name': 'Uzbekistan',
 		'alpha2': 'UZ',
 		'alpha3': 'UZB',
-		'numeric': '860'
+		'numeric': '860',
 	},
 	{
 		'name': 'Vanuatu',
 		'alpha2': 'VU',
 		'alpha3': 'VUT',
-		'numeric': '548'
+		'numeric': '548',
 	},
 	{
 		'name': 'Venezuela (Bolivarian Republic of)',
@@ -1520,21 +1520,21 @@ export const countriesCodes = [
 		'alpha3': 'VEN',
 		'numeric': '862',
 		'altName': 'Venezuela (Bolivarian Republic)',
-		'shortName': 'Venezuela'
+		'shortName': 'Venezuela',
 	},
 	{
 		'name': 'Viet Nam',
 		'alpha2': 'VN',
 		'alpha3': 'VNM',
 		'numeric': '704',
-		'shortName': 'Vietnam'
+		'shortName': 'Vietnam',
 	},
 	{
 		'name': 'Virgin Islands (British)',
 		'alpha2': 'VG',
 		'alpha3': 'VGB',
 		'numeric': '092',
-		'altName': 'British Virgin Islands'
+		'altName': 'British Virgin Islands',
 	},
 	{
 		'name': 'Virgin Islands (U.S.)',
@@ -1542,38 +1542,38 @@ export const countriesCodes = [
 		'alpha3': 'VIR',
 		'numeric': '850',
 		'altName': 'Virgin Islands, US',
-		'shortName': 'U.S. Virgin Islands'
+		'shortName': 'U.S. Virgin Islands',
 	},
 	{
 		'name': 'Wallis and Futuna',
 		'alpha2': 'WF',
 		'alpha3': 'WLF',
 		'numeric': '876',
-		'altName': 'Wallis and Futuna Islands'
+		'altName': 'Wallis and Futuna Islands',
 	},
 	{
 		'name': 'Western Sahara*',
 		'alpha2': 'EH',
 		'alpha3': 'ESH',
 		'numeric': '732',
-		'altName': 'Western Sahara'
+		'altName': 'Western Sahara',
 	},
 	{
 		'name': 'Yemen',
 		'alpha2': 'YE',
 		'alpha3': 'YEM',
-		'numeric': '887'
+		'numeric': '887',
 	},
 	{
 		'name': 'Zambia',
 		'alpha2': 'ZM',
 		'alpha3': 'ZMB',
-		'numeric': '894'
+		'numeric': '894',
 	},
 	{
 		'name': 'Zimbabwe',
 		'alpha2': 'ZW',
 		'alpha3': 'ZWE',
-		'numeric': '716'
-	}
+		'numeric': '716',
+	},
 ];
diff --git a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
index b0ad6a410..c72b7fa8f 100644
--- a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
@@ -21,7 +21,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		body,
 		qs,
 		uri: uri || `https://www.googleapis.com${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		options = Object.assign({}, options, option);
@@ -51,7 +51,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 
 			// Try to return the error prettier
 			throw new Error(
-				`YouTube error response [${error.statusCode}]: ${errors.join('|')}`
+				`YouTube error response [${error.statusCode}]: ${errors.join('|')}`,
 			);
 		}
 		throw error;
diff --git a/packages/nodes-base/nodes/Google/YouTube/PlaylistDescription.ts b/packages/nodes-base/nodes/Google/YouTube/PlaylistDescription.ts
index cb6508e45..272c737ce 100644
--- a/packages/nodes-base/nodes/Google/YouTube/PlaylistDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/PlaylistDescription.ts
@@ -42,8 +42,8 @@ export const playlistOperations = [
 			},
 		],
 		default: 'getAll',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const playlistFields = [
diff --git a/packages/nodes-base/nodes/Google/YouTube/PlaylistItemDescription.ts b/packages/nodes-base/nodes/Google/YouTube/PlaylistItemDescription.ts
index 86c455ba3..6f5372505 100644
--- a/packages/nodes-base/nodes/Google/YouTube/PlaylistItemDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/PlaylistItemDescription.ts
@@ -37,8 +37,8 @@ export const playlistItemOperations = [
 			},
 		],
 		default: 'add',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const playlistItemFields = [
@@ -295,7 +295,7 @@ export const playlistItemFields = [
 				],
 			},
 		},
-		default: ''
+		default: '',
 	},
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/Google/YouTube/VideoCategoryDescription.ts b/packages/nodes-base/nodes/Google/YouTube/VideoCategoryDescription.ts
index 1f52ff23d..e4b91b73a 100644
--- a/packages/nodes-base/nodes/Google/YouTube/VideoCategoryDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/VideoCategoryDescription.ts
@@ -23,8 +23,8 @@ export const videoCategoryOperations = [
 			},
 		],
 		default: 'getAll',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const videoCategoryFields = [
diff --git a/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts b/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
index 1f5f90902..720190a7f 100644
--- a/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
@@ -47,8 +47,8 @@ export const videoOperations = [
 			},
 		],
 		default: 'getAll',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const videoFields = [
@@ -319,7 +319,7 @@ export const videoFields = [
 				],
 			},
 		},
-		default: ''
+		default: '',
 	},
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 52df08809..156d90d93 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -1,6 +1,6 @@
 import {
-	IExecuteFunctions,
 	BINARY_ENCODING,
+	IExecuteFunctions,
 } from 'n8n-core';
 
 import {
@@ -28,8 +28,8 @@ import {
 } from './PlaylistDescription';
 
 import {
-	playlistItemOperations,
 	playlistItemFields,
+	playlistItemOperations,
 } from './PlaylistItemDescription';
 
 import {
@@ -95,7 +95,7 @@ export class YouTube implements INodeType {
 					},
 				],
 				default: 'channel',
-				description: 'The resource to operate on.'
+				description: 'The resource to operate on.',
 			},
 			...channelOperations,
 			...channelFields,
@@ -119,7 +119,7 @@ export class YouTube implements INodeType {
 			// Get all the languages to display them to user so that he can
 			// select them easily
 			async getLanguages(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const languages = await googleApiRequestAllItems.call(
@@ -133,7 +133,7 @@ export class YouTube implements INodeType {
 					const languageId = language.id;
 					returnData.push({
 						name: languageName,
-						value: languageId
+						value: languageId,
 					});
 				}
 				return returnData;
@@ -155,7 +155,7 @@ export class YouTube implements INodeType {
 			// Get all the video categories to display them to user so that he can
 			// select them easily
 			async getVideoCategories(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const countryCode = this.getCurrentNodeParameter('regionCode') as string;
 
@@ -176,7 +176,7 @@ export class YouTube implements INodeType {
 					const categoryId = category.id;
 					returnData.push({
 						name: categoryName,
-						value: categoryId
+						value: categoryId,
 					});
 				}
 				return returnData;
@@ -184,7 +184,7 @@ export class YouTube implements INodeType {
 			// Get all the playlists to display them to user so that he can
 			// select them easily
 			async getPlaylists(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const qs: IDataObject = {};
@@ -203,12 +203,12 @@ export class YouTube implements INodeType {
 					const playlistId = playlist.id;
 					returnData.push({
 						name: playlistName,
-						value: playlistId
+						value: playlistId,
 					});
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -249,7 +249,7 @@ export class YouTube implements INodeType {
 						'GET',
 						`/youtube/v3/channels`,
 						{},
-						qs
+						qs,
 					);
 
 					responseData = responseData.items;
@@ -292,7 +292,7 @@ export class YouTube implements INodeType {
 							'GET',
 							`/youtube/v3/channels`,
 							{},
-							qs
+							qs,
 						);
 					} else {
 						qs.maxResults = this.getNodeParameter('limit', i) as number;
@@ -301,7 +301,7 @@ export class YouTube implements INodeType {
 							'GET',
 							`/youtube/v3/channels`,
 							{},
-							qs
+							qs,
 						);
 						responseData = responseData.items;
 					}
@@ -400,7 +400,7 @@ export class YouTube implements INodeType {
 						'PUT',
 						'/youtube/v3/channels',
 						body,
-						qs
+						qs,
 					);
 				}
 				//https://developers.google.com/youtube/v3/docs/channelBanners/insert
@@ -485,7 +485,7 @@ export class YouTube implements INodeType {
 						'GET',
 						`/youtube/v3/playlists`,
 						{},
-						qs
+						qs,
 					);
 
 					responseData = responseData.items;
@@ -525,7 +525,7 @@ export class YouTube implements INodeType {
 							'GET',
 							`/youtube/v3/playlists`,
 							{},
-							qs
+							qs,
 						);
 					} else {
 						qs.maxResults = this.getNodeParameter('limit', i) as number;
@@ -534,7 +534,7 @@ export class YouTube implements INodeType {
 							'GET',
 							`/youtube/v3/playlists`,
 							{},
-							qs
+							qs,
 						);
 						responseData = responseData.items;
 					}
@@ -580,7 +580,7 @@ export class YouTube implements INodeType {
 						'POST',
 						'/youtube/v3/playlists',
 						body,
-						qs
+						qs,
 					);
 				}
 				//https://developers.google.com/youtube/v3/docs/playlists/update
@@ -629,7 +629,7 @@ export class YouTube implements INodeType {
 						'PUT',
 						'/youtube/v3/playlists',
 						body,
-						qs
+						qs,
 					);
 				}
 				//https://developers.google.com/youtube/v3/docs/playlists/delete
@@ -682,7 +682,7 @@ export class YouTube implements INodeType {
 						'GET',
 						`/youtube/v3/playlistItems`,
 						{},
-						qs
+						qs,
 					);
 
 					responseData = responseData.items;
@@ -717,7 +717,7 @@ export class YouTube implements INodeType {
 							'GET',
 							`/youtube/v3/playlistItems`,
 							{},
-							qs
+							qs,
 						);
 					} else {
 						qs.maxResults = this.getNodeParameter('limit', i) as number;
@@ -726,7 +726,7 @@ export class YouTube implements INodeType {
 							'GET',
 							`/youtube/v3/playlistItems`,
 							{},
-							qs
+							qs,
 						);
 						responseData = responseData.items;
 					}
@@ -781,7 +781,7 @@ export class YouTube implements INodeType {
 						'POST',
 						'/youtube/v3/playlistItems',
 						body,
-						qs
+						qs,
 					);
 				}
 				//https://developers.google.com/youtube/v3/docs/playlistItems/delete
@@ -837,7 +837,7 @@ export class YouTube implements INodeType {
 							'GET',
 							`/youtube/v3/search`,
 							{},
-							qs
+							qs,
 						);
 					} else {
 						qs.maxResults = this.getNodeParameter('limit', i) as number;
@@ -846,7 +846,7 @@ export class YouTube implements INodeType {
 							'GET',
 							`/youtube/v3/search`,
 							{},
-							qs
+							qs,
 						);
 						responseData = responseData.items;
 					}
@@ -883,7 +883,7 @@ export class YouTube implements INodeType {
 						'GET',
 						`/youtube/v3/videos`,
 						{},
-						qs
+						qs,
 					);
 
 					responseData = responseData.items;
@@ -1078,7 +1078,7 @@ export class YouTube implements INodeType {
 						'PUT',
 						'/youtube/v3/videos',
 						body,
-						qs
+						qs,
 					);
 				}
 				//https://developers.google.com/youtube/v3/docs/videos/delete?hl=en
@@ -1138,7 +1138,7 @@ export class YouTube implements INodeType {
 						'GET',
 						`/youtube/v3/videoCategories`,
 						{},
-						qs
+						qs,
 					);
 					responseData = responseData.items;
 
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
index e9ba60b6d..b34b433dd 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -187,11 +187,11 @@ export class GraphQL implements INodeType {
 								default: '',
 								description: 'Value to set for the header.',
 							},
-						]
+						],
 					},
 				],
 			},
-		]
+		],
 	};
 
 
@@ -212,13 +212,13 @@ export class GraphQL implements INodeType {
 				.getNodeParameter('headerParametersUi', itemIndex, {}) as IDataObject;
 			const headerParameters = (parameter || []).reduce((result, item) => ({
 				...result,
-				[item.name]: item.value
+				[item.name]: item.value,
 			}), {});
 
 			requestOptions = {
 				headers: {
 					'content-type': `application/${requestFormat}`,
-					...headerParameters
+					...headerParameters,
 				},
 				method: requestMethod,
 				uri: endpoint,
@@ -229,7 +229,7 @@ export class GraphQL implements INodeType {
 			const gqlQuery = this.getNodeParameter('query', itemIndex, '') as string;
 			if (requestMethod === 'GET') {
 				requestOptions.qs = {
-					query: gqlQuery
+					query: gqlQuery,
 				};
 			} else {
 				if (requestFormat === 'json') {
@@ -261,7 +261,7 @@ export class GraphQL implements INodeType {
 				returnItems.push({
 					json: {
 						[dataPropertyName]: response,
-					}
+					},
 				});
 			} else {
 				if (typeof response === 'string') {
diff --git a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
index 9025211a6..de7afa5b1 100644
--- a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
@@ -20,7 +20,7 @@ export async function gumroadApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs,
 		body,
 		uri: uri ||`https://api.gumroad.com/v2${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts b/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
index c4a9b65a9..ed477fb12 100644
--- a/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -32,7 +32,7 @@ export class GumroadTrigger implements INodeType {
 			{
 				name: 'gumroadApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
index b77d5d35b..c607b1b6b 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
@@ -3,10 +3,10 @@ import {
 } from 'n8n-core';
 
 import {
+	IDataObject,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IDataObject,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Harvest/ClientDescription.ts b/packages/nodes-base/nodes/Harvest/ClientDescription.ts
index 7a98fe89c..482f04d4d 100644
--- a/packages/nodes-base/nodes/Harvest/ClientDescription.ts
+++ b/packages/nodes-base/nodes/Harvest/ClientDescription.ts
@@ -117,8 +117,8 @@ export const clientFields = [
 				type: 'dateTime',
 				default: '',
 				description: 'Only return clients that have been updated since the given date and time.',
-			}
-		]
+			},
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -135,7 +135,7 @@ export const clientFields = [
 				operation: [
 					'get',
 				],
-				resource
+				resource,
 			},
 		},
 		description: 'The ID of the client you are retrieving.',
@@ -155,7 +155,7 @@ export const clientFields = [
 				operation: [
 					'delete',
 				],
-				resource
+				resource,
 			},
 		},
 		description: 'The ID of the client you want to delete.',
@@ -200,21 +200,21 @@ export const clientFields = [
 				name: 'is_active',
 				type: 'string',
 				default: '',
-				description: 'Whether the client is active, or archived. Defaults to true.'
+				description: 'Whether the client is active, or archived. Defaults to true.',
 			},
 			{
 				displayName: 'Address',
 				name: 'address',
 				type: 'string',
 				default: '',
-				description: ' A textual representation of the client’s physical address. May include new line characters.'
+				description: ' A textual representation of the client’s physical address. May include new line characters.',
 			},
 			{
 				displayName: 'Currency',
 				name: 'currency',
 				type: 'string',
 				default: '',
-				description: 'The currency used by the estimate. If not provided, the client’s currency will be used. See a list of supported currencies'
+				description: 'The currency used by the estimate. If not provided, the client’s currency will be used. See a list of supported currencies',
 			},
 		],
 	},
@@ -258,28 +258,28 @@ export const clientFields = [
 				name: 'address',
 				type: 'string',
 				default: '',
-				description: ' A textual representation of the client’s physical address. May include new line characters.'
+				description: ' A textual representation of the client’s physical address. May include new line characters.',
 			},
 			{
 				displayName: 'Currency',
 				name: 'currency',
 				type: 'string',
 				default: '',
-				description: 'The currency used by the estimate. If not provided, the client’s currency will be used. See a list of supported currencies'
+				description: 'The currency used by the estimate. If not provided, the client’s currency will be used. See a list of supported currencies',
 			},
 			{
 				displayName: 'Is Active',
 				name: 'is_active',
 				type: 'boolean',
 				default: true,
-				description: 'Whether the client is active, or archived. Defaults to true.'
+				description: 'Whether the client is active, or archived. Defaults to true.',
 			},
 			{
 				displayName: 'Name',
 				name: 'name',
 				type: 'string',
 				default: '',
-				description: 'Whether the client is active, or archived. Defaults to true.'
+				description: 'Whether the client is active, or archived. Defaults to true.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Harvest/ContactDescription.ts b/packages/nodes-base/nodes/Harvest/ContactDescription.ts
index c4ecd257b..3c17745e3 100644
--- a/packages/nodes-base/nodes/Harvest/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Harvest/ContactDescription.ts
@@ -116,8 +116,8 @@ export const contactFields = [
 				type: 'dateTime',
 				default: '',
 				description: 'Only return clients that have been updated since the given date and time.',
-			}
-		]
+			},
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -215,42 +215,42 @@ export const contactFields = [
 				name: 'last_name',
 				type: 'string',
 				default: '',
-				description: 'The last name of the contact.'
+				description: 'The last name of the contact.',
 			},
 			{
 				displayName: 'Title',
 				name: 'title',
 				type: 'string',
 				default: '',
-				description: 'The title of the contact.'
+				description: 'The title of the contact.',
 			},
 			{
 				displayName: 'Email',
 				name: 'email',
 				type: 'string',
 				default: '',
-				description: 'The contact’s email address.'
+				description: 'The contact’s email address.',
 			},
 			{
 				displayName: 'Phone Office',
 				name: 'phone_office',
 				type: 'string',
 				default: '',
-				description: 'The contact’s office phone number.'
+				description: 'The contact’s office phone number.',
 			},
 			{
 				displayName: 'Phone Mobile',
 				name: 'phone_mobile',
 				type: 'string',
 				default: '',
-				description: 'The contact’s mobile phone number.'
+				description: 'The contact’s mobile phone number.',
 			},
 			{
 				displayName: 'Fax',
 				name: 'fax',
 				type: 'string',
 				default: '',
-				description: 'The contact’s fax number.'
+				description: 'The contact’s fax number.',
 			},
 		],
 	},
@@ -308,42 +308,42 @@ export const contactFields = [
 				name: 'last_name',
 				type: 'string',
 				default: '',
-				description: 'The last name of the contact.'
+				description: 'The last name of the contact.',
 			},
 			{
 				displayName: 'Title',
 				name: 'title',
 				type: 'string',
 				default: '',
-				description: 'The title of the contact.'
+				description: 'The title of the contact.',
 			},
 			{
 				displayName: 'Email',
 				name: 'email',
 				type: 'string',
 				default: '',
-				description: 'The contact’s email address.'
+				description: 'The contact’s email address.',
 			},
 			{
 				displayName: 'Phone Office',
 				name: 'phone_office',
 				type: 'string',
 				default: '',
-				description: 'The contact’s office phone number.'
+				description: 'The contact’s office phone number.',
 			},
 			{
 				displayName: 'Phone Mobile',
 				name: 'phone_mobile',
 				type: 'string',
 				default: '',
-				description: 'The contact’s mobile phone number.'
+				description: 'The contact’s mobile phone number.',
 			},
 			{
 				displayName: 'Fax',
 				name: 'fax',
 				type: 'string',
 				default: '',
-				description: 'The contact’s fax number.'
+				description: 'The contact’s fax number.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Harvest/EstimateDescription.ts b/packages/nodes-base/nodes/Harvest/EstimateDescription.ts
index ca2d2d6e2..aac2090e2 100644
--- a/packages/nodes-base/nodes/Harvest/EstimateDescription.ts
+++ b/packages/nodes-base/nodes/Harvest/EstimateDescription.ts
@@ -147,8 +147,8 @@ export const estimateFields = [
 			},
 			default: 1,
 			description: 'The page number to use in pagination. For instance, if you make a list request and receive 100 records, your subsequent call can include page=2 to retrieve the next page of the list. (Default: 1)',
-		}
-	]
+		},
+	],
 },
 
 /* -------------------------------------------------------------------------- */
@@ -230,63 +230,63 @@ export const estimateFields = [
 				name: 'currency',
 				type: 'string',
 				default: '',
-				description: 'The currency used by the estimate. If not provided, the client’s currency will be used. See a list of supported currencies'
+				description: 'The currency used by the estimate. If not provided, the client’s currency will be used. See a list of supported currencies',
 			},
 			{
 				displayName: 'Discount',
 				name: 'over_budget_notification_percentage',
 				type: 'string',
 				default: '',
-				description: 'This percentage is subtracted from the subtotal. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is subtracted from the subtotal. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Issue Date',
 				name: 'issue_date',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the invoice was issued. Defaults to today’s date.'
+				description: 'Date the invoice was issued. Defaults to today’s date.',
 			},
 			{
 				displayName: 'Notes',
 				name: 'notes',
 				type: 'string',
 				default: '',
-				description: 'Any additional notes to include on the estimate.'
+				description: 'Any additional notes to include on the estimate.',
 			},
 			{
 				displayName: 'Number',
 				name: 'number',
 				type: 'string',
 				default: '',
-				description: 'If no value is set, the number will be automatically generated.'
+				description: 'If no value is set, the number will be automatically generated.',
 			},
 			{
 				displayName: 'Purchase Order',
 				name: 'purchase_order',
 				type: 'string',
 				default: '',
-				description: 'The purchase order number.'
+				description: 'The purchase order number.',
 			},
 			{
 				displayName: 'Subject',
 				name: 'subject',
 				type: 'string',
 				default: '',
-				description: 'The estimate subject.'
+				description: 'The estimate subject.',
 			},
 			{
 				displayName: 'Tax',
 				name: 'tax',
 				type: 'string',
 				default: '',
-				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Tax2',
 				name: 'tax2',
 				type: 'string',
 				default: '',
-				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.',
 			},
 		],
 	},
@@ -337,63 +337,63 @@ export const estimateFields = [
 				name: 'currency',
 				type: 'string',
 				default: '',
-				description: 'The currency used by the estimate. If not provided, the client’s currency will be used. See a list of supported currencies'
+				description: 'The currency used by the estimate. If not provided, the client’s currency will be used. See a list of supported currencies',
 			},
 			{
 				displayName: 'Discount',
 				name: 'over_budget_notification_percentage',
 				type: 'string',
 				default: '',
-				description: 'This percentage is subtracted from the subtotal. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is subtracted from the subtotal. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Issue Date',
 				name: 'issue_date',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the invoice was issued. Defaults to today’s date.'
+				description: 'Date the invoice was issued. Defaults to today’s date.',
 			},
 			{
 				displayName: 'Number',
 				name: 'number',
 				type: 'string',
 				default: '',
-				description: 'If no value is set, the number will be automatically generated.'
+				description: 'If no value is set, the number will be automatically generated.',
 			},
 			{
 				displayName: 'Notes',
 				name: 'notes',
 				type: 'string',
 				default: '',
-				description: 'Any additional notes to include on the estimate.'
+				description: 'Any additional notes to include on the estimate.',
 			},
 			{
 				displayName: 'Purchase Order',
 				name: 'purchase_order',
 				type: 'string',
 				default: '',
-				description: 'The purchase order number.'
+				description: 'The purchase order number.',
 			},
 			{
 				displayName: 'Subject',
 				name: 'subject',
 				type: 'string',
 				default: '',
-				description: 'The estimate subject.'
+				description: 'The estimate subject.',
 			},
 			{
 				displayName: 'Tax',
 				name: 'tax',
 				type: 'string',
 				default: '',
-				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Tax2',
 				name: 'tax2',
 				type: 'string',
 				default: '',
-				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Harvest/ExpenseDescription.ts b/packages/nodes-base/nodes/Harvest/ExpenseDescription.ts
index 4af3612a0..0b78b1054 100644
--- a/packages/nodes-base/nodes/Harvest/ExpenseDescription.ts
+++ b/packages/nodes-base/nodes/Harvest/ExpenseDescription.ts
@@ -162,7 +162,7 @@ export const expenseFields = [
 			default: '',
 			description: 'Only return time entries belonging to the user with the given ID.',
 		},
-	]
+	],
 },
 
 /* -------------------------------------------------------------------------- */
@@ -276,35 +276,35 @@ export const expenseFields = [
 				name: 'billable',
 				type: 'boolean',
 				default: true,
-				description: 'Whether this expense is billable or not. Defaults to true.'
+				description: 'Whether this expense is billable or not. Defaults to true.',
 			},
 			{
 				displayName: 'Notes',
 				name: 'notes',
 				type: 'string',
 				default: '',
-				description: 'Notes about the expense.'
+				description: 'Notes about the expense.',
 			},
 			{
 				displayName: 'Total Cost',
 				name: 'total_cost',
 				type: 'string',
 				default: '',
-				description: 'The total amount of the expense.'
+				description: 'The total amount of the expense.',
 			},
 			{
 				displayName: 'Units',
 				name: 'units',
 				type: 'string',
 				default: '',
-				description: 'The quantity of units to use in calculating the total_cost of the expense.'
+				description: 'The quantity of units to use in calculating the total_cost of the expense.',
 			},
 			{
 				displayName: 'User Id',
 				name: 'user_id',
 				type: 'boolean',
 				default: true,
-				description: 'The ID of the user associated with this expense. Defaults to the ID of the currently authenticated user.'
+				description: 'The ID of the user associated with this expense. Defaults to the ID of the currently authenticated user.',
 			},
 		],
 	},
@@ -348,7 +348,7 @@ export const expenseFields = [
 				name: 'billable',
 				type: 'boolean',
 				default: true,
-				description: 'Whether this expense is billable or not. Defaults to true.'
+				description: 'Whether this expense is billable or not. Defaults to true.',
 			},
 			{
 				displayName: 'Expense Category Id',
@@ -362,7 +362,7 @@ export const expenseFields = [
 				name: 'notes',
 				type: 'string',
 				default: '',
-				description: 'Notes about the expense.'
+				description: 'Notes about the expense.',
 			},
 			{
 				displayName: 'Project Id',
@@ -383,21 +383,21 @@ export const expenseFields = [
 				name: 'total_cost',
 				type: 'string',
 				default: '',
-				description: 'The total amount of the expense.'
+				description: 'The total amount of the expense.',
 			},
 			{
 				displayName: 'Units',
 				name: 'units',
 				type: 'string',
 				default: '',
-				description: 'The quantity of units to use in calculating the total_cost of the expense.'
+				description: 'The quantity of units to use in calculating the total_cost of the expense.',
 			},
 			{
 				displayName: 'User Id',
 				name: 'user_id',
 				type: 'boolean',
 				default: true,
-				description: 'The ID of the user associated with this expense. Defaults to the ID of the currently authenticated user.'
+				description: 'The ID of the user associated with this expense. Defaults to the ID of the currently authenticated user.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
index 276405df3..2f9cec073 100644
--- a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
@@ -42,8 +42,8 @@ export async function harvestApiRequest(
 		uri: `https://api.harvestapp.com/v2/${uri}?${queryStringElements.join('&')}`,
 		json: true,
 		headers: {
-			"User-Agent": "Harvest API"
-		}
+			"User-Agent": "Harvest API",
+		},
 	};
 
 	options = Object.assign({}, options, option);
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.ts b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
index 336a7838a..c41bc400e 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.ts
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
@@ -3,22 +3,52 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { clientOperations, clientFields } from './ClientDescription';
-import { contactOperations, contactFields } from './ContactDescription';
+import {
+	clientFields,
+	clientOperations,
+} from './ClientDescription';
+import {
+	contactFields,
+	contactOperations,
+} from './ContactDescription';
 import { companyOperations } from './CompanyDescription';
-import { estimateOperations, estimateFields } from './EstimateDescription';
-import { expenseOperations, expenseFields } from './ExpenseDescription';
-import { harvestApiRequest, harvestApiRequestAllItems } from './GenericFunctions';
-import { invoiceOperations, invoiceFields } from './InvoiceDescription';
-import { projectOperations, projectFields } from './ProjectDescription';
-import { taskOperations, taskFields } from './TaskDescription';
-import { timeEntryOperations, timeEntryFields } from './TimeEntryDescription';
-import { userOperations, userFields } from './UserDescription';
+import {
+	estimateFields,
+	estimateOperations,
+} from './EstimateDescription';
+import {
+	expenseFields,
+	expenseOperations,
+} from './ExpenseDescription';
+import {
+	harvestApiRequest,
+	harvestApiRequestAllItems,
+} from './GenericFunctions';
+import {
+	invoiceFields,
+	invoiceOperations,
+} from './InvoiceDescription';
+import {
+	projectFields,
+	projectOperations,
+} from './ProjectDescription';
+import {
+	taskFields,
+	taskOperations,
+} from './TaskDescription';
+import {
+	timeEntryFields,
+	timeEntryOperations,
+} from './TimeEntryDescription';
+import {
+	userFields,
+	userOperations,
+} from './UserDescription';
 
 /**
  * fetch All resource using paginated calls
@@ -64,7 +94,7 @@ export class Harvest implements INodeType {
 			{
 				name: 'harvestApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -139,8 +169,8 @@ export class Harvest implements INodeType {
 			...projectFields,
 			...taskFields,
 			...timeEntryFields,
-			...userFields
-		]
+			...userFields,
+		],
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Harvest/InvoiceDescription.ts b/packages/nodes-base/nodes/Harvest/InvoiceDescription.ts
index 863236c6e..83c457752 100644
--- a/packages/nodes-base/nodes/Harvest/InvoiceDescription.ts
+++ b/packages/nodes-base/nodes/Harvest/InvoiceDescription.ts
@@ -172,8 +172,8 @@ export const invoiceFields = [
 			},
 			default: 1,
 			description: 'The page number to use in pagination. For instance, if you make a list request and receive 100 records, your subsequent call can include page=2 to retrieve the next page of the list. (Default: 1)',
-		}
-	]
+		},
+	],
 },
 
 /* -------------------------------------------------------------------------- */
@@ -255,91 +255,91 @@ export const invoiceFields = [
 				name: 'currency',
 				type: 'string',
 				default: '',
-				description: 'The currency used by the invoice. If not provided, the client’s currency will be used. See a list of supported currencies'
+				description: 'The currency used by the invoice. If not provided, the client’s currency will be used. See a list of supported currencies',
 			},
 			{
 				displayName: 'Discount',
 				name: 'over_budget_notification_percentage',
 				type: 'string',
 				default: '',
-				description: 'This percentage is subtracted from the subtotal. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is subtracted from the subtotal. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Due Date',
 				name: 'ends_on',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the invoice is due. Defaults to the issue_date if no payment_term is specified.'
+				description: 'Date the invoice is due. Defaults to the issue_date if no payment_term is specified.',
 			},
 			{
 				displayName: 'Estimate Id',
 				name: 'estimate_id',
 				type: 'string',
 				default: '',
-				description: 'The ID of the estimate associated with this invoice.'
+				description: 'The ID of the estimate associated with this invoice.',
 			},
 			{
 				displayName: 'Issue Date',
 				name: 'issue_date',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the invoice was issued. Defaults to today’s date.'
+				description: 'Date the invoice was issued. Defaults to today’s date.',
 			},
 			{
 				displayName: 'Notes',
 				name: 'notes',
 				type: 'string',
 				default: '',
-				description: 'Notes about the project.'
+				description: 'Notes about the project.',
 			},
 			{
 				displayName: 'Number',
 				name: 'number',
 				type: 'string',
 				default: '',
-				description: 'If no value is set, the number will be automatically generated.'
+				description: 'If no value is set, the number will be automatically generated.',
 			},
 			{
 				displayName: 'Payment Term',
 				name: 'payment_term',
 				type: 'string',
 				default: '',
-				description: 'The timeframe in which the invoice should be paid. Defaults to custom. Options: upon receipt, net 15, net 30, net 45, or net 60.'
+				description: 'The timeframe in which the invoice should be paid. Defaults to custom. Options: upon receipt, net 15, net 30, net 45, or net 60.',
 			},
 			{
 				displayName: 'Purchase Order',
 				name: 'purchase_order',
 				type: 'string',
 				default: '',
-				description: 'The purchase order number.'
+				description: 'The purchase order number.',
 			},
 			{
 				displayName: 'Retainer Id',
 				name: 'retainer_id',
 				type: 'boolean',
 				default: true,
-				description: 'The ID of the retainer associated with this invoice.'
+				description: 'The ID of the retainer associated with this invoice.',
 			},
 			{
 				displayName: 'Subject',
 				name: 'subject',
 				type: 'string',
 				default: '',
-				description: 'The invoice subject.'
+				description: 'The invoice subject.',
 			},
 			{
 				displayName: 'Tax',
 				name: 'tax',
 				type: 'string',
 				default: '',
-				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Tax2',
 				name: 'tax2',
 				type: 'string',
 				default: '',
-				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.',
 			},
 		],
 	},
@@ -390,91 +390,91 @@ export const invoiceFields = [
 				name: 'currency',
 				type: 'string',
 				default: '',
-				description: 'The currency used by the invoice. If not provided, the client’s currency will be used. See a list of supported currencies'
+				description: 'The currency used by the invoice. If not provided, the client’s currency will be used. See a list of supported currencies',
 			},
 			{
 				displayName: 'Discount',
 				name: 'over_budget_notification_percentage',
 				type: 'string',
 				default: '',
-				description: 'This percentage is subtracted from the subtotal. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is subtracted from the subtotal. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Due Date',
 				name: 'ends_on',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the invoice is due. Defaults to the issue_date if no payment_term is specified.'
+				description: 'Date the invoice is due. Defaults to the issue_date if no payment_term is specified.',
 			},
 			{
 				displayName: 'Estimate Id',
 				name: 'estimate_id',
 				type: 'string',
 				default: '',
-				description: 'The ID of the estimate associated with this invoice.'
+				description: 'The ID of the estimate associated with this invoice.',
 			},
 			{
 				displayName: 'Issue Date',
 				name: 'issue_date',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the invoice was issued. Defaults to today’s date.'
+				description: 'Date the invoice was issued. Defaults to today’s date.',
 			},
 			{
 				displayName: 'Notes',
 				name: 'notes',
 				type: 'string',
 				default: '',
-				description: 'Notes about the project.'
+				description: 'Notes about the project.',
 			},
 			{
 				displayName: 'Number',
 				name: 'number',
 				type: 'string',
 				default: '',
-				description: 'If no value is set, the number will be automatically generated.'
+				description: 'If no value is set, the number will be automatically generated.',
 			},
 			{
 				displayName: 'Payment Term',
 				name: 'payment_term',
 				type: 'string',
 				default: '',
-				description: 'The timeframe in which the invoice should be paid. Defaults to custom. Options: upon receipt, net 15, net 30, net 45, or net 60.'
+				description: 'The timeframe in which the invoice should be paid. Defaults to custom. Options: upon receipt, net 15, net 30, net 45, or net 60.',
 			},
 			{
 				displayName: 'Purchase Order',
 				name: 'purchase_order',
 				type: 'string',
 				default: '',
-				description: 'The purchase order number.'
+				description: 'The purchase order number.',
 			},
 			{
 				displayName: 'Retainer Id',
 				name: 'retainer_id',
 				type: 'boolean',
 				default: true,
-				description: 'The ID of the retainer associated with this invoice.'
+				description: 'The ID of the retainer associated with this invoice.',
 			},
 			{
 				displayName: 'Subject',
 				name: 'subject',
 				type: 'string',
 				default: '',
-				description: 'The invoice subject.'
+				description: 'The invoice subject.',
 			},
 			{
 				displayName: 'Tax',
 				name: 'tax',
 				type: 'string',
 				default: '',
-				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Tax2',
 				name: 'tax2',
 				type: 'string',
 				default: '',
-				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.'
+				description: 'This percentage is applied to the subtotal, including line items and discounts. Example: use 10.0 for 10.0%.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Harvest/ProjectDescription.ts b/packages/nodes-base/nodes/Harvest/ProjectDescription.ts
index 4910eaaf3..6a4b0d420 100644
--- a/packages/nodes-base/nodes/Harvest/ProjectDescription.ts
+++ b/packages/nodes-base/nodes/Harvest/ProjectDescription.ts
@@ -134,7 +134,7 @@ export const projectFields = [
 				default: '',
 				description: 'Only return projects by updated_since.',
 			},
-		]
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -302,98 +302,98 @@ export const projectFields = [
 					minValue: 0,
 				},
 				default: 0,
-				description: 'The budget in hours for the project when budgeting by time.'
+				description: 'The budget in hours for the project when budgeting by time.',
 			},
 			{
 				displayName: 'Budget Is Monthly',
 				name: 'budget_is_monthly',
 				type: 'boolean',
 				default: false,
-				description: 'Option to have the budget reset every month. Defaults to false.'
+				description: 'Option to have the budget reset every month. Defaults to false.',
 			},
 			{
 				displayName: 'Cost Budget',
 				name: 'cost_budget',
 				type: 'string',
 				default: '',
-				description: 'The monetary budget for the project when budgeting by money.'
+				description: 'The monetary budget for the project when budgeting by money.',
 			},
 			{
 				displayName: 'Cost Budget Include Expenses',
 				name: 'cost_budget_include_expenses',
 				type: 'boolean',
 				default: false,
-				description: 'Option for budget of Total Project Fees projects to include tracked expenses. Defaults to false.'
+				description: 'Option for budget of Total Project Fees projects to include tracked expenses. Defaults to false.',
 			},
 			{
 				displayName: 'Ends On',
 				name: 'ends_on',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the project will end.'
+				description: 'Date the project will end.',
 			},
 			{
 				displayName: 'Fee',
 				name: 'fee',
 				type: 'string',
 				default: '',
-				description: 'The amount you plan to invoice for the project. Only used by fixed-fee projects.'
+				description: 'The amount you plan to invoice for the project. Only used by fixed-fee projects.',
 			},
 			{
 				displayName: 'Hourly Rate',
 				name: 'hourly_rate',
 				type: 'string',
 				default: '',
-				description: 'Rate for projects billed by Project Hourly Rate.'
+				description: 'Rate for projects billed by Project Hourly Rate.',
 			},
 			{
 				displayName: 'Is Active',
 				name: 'is_active',
 				type: 'boolean',
 				default: true,
-				description: 'Whether the project is active or archived. Defaults to true'
+				description: 'Whether the project is active or archived. Defaults to true',
 			},
 			{
 				displayName: 'Is Fixed Fee',
 				name: 'is_fixed_fee',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the project is a fixed-fee project or not.'
+				description: 'Whether the project is a fixed-fee project or not.',
 			},
 			{
 				displayName: 'Notes',
 				name: 'notes',
 				type: 'string',
 				default: '',
-				description: 'Notes about the project.'
+				description: 'Notes about the project.',
 			},
 			{
 				displayName: 'Notify When Over Budget',
 				name: 'notify_when_over_budget',
 				type: 'boolean',
 				default: false,
-				description: 'Whether project managers should be notified when the project goes over budget. Defaults to false.'
+				description: 'Whether project managers should be notified when the project goes over budget. Defaults to false.',
 			},
 			{
 				displayName: 'Over Budget Notification Percentage',
 				name: 'over_budget_notification_percentage',
 				type: 'string',
 				default: '',
-				description: 'Percentage value used to trigger over budget email alerts. Example: use 10.0 for 10.0%.'
+				description: 'Percentage value used to trigger over budget email alerts. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Show Budget To All',
 				name: 'show_budget_to_all',
 				type: 'boolean',
 				default: false,
-				description: 'Option to show project budget to all employees. Does not apply to Total Project Fee projects. Defaults to false.'
+				description: 'Option to show project budget to all employees. Does not apply to Total Project Fee projects. Defaults to false.',
 			},
 			{
 				displayName: 'Starts On',
 				name: 'starts_on',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the project was started.'
+				description: 'Date the project was started.',
 			},
 		],
 	},
@@ -462,7 +462,7 @@ export const projectFields = [
 				name: 'budget',
 				type: 'string',
 				default: '',
-				description: 'The budget in hours for the project when budgeting by time.'
+				description: 'The budget in hours for the project when budgeting by time.',
 			},
 			{
 				displayName: 'Budget By',
@@ -476,7 +476,7 @@ export const projectFields = [
 				name: 'budget_is_monthly',
 				type: 'boolean',
 				default: false,
-				description: 'Option to have the budget reset every month. Defaults to false.'
+				description: 'Option to have the budget reset every month. Defaults to false.',
 			},
 			{
 				displayName: 'Client Id',
@@ -490,42 +490,42 @@ export const projectFields = [
 				name: 'cost_budget',
 				type: 'string',
 				default: '',
-				description: 'The monetary budget for the project when budgeting by money.'
+				description: 'The monetary budget for the project when budgeting by money.',
 			},
 			{
 				displayName: 'Cost Budget Include Expenses',
 				name: 'cost_budget_include_expenses',
 				type: 'boolean',
 				default: false,
-				description: 'Option for budget of Total Project Fees projects to include tracked expenses. Defaults to false.'
+				description: 'Option for budget of Total Project Fees projects to include tracked expenses. Defaults to false.',
 			},
 			{
 				displayName: 'Ends On',
 				name: 'ends_on',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the project will end.'
+				description: 'Date the project will end.',
 			},
 			{
 				displayName: 'Fee',
 				name: 'fee',
 				type: 'string',
 				default: '',
-				description: 'The amount you plan to invoice for the project. Only used by fixed-fee projects.'
+				description: 'The amount you plan to invoice for the project. Only used by fixed-fee projects.',
 			},
 			{
 				displayName: 'Hourly Rate',
 				name: 'hourly_rate',
 				type: 'string',
 				default: '',
-				description: 'Rate for projects billed by Project Hourly Rate.'
+				description: 'Rate for projects billed by Project Hourly Rate.',
 			},
 			{
 				displayName: 'Is Active',
 				name: 'is_active',
 				type: 'boolean',
 				default: true,
-				description: 'Whether the project is active or archived. Defaults to true'
+				description: 'Whether the project is active or archived. Defaults to true',
 			},
 			{
 				displayName: 'Is Billable',
@@ -539,7 +539,7 @@ export const projectFields = [
 				name: 'is_fixed_fee',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the project is a fixed-fee project or not.'
+				description: 'Whether the project is a fixed-fee project or not.',
 			},
 			{
 				displayName: 'Name',
@@ -553,28 +553,28 @@ export const projectFields = [
 				name: 'notes',
 				type: 'string',
 				default: '',
-				description: 'Notes about the project.'
+				description: 'Notes about the project.',
 			},
 			{
 				displayName: 'Notify When Over Budget',
 				name: 'notify_when_over_budget',
 				type: 'boolean',
 				default: false,
-				description: 'Whether project managers should be notified when the project goes over budget. Defaults to false.'
+				description: 'Whether project managers should be notified when the project goes over budget. Defaults to false.',
 			},
 			{
 				displayName: 'Over Budget Notification Percentage',
 				name: 'over_budget_notification_percentage',
 				type: 'string',
 				default: '',
-				description: 'Percentage value used to trigger over budget email alerts. Example: use 10.0 for 10.0%.'
+				description: 'Percentage value used to trigger over budget email alerts. Example: use 10.0 for 10.0%.',
 			},
 			{
 				displayName: 'Show Budget To All',
 				name: 'show_budget_to_all',
 				type: 'boolean',
 				default: false,
-				description: 'Option to show project budget to all employees. Does not apply to Total Project Fee projects. Defaults to false.'
+				description: 'Option to show project budget to all employees. Does not apply to Total Project Fee projects. Defaults to false.',
 			},
 
 			{
@@ -582,7 +582,7 @@ export const projectFields = [
 				name: 'starts_on',
 				type: 'dateTime',
 				default: '',
-				description: 'Date the project was started.'
+				description: 'Date the project was started.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Harvest/TaskDescription.ts b/packages/nodes-base/nodes/Harvest/TaskDescription.ts
index 33ff7e918..2be01d5fe 100644
--- a/packages/nodes-base/nodes/Harvest/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Harvest/TaskDescription.ts
@@ -125,7 +125,7 @@ export const taskFields = [
 				default: '',
 				description: 'Only return tasks belonging to the task with the given ID.',
 			},
-		]
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -207,28 +207,28 @@ export const taskFields = [
 				name: 'billable_by_default',
 				type: 'boolean',
 				default: '',
-				description: 'Used in determining whether default tasks should be marked billable when creating a new project. Defaults to true.'
+				description: 'Used in determining whether default tasks should be marked billable when creating a new project. Defaults to true.',
 			},
 			{
 				displayName: 'Default Hourly Rate',
 				name: 'default_hourly_rate',
 				type: 'string',
 				default: '0',
-				description: 'The default hourly rate to use for this task when it is added to a project. Defaults to 0.'
+				description: 'The default hourly rate to use for this task when it is added to a project. Defaults to 0.',
 			},
 			{
 				displayName: 'Is Default',
 				name: 'is_default',
 				type: 'boolean',
 				default: false,
-				description: 'Whether this task should be automatically added to future projects. Defaults to false.'
+				description: 'Whether this task should be automatically added to future projects. Defaults to false.',
 			},
 			{
 				displayName: 'Is Active',
 				name: 'is_active',
 				type: 'boolean',
 				default: true,
-				description: 'Whether this task is active or archived. Defaults to true'
+				description: 'Whether this task is active or archived. Defaults to true',
 			},
 		],
 	},
@@ -256,35 +256,35 @@ export const taskFields = [
 				name: 'billable_by_default',
 				type: 'boolean',
 				default: '',
-				description: 'Used in determining whether default tasks should be marked billable when creating a new project. Defaults to true.'
+				description: 'Used in determining whether default tasks should be marked billable when creating a new project. Defaults to true.',
 			},
 			{
 				displayName: 'Default Hourly Rate',
 				name: 'default_hourly_rate',
 				type: 'string',
 				default: '0',
-				description: 'The default hourly rate to use for this task when it is added to a project. Defaults to 0.'
+				description: 'The default hourly rate to use for this task when it is added to a project. Defaults to 0.',
 			},
 			{
 				displayName: 'Is Active',
 				name: 'is_active',
 				type: 'boolean',
 				default: true,
-				description: 'Whether this task is active or archived. Defaults to true'
+				description: 'Whether this task is active or archived. Defaults to true',
 			},
 			{
 				displayName: 'Is Default',
 				name: 'is_default',
 				type: 'boolean',
 				default: false,
-				description: 'Whether this task should be automatically added to future projects. Defaults to false.'
+				description: 'Whether this task should be automatically added to future projects. Defaults to false.',
 			},
 			{
 				displayName: 'Name',
 				name: 'name',
 				type: 'string',
 				default: '',
-				description: 'Name of the task.'
+				description: 'Name of the task.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Harvest/UserDescription.ts b/packages/nodes-base/nodes/Harvest/UserDescription.ts
index ea434c3ca..0254825b1 100644
--- a/packages/nodes-base/nodes/Harvest/UserDescription.ts
+++ b/packages/nodes-base/nodes/Harvest/UserDescription.ts
@@ -132,8 +132,8 @@ export const userFields = [
 				},
 				default: 1,
 				description: 'The page number to use in pagination..',
-			}
-		]
+			},
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -247,21 +247,21 @@ export const userFields = [
 				name: 'can_create_projects',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user can create projects. Only applicable to Project Managers.'
+				description: 'Whether the user can create projects. Only applicable to Project Managers.',
 			},
 			{
 				displayName: 'Can Create Invoices',
 				name: 'can_create_invoices',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user can create invoices. Only applicable to Project Managers.'
+				description: 'Whether the user can create invoices. Only applicable to Project Managers.',
 			},
 			{
 				displayName: 'Can See Rates',
 				name: 'can_see_rates',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user can see billable rates on projects. Only applicable to Project Managers.'
+				description: 'Whether the user can see billable rates on projects. Only applicable to Project Managers.',
 			},
 			{
 				displayName: 'Cost Rate',
@@ -271,63 +271,63 @@ export const userFields = [
 					minValue: 0,
 				},
 				default: 0,
-				description: 'The cost rate to use for this user when calculating a project’s costs vs billable amount.'
+				description: 'The cost rate to use for this user when calculating a project’s costs vs billable amount.',
 			},
 			{
 				displayName: 'Default Hourly Rate',
 				name: 'default_hourly_rate',
 				type: 'string',
 				default: '0',
-				description: 'The billable rate to use for this user when they are added to a project.'
+				description: 'The billable rate to use for this user when they are added to a project.',
 			},
 			{
 				displayName: 'Has Access To All Future Projects',
 				name: 'has_access_to_all_future_projects',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user should be automatically added to future projects.'
+				description: 'Whether the user should be automatically added to future projects.',
 			},
 			{
 				displayName: 'Is Active',
 				name: 'is_active',
 				type: 'boolean',
 				default: true,
-				description: 'Whether the user is active or archived.'
+				description: 'Whether the user is active or archived.',
 			},
 			{
 				displayName: 'Is Admin',
 				name: 'is_admin',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user has Admin permissions.'
+				description: 'Whether the user has Admin permissions.',
 			},
 			{
 				displayName: 'Is Contractor',
 				name: 'is_contractor',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user is a contractor or an employee.'
+				description: 'Whether the user is a contractor or an employee.',
 			},
 			{
 				displayName: 'Is Project Manager',
 				name: 'is_project_manager',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user has Project Manager permissions.'
+				description: 'Whether the user has Project Manager permissions.',
 			},
 			{
 				displayName: 'Roles',
 				name: 'roles',
 				type: 'string',
 				default: '',
-				description: 'The role names assigned to this person.'
+				description: 'The role names assigned to this person.',
 			},
 			{
 				displayName: 'Timezone',
 				name: 'timezone',
 				type: 'string',
 				default: '',
-				description: 'The user’s timezone. Defaults to the company’s timezone. See a list of <a href="/api-v2/introduction/overview/supported-timezones/">supported time zones</a>.'
+				description: 'The user’s timezone. Defaults to the company’s timezone. See a list of <a href="/api-v2/introduction/overview/supported-timezones/">supported time zones</a>.',
 			},
 			{
 				displayName: 'Weekly Capacity',
@@ -337,7 +337,7 @@ export const userFields = [
 					minValue: 0,
 				},
 				default: 126000,
-				description: 'The number of hours per week this person is available to work in seconds. Defaults to <code class="language-plaintext highlighter-rouge">126000</code> seconds (35 hours).'
+				description: 'The number of hours per week this person is available to work in seconds. Defaults to <code class="language-plaintext highlighter-rouge">126000</code> seconds (35 hours).',
 			},
 		],
 	},
@@ -372,7 +372,7 @@ export const userFields = [
 				operation: [
 					'update',
 				],
-				resource
+				resource,
 			},
 		},
 		default: {},
@@ -382,21 +382,21 @@ export const userFields = [
 				name: 'can_create_projects',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user can create projects. Only applicable to Project Managers.'
+				description: 'Whether the user can create projects. Only applicable to Project Managers.',
 			},
 			{
 				displayName: 'Can Create Invoices',
 				name: 'can_create_invoices',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user can create invoices. Only applicable to Project Managers.'
+				description: 'Whether the user can create invoices. Only applicable to Project Managers.',
 			},
 			{
 				displayName: 'Can See Rates',
 				name: 'can_see_rates',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user can see billable rates on projects. Only applicable to Project Managers.'
+				description: 'Whether the user can see billable rates on projects. Only applicable to Project Managers.',
 			},
 			{
 				displayName: 'Cost Rate',
@@ -406,84 +406,84 @@ export const userFields = [
 					minValue: 0,
 				},
 				default: 0,
-				description: 'The cost rate to use for this user when calculating a project’s costs vs billable amount.'
+				description: 'The cost rate to use for this user when calculating a project’s costs vs billable amount.',
 			},
 			{
 				displayName: 'Default Hourly Rate',
 				name: 'default_hourly_rate',
 				type: 'string',
 				default: '0',
-				description: 'The billable rate to use for this user when they are added to a project.'
+				description: 'The billable rate to use for this user when they are added to a project.',
 			},
 			{
 				displayName: 'Email',
 				name: 'email',
 				type: 'string',
 				default: '',
-				description: 'The user email'
+				description: 'The user email',
 			},
 			{
 				displayName: 'First Name',
 				name: 'first_name',
 				type: 'string',
 				default: '',
-				description: 'The user first name'
+				description: 'The user first name',
 			},
 			{
 				displayName: 'Has Access To All Future Projects',
 				name: 'has_access_to_all_future_projects',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user should be automatically added to future projects.'
+				description: 'Whether the user should be automatically added to future projects.',
 			},
 			{
 				displayName: 'Is Active',
 				name: 'is_active',
 				type: 'boolean',
 				default: true,
-				description: 'Whether the user is active or archived.'
+				description: 'Whether the user is active or archived.',
 			},
 			{
 				displayName: 'Is Admin',
 				name: 'is_admin',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user has Admin permissions.'
+				description: 'Whether the user has Admin permissions.',
 			},
 			{
 				displayName: 'Is Contractor',
 				name: 'is_contractor',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user is a contractor or an employee.'
+				description: 'Whether the user is a contractor or an employee.',
 			},
 			{
 				displayName: 'Is Project Manager',
 				name: 'is_project_manager',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the user has Project Manager permissions.'
+				description: 'Whether the user has Project Manager permissions.',
 			},
 			{
 				displayName: 'Last Name',
 				name: 'last_name',
 				type: 'string',
 				default: '',
-				description: 'The user last name'
+				description: 'The user last name',
 			},
 			{
 				displayName: 'Roles',
 				name: 'roles',
 				type: 'string',
 				default: '',
-				description: 'The role names assigned to this person.'
+				description: 'The role names assigned to this person.',
 			},
 			{
 				displayName: 'Timezone',
 				name: 'timezone',
 				type: 'string',
 				default: '',
-				description: 'The user’s timezone. Defaults to the company’s timezone. See a list of <a href="/api-v2/introduction/overview/supported-timezones/">supported time zones</a>.'
+				description: 'The user’s timezone. Defaults to the company’s timezone. See a list of <a href="/api-v2/introduction/overview/supported-timezones/">supported time zones</a>.',
 			},
 			{
 				displayName: 'Weekly Capacity',
@@ -493,7 +493,7 @@ export const userFields = [
 					minValue: 0,
 				},
 				default: 126000,
-				description: 'The number of hours per week this person is available to work in seconds. Defaults to <code class="language-plaintext highlighter-rouge">126000</code> seconds (35 hours).'
+				description: 'The number of hours per week this person is available to work in seconds. Defaults to <code class="language-plaintext highlighter-rouge">126000</code> seconds (35 hours).',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts b/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
index 1ab9dd88e..2d49afe4f 100644
--- a/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
+++ b/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
@@ -248,7 +248,7 @@ export const conversationFields = [
 				default: 0,
 				description: 'ID of the user who is adding the conversation and threads.',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Threads',
@@ -281,23 +281,23 @@ export const conversationFields = [
 						options: [
 							{
 								name: 'Chat',
-								value: 'chat'
+								value: 'chat',
 							},
 							{
 								name: 'Customer',
-								value: 'customer'
+								value: 'customer',
 							},
 							{
 								name: 'Note',
-								value: 'note'
+								value: 'note',
 							},
 							{
 								name: 'Phone',
-								value: 'phone'
+								value: 'phone',
 							},
 							{
 								name: 'Reply',
-								value: 'reply'
+								value: 'reply',
 							},
 						],
 						default: '',
@@ -307,10 +307,10 @@ export const conversationFields = [
 						name: 'text',
 						type: 'string',
 						typeOptions: {
-							alwaysOpenEditWindow: true
+							alwaysOpenEditWindow: true,
 						},
 						default: '',
-						description: 'The message text.'
+						description: 'The message text.',
 					},
 					{
 						displayName: 'Bcc',
@@ -318,7 +318,7 @@ export const conversationFields = [
 						displayOptions: {
 							show: {
 								type: [
-									'customer'
+									'customer',
 								],
 							},
 						},
@@ -328,7 +328,7 @@ export const conversationFields = [
 							multipleValueButtonText: 'Add Email',
 						},
 						default: [],
-						description: 'Email addresses.'
+						description: 'Email addresses.',
 					},
 					{
 						displayName: 'Cc',
@@ -336,7 +336,7 @@ export const conversationFields = [
 						displayOptions: {
 							show: {
 								type: [
-									'customer'
+									'customer',
 								],
 							},
 						},
@@ -346,7 +346,7 @@ export const conversationFields = [
 							multipleValueButtonText: 'Add Email',
 						},
 						default: [],
-						description: 'Email addresses.'
+						description: 'Email addresses.',
 					},
 					{
 						displayName: 'Draft',
@@ -354,7 +354,7 @@ export const conversationFields = [
 						displayOptions: {
 							show: {
 								type: [
-									'reply'
+									'reply',
 								],
 							},
 						},
@@ -527,7 +527,7 @@ export const conversationFields = [
 					alwaysOpenEditWindow: true,
 				},
 				default: '',
-				description: 'Advanced search <a href="https://developer.helpscout.com/mailbox-api/endpoints/conversations/list/#query">Examples</a>'
+				description: 'Advanced search <a href="https://developer.helpscout.com/mailbox-api/endpoints/conversations/list/#query">Examples</a>',
 			},
 			{
 				displayName: 'Sort Field',
diff --git a/packages/nodes-base/nodes/HelpScout/CountriesCodes.ts b/packages/nodes-base/nodes/HelpScout/CountriesCodes.ts
index 3c41a76c7..4c37abc6b 100644
--- a/packages/nodes-base/nodes/HelpScout/CountriesCodes.ts
+++ b/packages/nodes-base/nodes/HelpScout/CountriesCodes.ts
@@ -3,291 +3,291 @@ export const countriesCodes = [
 		'name': 'Afghanistan',
 		'alpha2': 'AF',
 		'alpha3': 'AFG',
-		'numeric': '004'
+		'numeric': '004',
 	},
 	{
 		'name': 'Åland Islands',
 		'alpha2': 'AX',
 		'alpha3': 'ALA',
 		'numeric': '248',
-		'altName': 'Aland Islands'
+		'altName': 'Aland Islands',
 	},
 	{
 		'name': 'Albania',
 		'alpha2': 'AL',
 		'alpha3': 'ALB',
-		'numeric': '008'
+		'numeric': '008',
 	},
 	{
 		'name': 'Algeria',
 		'alpha2': 'DZ',
 		'alpha3': 'DZA',
-		'numeric': '012'
+		'numeric': '012',
 	},
 	{
 		'name': 'American Samoa',
 		'alpha2': 'AS',
 		'alpha3': 'ASM',
-		'numeric': '016'
+		'numeric': '016',
 	},
 	{
 		'name': 'Andorra',
 		'alpha2': 'AD',
 		'alpha3': 'AND',
-		'numeric': '020'
+		'numeric': '020',
 	},
 	{
 		'name': 'Angola',
 		'alpha2': 'AO',
 		'alpha3': 'AGO',
-		'numeric': '024'
+		'numeric': '024',
 	},
 	{
 		'name': 'Anguilla',
 		'alpha2': 'AI',
 		'alpha3': 'AIA',
-		'numeric': '660'
+		'numeric': '660',
 	},
 	{
 		'name': 'Antarctica',
 		'alpha2': 'AQ',
 		'alpha3': 'ATA',
-		'numeric': '010'
+		'numeric': '010',
 	},
 	{
 		'name': 'Antigua and Barbuda',
 		'alpha2': 'AG',
 		'alpha3': 'ATG',
-		'numeric': '028'
+		'numeric': '028',
 	},
 	{
 		'name': 'Argentina',
 		'alpha2': 'AR',
 		'alpha3': 'ARG',
-		'numeric': '032'
+		'numeric': '032',
 	},
 	{
 		'name': 'Armenia',
 		'alpha2': 'AM',
 		'alpha3': 'ARM',
-		'numeric': '051'
+		'numeric': '051',
 	},
 	{
 		'name': 'Aruba',
 		'alpha2': 'AW',
 		'alpha3': 'ABW',
-		'numeric': '533'
+		'numeric': '533',
 	},
 	{
 		'name': 'Australia',
 		'alpha2': 'AU',
 		'alpha3': 'AUS',
-		'numeric': '036'
+		'numeric': '036',
 	},
 	{
 		'name': 'Austria',
 		'alpha2': 'AT',
 		'alpha3': 'AUT',
-		'numeric': '040'
+		'numeric': '040',
 	},
 	{
 		'name': 'Azerbaijan',
 		'alpha2': 'AZ',
 		'alpha3': 'AZE',
-		'numeric': '031'
+		'numeric': '031',
 	},
 	{
 		'name': 'Bahamas (the)',
 		'alpha2': 'BS',
 		'alpha3': 'BHS',
 		'numeric': '044',
-		'altName': 'Bahamas'
+		'altName': 'Bahamas',
 	},
 	{
 		'name': 'Bahrain',
 		'alpha2': 'BH',
 		'alpha3': 'BHR',
-		'numeric': '048'
+		'numeric': '048',
 	},
 	{
 		'name': 'Bangladesh',
 		'alpha2': 'BD',
 		'alpha3': 'BGD',
-		'numeric': '050'
+		'numeric': '050',
 	},
 	{
 		'name': 'Barbados',
 		'alpha2': 'BB',
 		'alpha3': 'BRB',
-		'numeric': '052'
+		'numeric': '052',
 	},
 	{
 		'name': 'Belarus',
 		'alpha2': 'BY',
 		'alpha3': 'BLR',
-		'numeric': '112'
+		'numeric': '112',
 	},
 	{
 		'name': 'Belgium',
 		'alpha2': 'BE',
 		'alpha3': 'BEL',
-		'numeric': '056'
+		'numeric': '056',
 	},
 	{
 		'name': 'Belize',
 		'alpha2': 'BZ',
 		'alpha3': 'BLZ',
-		'numeric': '084'
+		'numeric': '084',
 	},
 	{
 		'name': 'Benin',
 		'alpha2': 'BJ',
 		'alpha3': 'BEN',
-		'numeric': '204'
+		'numeric': '204',
 	},
 	{
 		'name': 'Bermuda',
 		'alpha2': 'BM',
 		'alpha3': 'BMU',
-		'numeric': '060'
+		'numeric': '060',
 	},
 	{
 		'name': 'Bhutan',
 		'alpha2': 'BT',
 		'alpha3': 'BTN',
-		'numeric': '064'
+		'numeric': '064',
 	},
 	{
 		'name': 'Bolivia (Plurinational State of)',
 		'alpha2': 'BO',
 		'alpha3': 'BOL',
 		'numeric': '068',
-		'altName': 'Bolivia'
+		'altName': 'Bolivia',
 	},
 	{
 		'name': 'Bonaire, Sint Eustatius and Saba',
 		'alpha2': 'BQ',
 		'alpha3': 'BES',
-		'numeric': '535'
+		'numeric': '535',
 	},
 	{
 		'name': 'Bosnia and Herzegovina',
 		'alpha2': 'BA',
 		'alpha3': 'BIH',
-		'numeric': '070'
+		'numeric': '070',
 	},
 	{
 		'name': 'Botswana',
 		'alpha2': 'BW',
 		'alpha3': 'BWA',
-		'numeric': '072'
+		'numeric': '072',
 	},
 	{
 		'name': 'Bouvet Island',
 		'alpha2': 'BV',
 		'alpha3': 'BVT',
-		'numeric': '074'
+		'numeric': '074',
 	},
 	{
 		'name': 'Brazil',
 		'alpha2': 'BR',
 		'alpha3': 'BRA',
-		'numeric': '076'
+		'numeric': '076',
 	},
 	{
 		'name': 'British Indian Ocean Territory (the)',
 		'alpha2': 'IO',
 		'alpha3': 'IOT',
 		'numeric': '086',
-		'altName': 'British Indian Ocean Territory'
+		'altName': 'British Indian Ocean Territory',
 	},
 	{
 		'name': 'Brunei Darussalam',
 		'alpha2': 'BN',
 		'alpha3': 'BRN',
 		'numeric': '096',
-		'shortName': 'Brunei'
+		'shortName': 'Brunei',
 	},
 	{
 		'name': 'Bulgaria',
 		'alpha2': 'BG',
 		'alpha3': 'BGR',
-		'numeric': '100'
+		'numeric': '100',
 	},
 	{
 		'name': 'Burkina Faso',
 		'alpha2': 'BF',
 		'alpha3': 'BFA',
-		'numeric': '854'
+		'numeric': '854',
 	},
 	{
 		'name': 'Burundi',
 		'alpha2': 'BI',
 		'alpha3': 'BDI',
-		'numeric': '108'
+		'numeric': '108',
 	},
 	{
 		'name': 'Cabo Verde',
 		'alpha2': 'CV',
 		'alpha3': 'CPV',
 		'numeric': '132',
-		'altName': 'Cape Verde'
+		'altName': 'Cape Verde',
 	},
 	{
 		'name': 'Cambodia',
 		'alpha2': 'KH',
 		'alpha3': 'KHM',
-		'numeric': '116'
+		'numeric': '116',
 	},
 	{
 		'name': 'Cameroon',
 		'alpha2': 'CM',
 		'alpha3': 'CMR',
-		'numeric': '120'
+		'numeric': '120',
 	},
 	{
 		'name': 'Canada',
 		'alpha2': 'CA',
 		'alpha3': 'CAN',
-		'numeric': '124'
+		'numeric': '124',
 	},
 	{
 		'name': 'Cayman Islands (the)',
 		'alpha2': 'KY',
 		'alpha3': 'CYM',
 		'numeric': '136',
-		'altName': 'Cayman Islands'
+		'altName': 'Cayman Islands',
 	},
 	{
 		'name': 'Central African Republic (the)',
 		'alpha2': 'CF',
 		'alpha3': 'CAF',
 		'numeric': '140',
-		'altName': 'Central African Republic'
+		'altName': 'Central African Republic',
 	},
 	{
 		'name': 'Chad',
 		'alpha2': 'TD',
 		'alpha3': 'TCD',
-		'numeric': '148'
+		'numeric': '148',
 	},
 	{
 		'name': 'Chile',
 		'alpha2': 'CL',
 		'alpha3': 'CHL',
-		'numeric': '152'
+		'numeric': '152',
 	},
 	{
 		'name': 'China',
 		'alpha2': 'CN',
 		'alpha3': 'CHN',
-		'numeric': '156'
+		'numeric': '156',
 	},
 	{
 		'name': 'Christmas Island',
 		'alpha2': 'CX',
 		'alpha3': 'CXR',
-		'numeric': '162'
+		'numeric': '162',
 	},
 	{
 		'name': 'Cocos (Keeling) Islands (the)',
@@ -295,20 +295,20 @@ export const countriesCodes = [
 		'alpha3': 'CCK',
 		'numeric': '166',
 		'altName': 'Cocos (Keeling) Islands',
-		'shortName': 'Cocos Islands'
+		'shortName': 'Cocos Islands',
 	},
 	{
 		'name': 'Colombia',
 		'alpha2': 'CO',
 		'alpha3': 'COL',
-		'numeric': '170'
+		'numeric': '170',
 	},
 	{
 		'name': 'Comoros (the)',
 		'alpha2': 'KM',
 		'alpha3': 'COM',
 		'numeric': '174',
-		'altName': 'Comoros'
+		'altName': 'Comoros',
 	},
 	{
 		'name': 'Congo (the Democratic Republic of the)',
@@ -316,7 +316,7 @@ export const countriesCodes = [
 		'alpha3': 'COD',
 		'numeric': '180',
 		'altName': 'Congo, (Kinshasa)',
-		'shortName': 'Democratic Republic of the Congo'
+		'shortName': 'Democratic Republic of the Congo',
 	},
 	{
 		'name': 'Congo (the)',
@@ -324,126 +324,126 @@ export const countriesCodes = [
 		'alpha3': 'COG',
 		'numeric': '178',
 		'altName': 'Congo (Brazzaville)',
-		'shortName': 'Republic of the Congo'
+		'shortName': 'Republic of the Congo',
 	},
 	{
 		'name': 'Cook Islands (the)',
 		'alpha2': 'CK',
 		'alpha3': 'COK',
 		'numeric': '184',
-		'altName': 'Cook Islands'
+		'altName': 'Cook Islands',
 	},
 	{
 		'name': 'Costa Rica',
 		'alpha2': 'CR',
 		'alpha3': 'CRI',
-		'numeric': '188'
+		'numeric': '188',
 	},
 	{
 		'name': 'Côte d\'Ivoire',
 		'alpha2': 'CI',
 		'alpha3': 'CIV',
 		'numeric': '384',
-		'shortName': 'Ivory Coast'
+		'shortName': 'Ivory Coast',
 	},
 	{
 		'name': 'Croatia',
 		'alpha2': 'HR',
 		'alpha3': 'HRV',
-		'numeric': '191'
+		'numeric': '191',
 	},
 	{
 		'name': 'Cuba',
 		'alpha2': 'CU',
 		'alpha3': 'CUB',
-		'numeric': '192'
+		'numeric': '192',
 	},
 	{
 		'name': 'Curaçao',
 		'alpha2': 'CW',
 		'alpha3': 'CUW',
 		'numeric': '531',
-		'shortName': 'Curacao'
+		'shortName': 'Curacao',
 	},
 	{
 		'name': 'Cyprus',
 		'alpha2': 'CY',
 		'alpha3': 'CYP',
-		'numeric': '196'
+		'numeric': '196',
 	},
 	{
 		'name': 'Czechia',
 		'alpha2': 'CZ',
 		'alpha3': 'CZE',
 		'numeric': '203',
-		'altName': 'Czech Republic'
+		'altName': 'Czech Republic',
 	},
 	{
 		'name': 'Denmark',
 		'alpha2': 'DK',
 		'alpha3': 'DNK',
-		'numeric': '208'
+		'numeric': '208',
 	},
 	{
 		'name': 'Djibouti',
 		'alpha2': 'DJ',
 		'alpha3': 'DJI',
-		'numeric': '262'
+		'numeric': '262',
 	},
 	{
 		'name': 'Dominica',
 		'alpha2': 'DM',
 		'alpha3': 'DMA',
-		'numeric': '212'
+		'numeric': '212',
 	},
 	{
 		'name': 'Dominican Republic (the)',
 		'alpha2': 'DO',
 		'alpha3': 'DOM',
 		'numeric': '214',
-		'altName': 'Dominican Republic'
+		'altName': 'Dominican Republic',
 	},
 	{
 		'name': 'Ecuador',
 		'alpha2': 'EC',
 		'alpha3': 'ECU',
-		'numeric': '218'
+		'numeric': '218',
 	},
 	{
 		'name': 'Egypt',
 		'alpha2': 'EG',
 		'alpha3': 'EGY',
-		'numeric': '818'
+		'numeric': '818',
 	},
 	{
 		'name': 'El Salvador',
 		'alpha2': 'SV',
 		'alpha3': 'SLV',
-		'numeric': '222'
+		'numeric': '222',
 	},
 	{
 		'name': 'Equatorial Guinea',
 		'alpha2': 'GQ',
 		'alpha3': 'GNQ',
-		'numeric': '226'
+		'numeric': '226',
 	},
 	{
 		'name': 'Eritrea',
 		'alpha2': 'ER',
 		'alpha3': 'ERI',
-		'numeric': '232'
+		'numeric': '232',
 	},
 	{
 		'name': 'Estonia',
 		'alpha2': 'EE',
 		'alpha3': 'EST',
-		'numeric': '233'
+		'numeric': '233',
 	},
 	{
 		'name': 'Ethiopia',
 		'alpha2': 'ET',
 		'alpha3': 'ETH',
-		'numeric': '231'
+		'numeric': '231',
 	},
 	{
 		'name': 'Falkland Islands (the) [Malvinas]',
@@ -451,161 +451,161 @@ export const countriesCodes = [
 		'alpha3': 'FLK',
 		'numeric': '238',
 		'altName': 'Falkland Islands (Malvinas)',
-		'shortName': 'Falkland Islands'
+		'shortName': 'Falkland Islands',
 	},
 	{
 		'name': 'Faroe Islands (the)',
 		'alpha2': 'FO',
 		'alpha3': 'FRO',
 		'numeric': '234',
-		'altName': 'Faroe Islands'
+		'altName': 'Faroe Islands',
 	},
 	{
 		'name': 'Fiji',
 		'alpha2': 'FJ',
 		'alpha3': 'FJI',
-		'numeric': '242'
+		'numeric': '242',
 	},
 	{
 		'name': 'Finland',
 		'alpha2': 'FI',
 		'alpha3': 'FIN',
-		'numeric': '246'
+		'numeric': '246',
 	},
 	{
 		'name': 'France',
 		'alpha2': 'FR',
 		'alpha3': 'FRA',
-		'numeric': '250'
+		'numeric': '250',
 	},
 	{
 		'name': 'French Guiana',
 		'alpha2': 'GF',
 		'alpha3': 'GUF',
-		'numeric': '254'
+		'numeric': '254',
 	},
 	{
 		'name': 'French Polynesia',
 		'alpha2': 'PF',
 		'alpha3': 'PYF',
-		'numeric': '258'
+		'numeric': '258',
 	},
 	{
 		'name': 'French Southern Territories (the)',
 		'alpha2': 'TF',
 		'alpha3': 'ATF',
 		'numeric': '260',
-		'altName': 'French Southern Territories'
+		'altName': 'French Southern Territories',
 	},
 	{
 		'name': 'Gabon',
 		'alpha2': 'GA',
 		'alpha3': 'GAB',
-		'numeric': '266'
+		'numeric': '266',
 	},
 	{
 		'name': 'Gambia (the)',
 		'alpha2': 'GM',
 		'alpha3': 'GMB',
 		'numeric': '270',
-		'altName': 'Gambia'
+		'altName': 'Gambia',
 	},
 	{
 		'name': 'Georgia',
 		'alpha2': 'GE',
 		'alpha3': 'GEO',
-		'numeric': '268'
+		'numeric': '268',
 	},
 	{
 		'name': 'Germany',
 		'alpha2': 'DE',
 		'alpha3': 'DEU',
-		'numeric': '276'
+		'numeric': '276',
 	},
 	{
 		'name': 'Ghana',
 		'alpha2': 'GH',
 		'alpha3': 'GHA',
-		'numeric': '288'
+		'numeric': '288',
 	},
 	{
 		'name': 'Gibraltar',
 		'alpha2': 'GI',
 		'alpha3': 'GIB',
-		'numeric': '292'
+		'numeric': '292',
 	},
 	{
 		'name': 'Greece',
 		'alpha2': 'GR',
 		'alpha3': 'GRC',
-		'numeric': '300'
+		'numeric': '300',
 	},
 	{
 		'name': 'Greenland',
 		'alpha2': 'GL',
 		'alpha3': 'GRL',
-		'numeric': '304'
+		'numeric': '304',
 	},
 	{
 		'name': 'Grenada',
 		'alpha2': 'GD',
 		'alpha3': 'GRD',
-		'numeric': '308'
+		'numeric': '308',
 	},
 	{
 		'name': 'Guadeloupe',
 		'alpha2': 'GP',
 		'alpha3': 'GLP',
-		'numeric': '312'
+		'numeric': '312',
 	},
 	{
 		'name': 'Guam',
 		'alpha2': 'GU',
 		'alpha3': 'GUM',
-		'numeric': '316'
+		'numeric': '316',
 	},
 	{
 		'name': 'Guatemala',
 		'alpha2': 'GT',
 		'alpha3': 'GTM',
-		'numeric': '320'
+		'numeric': '320',
 	},
 	{
 		'name': 'Guernsey',
 		'alpha2': 'GG',
 		'alpha3': 'GGY',
-		'numeric': '831'
+		'numeric': '831',
 	},
 	{
 		'name': 'Guinea',
 		'alpha2': 'GN',
 		'alpha3': 'GIN',
-		'numeric': '324'
+		'numeric': '324',
 	},
 	{
 		'name': 'Guinea-Bissau',
 		'alpha2': 'GW',
 		'alpha3': 'GNB',
-		'numeric': '624'
+		'numeric': '624',
 	},
 	{
 		'name': 'Guyana',
 		'alpha2': 'GY',
 		'alpha3': 'GUY',
-		'numeric': '328'
+		'numeric': '328',
 	},
 	{
 		'name': 'Haiti',
 		'alpha2': 'HT',
 		'alpha3': 'HTI',
-		'numeric': '332'
+		'numeric': '332',
 	},
 	{
 		'name': 'Heard Island and McDonald Islands',
 		'alpha2': 'HM',
 		'alpha3': 'HMD',
 		'numeric': '334',
-		'altName': 'Heard and Mcdonald Islands'
+		'altName': 'Heard and Mcdonald Islands',
 	},
 	{
 		'name': 'Holy See (the)',
@@ -613,44 +613,44 @@ export const countriesCodes = [
 		'alpha3': 'VAT',
 		'numeric': '336',
 		'altName': 'Holy See (Vatican City State)',
-		'shortName': 'Vatican'
+		'shortName': 'Vatican',
 	},
 	{
 		'name': 'Honduras',
 		'alpha2': 'HN',
 		'alpha3': 'HND',
-		'numeric': '340'
+		'numeric': '340',
 	},
 	{
 		'name': 'Hong Kong',
 		'alpha2': 'HK',
 		'alpha3': 'HKG',
 		'numeric': '344',
-		'altName': 'Hong Kong, SAR China'
+		'altName': 'Hong Kong, SAR China',
 	},
 	{
 		'name': 'Hungary',
 		'alpha2': 'HU',
 		'alpha3': 'HUN',
-		'numeric': '348'
+		'numeric': '348',
 	},
 	{
 		'name': 'Iceland',
 		'alpha2': 'IS',
 		'alpha3': 'ISL',
-		'numeric': '352'
+		'numeric': '352',
 	},
 	{
 		'name': 'India',
 		'alpha2': 'IN',
 		'alpha3': 'IND',
-		'numeric': '356'
+		'numeric': '356',
 	},
 	{
 		'name': 'Indonesia',
 		'alpha2': 'ID',
 		'alpha3': 'IDN',
-		'numeric': '360'
+		'numeric': '360',
 	},
 	{
 		'name': 'Iran (Islamic Republic of)',
@@ -658,79 +658,79 @@ export const countriesCodes = [
 		'alpha3': 'IRN',
 		'numeric': '364',
 		'altName': 'Iran, Islamic Republic of',
-		'shortName': 'Iran'
+		'shortName': 'Iran',
 	},
 	{
 		'name': 'Iraq',
 		'alpha2': 'IQ',
 		'alpha3': 'IRQ',
-		'numeric': '368'
+		'numeric': '368',
 	},
 	{
 		'name': 'Ireland',
 		'alpha2': 'IE',
 		'alpha3': 'IRL',
-		'numeric': '372'
+		'numeric': '372',
 	},
 	{
 		'name': 'Isle of Man',
 		'alpha2': 'IM',
 		'alpha3': 'IMN',
-		'numeric': '833'
+		'numeric': '833',
 	},
 	{
 		'name': 'Israel',
 		'alpha2': 'IL',
 		'alpha3': 'ISR',
-		'numeric': '376'
+		'numeric': '376',
 	},
 	{
 		'name': 'Italy',
 		'alpha2': 'IT',
 		'alpha3': 'ITA',
-		'numeric': '380'
+		'numeric': '380',
 	},
 	{
 		'name': 'Jamaica',
 		'alpha2': 'JM',
 		'alpha3': 'JAM',
-		'numeric': '388'
+		'numeric': '388',
 	},
 	{
 		'name': 'Japan',
 		'alpha2': 'JP',
 		'alpha3': 'JPN',
-		'numeric': '392'
+		'numeric': '392',
 	},
 	{
 		'name': 'Jersey',
 		'alpha2': 'JE',
 		'alpha3': 'JEY',
-		'numeric': '832'
+		'numeric': '832',
 	},
 	{
 		'name': 'Jordan',
 		'alpha2': 'JO',
 		'alpha3': 'JOR',
-		'numeric': '400'
+		'numeric': '400',
 	},
 	{
 		'name': 'Kazakhstan',
 		'alpha2': 'KZ',
 		'alpha3': 'KAZ',
-		'numeric': '398'
+		'numeric': '398',
 	},
 	{
 		'name': 'Kenya',
 		'alpha2': 'KE',
 		'alpha3': 'KEN',
-		'numeric': '404'
+		'numeric': '404',
 	},
 	{
 		'name': 'Kiribati',
 		'alpha2': 'KI',
 		'alpha3': 'KIR',
-		'numeric': '296'
+		'numeric': '296',
 	},
 	{
 		'name': 'Korea (the Democratic People\'s Republic of)',
@@ -738,7 +738,7 @@ export const countriesCodes = [
 		'alpha3': 'PRK',
 		'numeric': '408',
 		'altName': 'Korea (North)',
-		'shortName': 'North Korea'
+		'shortName': 'North Korea',
 	},
 	{
 		'name': 'Korea (the Republic of)',
@@ -746,19 +746,19 @@ export const countriesCodes = [
 		'alpha3': 'KOR',
 		'numeric': '410',
 		'altName': 'Korea (South)',
-		'shortName': 'South Korea'
+		'shortName': 'South Korea',
 	},
 	{
 		'name': 'Kuwait',
 		'alpha2': 'KW',
 		'alpha3': 'KWT',
-		'numeric': '414'
+		'numeric': '414',
 	},
 	{
 		'name': 'Kyrgyzstan',
 		'alpha2': 'KG',
 		'alpha3': 'KGZ',
-		'numeric': '417'
+		'numeric': '417',
 	},
 	{
 		'name': 'Lao People\'s Democratic Republic (the)',
@@ -766,55 +766,55 @@ export const countriesCodes = [
 		'alpha3': 'LAO',
 		'numeric': '418',
 		'altName': 'Lao PDR',
-		'shortName': 'Laos'
+		'shortName': 'Laos',
 	},
 	{
 		'name': 'Latvia',
 		'alpha2': 'LV',
 		'alpha3': 'LVA',
-		'numeric': '428'
+		'numeric': '428',
 	},
 	{
 		'name': 'Lebanon',
 		'alpha2': 'LB',
 		'alpha3': 'LBN',
-		'numeric': '422'
+		'numeric': '422',
 	},
 	{
 		'name': 'Lesotho',
 		'alpha2': 'LS',
 		'alpha3': 'LSO',
-		'numeric': '426'
+		'numeric': '426',
 	},
 	{
 		'name': 'Liberia',
 		'alpha2': 'LR',
 		'alpha3': 'LBR',
-		'numeric': '430'
+		'numeric': '430',
 	},
 	{
 		'name': 'Libya',
 		'alpha2': 'LY',
 		'alpha3': 'LBY',
-		'numeric': '434'
+		'numeric': '434',
 	},
 	{
 		'name': 'Liechtenstein',
 		'alpha2': 'LI',
 		'alpha3': 'LIE',
-		'numeric': '438'
+		'numeric': '438',
 	},
 	{
 		'name': 'Lithuania',
 		'alpha2': 'LT',
 		'alpha3': 'LTU',
-		'numeric': '440'
+		'numeric': '440',
 	},
 	{
 		'name': 'Luxembourg',
 		'alpha2': 'LU',
 		'alpha3': 'LUX',
-		'numeric': '442'
+		'numeric': '442',
 	},
 	{
 		'name': 'Macao',
@@ -822,7 +822,7 @@ export const countriesCodes = [
 		'alpha3': 'MAC',
 		'numeric': '446',
 		'altName': 'Macao, SAR China',
-		'shortName': 'Macau'
+		'shortName': 'Macau',
 	},
 	{
 		'name': 'Macedonia (the former Yugoslav Republic of)',
@@ -830,80 +830,80 @@ export const countriesCodes = [
 		'alpha3': 'MKD',
 		'numeric': '807',
 		'altName': 'Macedonia, Republic of',
-		'shortName': 'Macedonia'
+		'shortName': 'Macedonia',
 	},
 	{
 		'name': 'Madagascar',
 		'alpha2': 'MG',
 		'alpha3': 'MDG',
-		'numeric': '450'
+		'numeric': '450',
 	},
 	{
 		'name': 'Malawi',
 		'alpha2': 'MW',
 		'alpha3': 'MWI',
-		'numeric': '454'
+		'numeric': '454',
 	},
 	{
 		'name': 'Malaysia',
 		'alpha2': 'MY',
 		'alpha3': 'MYS',
-		'numeric': '458'
+		'numeric': '458',
 	},
 	{
 		'name': 'Maldives',
 		'alpha2': 'MV',
 		'alpha3': 'MDV',
-		'numeric': '462'
+		'numeric': '462',
 	},
 	{
 		'name': 'Mali',
 		'alpha2': 'ML',
 		'alpha3': 'MLI',
-		'numeric': '466'
+		'numeric': '466',
 	},
 	{
 		'name': 'Malta',
 		'alpha2': 'MT',
 		'alpha3': 'MLT',
-		'numeric': '470'
+		'numeric': '470',
 	},
 	{
 		'name': 'Marshall Islands (the)',
 		'alpha2': 'MH',
 		'alpha3': 'MHL',
 		'numeric': '584',
-		'altName': 'Marshall Islands'
+		'altName': 'Marshall Islands',
 	},
 	{
 		'name': 'Martinique',
 		'alpha2': 'MQ',
 		'alpha3': 'MTQ',
-		'numeric': '474'
+		'numeric': '474',
 	},
 	{
 		'name': 'Mauritania',
 		'alpha2': 'MR',
 		'alpha3': 'MRT',
-		'numeric': '478'
+		'numeric': '478',
 	},
 	{
 		'name': 'Mauritius',
 		'alpha2': 'MU',
 		'alpha3': 'MUS',
-		'numeric': '480'
+		'numeric': '480',
 	},
 	{
 		'name': 'Mayotte',
 		'alpha2': 'YT',
 		'alpha3': 'MYT',
-		'numeric': '175'
+		'numeric': '175',
 	},
 	{
 		'name': 'Mexico',
 		'alpha2': 'MX',
 		'alpha3': 'MEX',
-		'numeric': '484'
+		'numeric': '484',
 	},
 	{
 		'name': 'Micronesia (Federated States of)',
@@ -911,155 +911,155 @@ export const countriesCodes = [
 		'alpha3': 'FSM',
 		'numeric': '583',
 		'altName': 'Micronesia, Federated States of',
-		'shortName': 'Micronesia'
+		'shortName': 'Micronesia',
 	},
 	{
 		'name': 'Moldova (the Republic of)',
 		'alpha2': 'MD',
 		'alpha3': 'MDA',
 		'numeric': '498',
-		'altName': 'Moldova'
+		'altName': 'Moldova',
 	},
 	{
 		'name': 'Monaco',
 		'alpha2': 'MC',
 		'alpha3': 'MCO',
-		'numeric': '492'
+		'numeric': '492',
 	},
 	{
 		'name': 'Mongolia',
 		'alpha2': 'MN',
 		'alpha3': 'MNG',
-		'numeric': '496'
+		'numeric': '496',
 	},
 	{
 		'name': 'Montenegro',
 		'alpha2': 'ME',
 		'alpha3': 'MNE',
-		'numeric': '499'
+		'numeric': '499',
 	},
 	{
 		'name': 'Montserrat',
 		'alpha2': 'MS',
 		'alpha3': 'MSR',
-		'numeric': '500'
+		'numeric': '500',
 	},
 	{
 		'name': 'Morocco',
 		'alpha2': 'MA',
 		'alpha3': 'MAR',
-		'numeric': '504'
+		'numeric': '504',
 	},
 	{
 		'name': 'Mozambique',
 		'alpha2': 'MZ',
 		'alpha3': 'MOZ',
-		'numeric': '508'
+		'numeric': '508',
 	},
 	{
 		'name': 'Myanmar',
 		'alpha2': 'MM',
 		'alpha3': 'MMR',
-		'numeric': '104'
+		'numeric': '104',
 	},
 	{
 		'name': 'Namibia',
 		'alpha2': 'NA',
 		'alpha3': 'NAM',
-		'numeric': '516'
+		'numeric': '516',
 	},
 	{
 		'name': 'Nauru',
 		'alpha2': 'NR',
 		'alpha3': 'NRU',
-		'numeric': '520'
+		'numeric': '520',
 	},
 	{
 		'name': 'Nepal',
 		'alpha2': 'NP',
 		'alpha3': 'NPL',
-		'numeric': '524'
+		'numeric': '524',
 	},
 	{
 		'name': 'Netherlands (the)',
 		'alpha2': 'NL',
 		'alpha3': 'NLD',
 		'numeric': '528',
-		'altName': 'Netherlands'
+		'altName': 'Netherlands',
 	},
 	{
 		'name': 'New Caledonia',
 		'alpha2': 'NC',
 		'alpha3': 'NCL',
-		'numeric': '540'
+		'numeric': '540',
 	},
 	{
 		'name': 'New Zealand',
 		'alpha2': 'NZ',
 		'alpha3': 'NZL',
-		'numeric': '554'
+		'numeric': '554',
 	},
 	{
 		'name': 'Nicaragua',
 		'alpha2': 'NI',
 		'alpha3': 'NIC',
-		'numeric': '558'
+		'numeric': '558',
 	},
 	{
 		'name': 'Niger (the)',
 		'alpha2': 'NE',
 		'alpha3': 'NER',
 		'numeric': '562',
-		'altName': 'Niger'
+		'altName': 'Niger',
 	},
 	{
 		'name': 'Nigeria',
 		'alpha2': 'NG',
 		'alpha3': 'NGA',
-		'numeric': '566'
+		'numeric': '566',
 	},
 	{
 		'name': 'Niue',
 		'alpha2': 'NU',
 		'alpha3': 'NIU',
-		'numeric': '570'
+		'numeric': '570',
 	},
 	{
 		'name': 'Norfolk Island',
 		'alpha2': 'NF',
 		'alpha3': 'NFK',
-		'numeric': '574'
+		'numeric': '574',
 	},
 	{
 		'name': 'Northern Mariana Islands (the)',
 		'alpha2': 'MP',
 		'alpha3': 'MNP',
 		'numeric': '580',
-		'altName': 'Northern Mariana Islands'
+		'altName': 'Northern Mariana Islands',
 	},
 	{
 		'name': 'Norway',
 		'alpha2': 'NO',
 		'alpha3': 'NOR',
-		'numeric': '578'
+		'numeric': '578',
 	},
 	{
 		'name': 'Oman',
 		'alpha2': 'OM',
 		'alpha3': 'OMN',
-		'numeric': '512'
+		'numeric': '512',
 	},
 	{
 		'name': 'Pakistan',
 		'alpha2': 'PK',
 		'alpha3': 'PAK',
-		'numeric': '586'
+		'numeric': '586',
 	},
 	{
 		'name': 'Palau',
 		'alpha2': 'PW',
 		'alpha3': 'PLW',
-		'numeric': '585'
+		'numeric': '585',
 	},
 	{
 		'name': 'Palestine, State of',
@@ -1067,81 +1067,81 @@ export const countriesCodes = [
 		'alpha3': 'PSE',
 		'numeric': '275',
 		'altName': 'Palestinian Territory',
-		'shortName': 'Palestine'
+		'shortName': 'Palestine',
 	},
 	{
 		'name': 'Panama',
 		'alpha2': 'PA',
 		'alpha3': 'PAN',
-		'numeric': '591'
+		'numeric': '591',
 	},
 	{
 		'name': 'Papua New Guinea',
 		'alpha2': 'PG',
 		'alpha3': 'PNG',
-		'numeric': '598'
+		'numeric': '598',
 	},
 	{
 		'name': 'Paraguay',
 		'alpha2': 'PY',
 		'alpha3': 'PRY',
-		'numeric': '600'
+		'numeric': '600',
 	},
 	{
 		'name': 'Peru',
 		'alpha2': 'PE',
 		'alpha3': 'PER',
-		'numeric': '604'
+		'numeric': '604',
 	},
 	{
 		'name': 'Philippines (the)',
 		'alpha2': 'PH',
 		'alpha3': 'PHL',
 		'numeric': '608',
-		'altName': 'Philippines'
+		'altName': 'Philippines',
 	},
 	{
 		'name': 'Pitcairn',
 		'alpha2': 'PN',
 		'alpha3': 'PCN',
-		'numeric': '612'
+		'numeric': '612',
 	},
 	{
 		'name': 'Poland',
 		'alpha2': 'PL',
 		'alpha3': 'POL',
-		'numeric': '616'
+		'numeric': '616',
 	},
 	{
 		'name': 'Portugal',
 		'alpha2': 'PT',
 		'alpha3': 'PRT',
-		'numeric': '620'
+		'numeric': '620',
 	},
 	{
 		'name': 'Puerto Rico',
 		'alpha2': 'PR',
 		'alpha3': 'PRI',
-		'numeric': '630'
+		'numeric': '630',
 	},
 	{
 		'name': 'Qatar',
 		'alpha2': 'QA',
 		'alpha3': 'QAT',
-		'numeric': '634'
+		'numeric': '634',
 	},
 	{
 		'name': 'Réunion',
 		'alpha2': 'RE',
 		'alpha3': 'REU',
 		'numeric': '638',
-		'shortName': 'Reunion'
+		'shortName': 'Reunion',
 	},
 	{
 		'name': 'Romania',
 		'alpha2': 'RO',
 		'alpha3': 'ROU',
-		'numeric': '642'
+		'numeric': '642',
 	},
 	{
 		'name': 'Russian Federation (the)',
@@ -1149,13 +1149,13 @@ export const countriesCodes = [
 		'alpha3': 'RUS',
 		'numeric': '643',
 		'altName': 'Russian Federation',
-		'shortName': 'Russia'
+		'shortName': 'Russia',
 	},
 	{
 		'name': 'Rwanda',
 		'alpha2': 'RW',
 		'alpha3': 'RWA',
-		'numeric': '646'
+		'numeric': '646',
 	},
 	{
 		'name': 'Saint Barthélemy',
@@ -1163,26 +1163,26 @@ export const countriesCodes = [
 		'alpha3': 'BLM',
 		'numeric': '652',
 		'altName': 'Saint-Barthélemy',
-		'shortName': 'Saint Barthelemy'
+		'shortName': 'Saint Barthelemy',
 	},
 	{
 		'name': 'Saint Helena, Ascension and Tristan da Cunha',
 		'alpha2': 'SH',
 		'alpha3': 'SHN',
 		'numeric': '654',
-		'altName': 'Saint Helena'
+		'altName': 'Saint Helena',
 	},
 	{
 		'name': 'Saint Kitts and Nevis',
 		'alpha2': 'KN',
 		'alpha3': 'KNA',
-		'numeric': '659'
+		'numeric': '659',
 	},
 	{
 		'name': 'Saint Lucia',
 		'alpha2': 'LC',
 		'alpha3': 'LCA',
-		'numeric': '662'
+		'numeric': '662',
 	},
 	{
 		'name': 'Saint Martin (French part)',
@@ -1190,173 +1190,173 @@ export const countriesCodes = [
 		'alpha3': 'MAF',
 		'numeric': '663',
 		'altName': 'Saint-Martin (French part)',
-		'shortName': 'Saint Martin'
+		'shortName': 'Saint Martin',
 	},
 	{
 		'name': 'Saint Pierre and Miquelon',
 		'alpha2': 'PM',
 		'alpha3': 'SPM',
-		'numeric': '666'
+		'numeric': '666',
 	},
 	{
 		'name': 'Saint Vincent and the Grenadines',
 		'alpha2': 'VC',
 		'alpha3': 'VCT',
 		'numeric': '670',
-		'altName': 'Saint Vincent and Grenadines'
+		'altName': 'Saint Vincent and Grenadines',
 	},
 	{
 		'name': 'Samoa',
 		'alpha2': 'WS',
 		'alpha3': 'WSM',
-		'numeric': '882'
+		'numeric': '882',
 	},
 	{
 		'name': 'San Marino',
 		'alpha2': 'SM',
 		'alpha3': 'SMR',
-		'numeric': '674'
+		'numeric': '674',
 	},
 	{
 		'name': 'Sao Tome and Principe',
 		'alpha2': 'ST',
 		'alpha3': 'STP',
-		'numeric': '678'
+		'numeric': '678',
 	},
 	{
 		'name': 'Saudi Arabia',
 		'alpha2': 'SA',
 		'alpha3': 'SAU',
-		'numeric': '682'
+		'numeric': '682',
 	},
 	{
 		'name': 'Senegal',
 		'alpha2': 'SN',
 		'alpha3': 'SEN',
-		'numeric': '686'
+		'numeric': '686',
 	},
 	{
 		'name': 'Serbia',
 		'alpha2': 'RS',
 		'alpha3': 'SRB',
-		'numeric': '688'
+		'numeric': '688',
 	},
 	{
 		'name': 'Seychelles',
 		'alpha2': 'SC',
 		'alpha3': 'SYC',
-		'numeric': '690'
+		'numeric': '690',
 	},
 	{
 		'name': 'Sierra Leone',
 		'alpha2': 'SL',
 		'alpha3': 'SLE',
-		'numeric': '694'
+		'numeric': '694',
 	},
 	{
 		'name': 'Singapore',
 		'alpha2': 'SG',
 		'alpha3': 'SGP',
-		'numeric': '702'
+		'numeric': '702',
 	},
 	{
 		'name': 'Sint Maarten (Dutch part)',
 		'alpha2': 'SX',
 		'alpha3': 'SXM',
 		'numeric': '534',
-		'shortName': 'Sint Maarten'
+		'shortName': 'Sint Maarten',
 	},
 	{
 		'name': 'Slovakia',
 		'alpha2': 'SK',
 		'alpha3': 'SVK',
-		'numeric': '703'
+		'numeric': '703',
 	},
 	{
 		'name': 'Slovenia',
 		'alpha2': 'SI',
 		'alpha3': 'SVN',
-		'numeric': '705'
+		'numeric': '705',
 	},
 	{
 		'name': 'Solomon Islands',
 		'alpha2': 'SB',
 		'alpha3': 'SLB',
-		'numeric': '090'
+		'numeric': '090',
 	},
 	{
 		'name': 'Somalia',
 		'alpha2': 'SO',
 		'alpha3': 'SOM',
-		'numeric': '706'
+		'numeric': '706',
 	},
 	{
 		'name': 'South Africa',
 		'alpha2': 'ZA',
 		'alpha3': 'ZAF',
-		'numeric': '710'
+		'numeric': '710',
 	},
 	{
 		'name': 'South Georgia and the South Sandwich Islands',
 		'alpha2': 'GS',
 		'alpha3': 'SGS',
-		'numeric': '239'
+		'numeric': '239',
 	},
 	{
 		'name': 'South Sudan',
 		'alpha2': 'SS',
 		'alpha3': 'SSD',
-		'numeric': '728'
+		'numeric': '728',
 	},
 	{
 		'name': 'Spain',
 		'alpha2': 'ES',
 		'alpha3': 'ESP',
-		'numeric': '724'
+		'numeric': '724',
 	},
 	{
 		'name': 'Sri Lanka',
 		'alpha2': 'LK',
 		'alpha3': 'LKA',
-		'numeric': '144'
+		'numeric': '144',
 	},
 	{
 		'name': 'Sudan (the)',
 		'alpha2': 'SD',
 		'alpha3': 'SDN',
 		'numeric': '729',
-		'altName': 'Sudan'
+		'altName': 'Sudan',
 	},
 	{
 		'name': 'Suriname',
 		'alpha2': 'SR',
 		'alpha3': 'SUR',
-		'numeric': '740'
+		'numeric': '740',
 	},
 	{
 		'name': 'Svalbard and Jan Mayen',
 		'alpha2': 'SJ',
 		'alpha3': 'SJM',
 		'numeric': '744',
-		'altName': 'Svalbard and Jan Mayen Islands'
+		'altName': 'Svalbard and Jan Mayen Islands',
 	},
 	{
 		'name': 'Swaziland',
 		'alpha2': 'SZ',
 		'alpha3': 'SWZ',
-		'numeric': '748'
+		'numeric': '748',
 	},
 	{
 		'name': 'Sweden',
 		'alpha2': 'SE',
 		'alpha3': 'SWE',
-		'numeric': '752'
+		'numeric': '752',
 	},
 	{
 		'name': 'Switzerland',
 		'alpha2': 'CH',
 		'alpha3': 'CHE',
-		'numeric': '756'
+		'numeric': '756',
 	},
 	{
 		'name': 'Syrian Arab Republic',
@@ -1364,7 +1364,7 @@ export const countriesCodes = [
 		'alpha3': 'SYR',
 		'numeric': '760',
 		'altName': 'Syrian Arab Republic (Syria)',
-		'shortName': 'Syria'
+		'shortName': 'Syria',
 	},
 	{
 		'name': 'Taiwan (Province of China)',
@@ -1372,121 +1372,121 @@ export const countriesCodes = [
 		'alpha3': 'TWN',
 		'numeric': '158',
 		'altName': 'Taiwan, Republic of China',
-		'shortName': 'Taiwan'
+		'shortName': 'Taiwan',
 	},
 	{
 		'name': 'Tajikistan',
 		'alpha2': 'TJ',
 		'alpha3': 'TJK',
-		'numeric': '762'
+		'numeric': '762',
 	},
 	{
 		'name': 'Tanzania, United Republic of',
 		'alpha2': 'TZ',
 		'alpha3': 'TZA',
 		'numeric': '834',
-		'shortName': 'Tanzania'
+		'shortName': 'Tanzania',
 	},
 	{
 		'name': 'Thailand',
 		'alpha2': 'TH',
 		'alpha3': 'THA',
-		'numeric': '764'
+		'numeric': '764',
 	},
 	{
 		'name': 'Timor-Leste',
 		'alpha2': 'TL',
 		'alpha3': 'TLS',
 		'numeric': '626',
-		'shortName': 'East Timor'
+		'shortName': 'East Timor',
 	},
 	{
 		'name': 'Togo',
 		'alpha2': 'TG',
 		'alpha3': 'TGO',
-		'numeric': '768'
+		'numeric': '768',
 	},
 	{
 		'name': 'Tokelau',
 		'alpha2': 'TK',
 		'alpha3': 'TKL',
-		'numeric': '772'
+		'numeric': '772',
 	},
 	{
 		'name': 'Tonga',
 		'alpha2': 'TO',
 		'alpha3': 'TON',
-		'numeric': '776'
+		'numeric': '776',
 	},
 	{
 		'name': 'Trinidad and Tobago',
 		'alpha2': 'TT',
 		'alpha3': 'TTO',
-		'numeric': '780'
+		'numeric': '780',
 	},
 	{
 		'name': 'Tunisia',
 		'alpha2': 'TN',
 		'alpha3': 'TUN',
-		'numeric': '788'
+		'numeric': '788',
 	},
 	{
 		'name': 'Turkey',
 		'alpha2': 'TR',
 		'alpha3': 'TUR',
-		'numeric': '792'
+		'numeric': '792',
 	},
 	{
 		'name': 'Turkmenistan',
 		'alpha2': 'TM',
 		'alpha3': 'TKM',
-		'numeric': '795'
+		'numeric': '795',
 	},
 	{
 		'name': 'Turks and Caicos Islands (the)',
 		'alpha2': 'TC',
 		'alpha3': 'TCA',
 		'numeric': '796',
-		'altName': 'Turks and Caicos Islands'
+		'altName': 'Turks and Caicos Islands',
 	},
 	{
 		'name': 'Tuvalu',
 		'alpha2': 'TV',
 		'alpha3': 'TUV',
-		'numeric': '798'
+		'numeric': '798',
 	},
 	{
 		'name': 'Uganda',
 		'alpha2': 'UG',
 		'alpha3': 'UGA',
-		'numeric': '800'
+		'numeric': '800',
 	},
 	{
 		'name': 'Ukraine',
 		'alpha2': 'UA',
 		'alpha3': 'UKR',
-		'numeric': '804'
+		'numeric': '804',
 	},
 	{
 		'name': 'United Arab Emirates (the)',
 		'alpha2': 'AE',
 		'alpha3': 'ARE',
 		'numeric': '784',
-		'altName': 'United Arab Emirates'
+		'altName': 'United Arab Emirates',
 	},
 	{
 		'name': 'United Kingdom of Great Britain and Northern Ireland (the)',
 		'alpha2': 'GB',
 		'alpha3': 'GBR',
 		'numeric': '826',
-		'altName': 'United Kingdom'
+		'altName': 'United Kingdom',
 	},
 	{
 		'name': 'United States Minor Outlying Islands (the)',
 		'alpha2': 'UM',
 		'alpha3': 'UMI',
 		'numeric': '581',
-		'altName': 'US Minor Outlying Islands'
+		'altName': 'US Minor Outlying Islands',
 	},
 	{
 		'name': 'United States of America (the)',
@@ -1494,25 +1494,25 @@ export const countriesCodes = [
 		'alpha3': 'USA',
 		'numeric': '840',
 		'altName': 'United States of America',
-		'shortName': 'United States'
+		'shortName': 'United States',
 	},
 	{
 		'name': 'Uruguay',
 		'alpha2': 'UY',
 		'alpha3': 'URY',
-		'numeric': '858'
+		'numeric': '858',
 	},
 	{
 		'name': 'Uzbekistan',
 		'alpha2': 'UZ',
 		'alpha3': 'UZB',
-		'numeric': '860'
+		'numeric': '860',
 	},
 	{
 		'name': 'Vanuatu',
 		'alpha2': 'VU',
 		'alpha3': 'VUT',
-		'numeric': '548'
+		'numeric': '548',
 	},
 	{
 		'name': 'Venezuela (Bolivarian Republic of)',
@@ -1520,21 +1520,21 @@ export const countriesCodes = [
 		'alpha3': 'VEN',
 		'numeric': '862',
 		'altName': 'Venezuela (Bolivarian Republic)',
-		'shortName': 'Venezuela'
+		'shortName': 'Venezuela',
 	},
 	{
 		'name': 'Viet Nam',
 		'alpha2': 'VN',
 		'alpha3': 'VNM',
 		'numeric': '704',
-		'shortName': 'Vietnam'
+		'shortName': 'Vietnam',
 	},
 	{
 		'name': 'Virgin Islands (British)',
 		'alpha2': 'VG',
 		'alpha3': 'VGB',
 		'numeric': '092',
-		'altName': 'British Virgin Islands'
+		'altName': 'British Virgin Islands',
 	},
 	{
 		'name': 'Virgin Islands (U.S.)',
@@ -1542,38 +1542,38 @@ export const countriesCodes = [
 		'alpha3': 'VIR',
 		'numeric': '850',
 		'altName': 'Virgin Islands, US',
-		'shortName': 'U.S. Virgin Islands'
+		'shortName': 'U.S. Virgin Islands',
 	},
 	{
 		'name': 'Wallis and Futuna',
 		'alpha2': 'WF',
 		'alpha3': 'WLF',
 		'numeric': '876',
-		'altName': 'Wallis and Futuna Islands'
+		'altName': 'Wallis and Futuna Islands',
 	},
 	{
 		'name': 'Western Sahara*',
 		'alpha2': 'EH',
 		'alpha3': 'ESH',
 		'numeric': '732',
-		'altName': 'Western Sahara'
+		'altName': 'Western Sahara',
 	},
 	{
 		'name': 'Yemen',
 		'alpha2': 'YE',
 		'alpha3': 'YEM',
-		'numeric': '887'
+		'numeric': '887',
 	},
 	{
 		'name': 'Zambia',
 		'alpha2': 'ZM',
 		'alpha3': 'ZMB',
-		'numeric': '894'
+		'numeric': '894',
 	},
 	{
 		'name': 'Zimbabwe',
 		'alpha2': 'ZW',
 		'alpha3': 'ZWE',
-		'numeric': '716'
-	}
+		'numeric': '716',
+	},
 ];
diff --git a/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts b/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
index 1b3466d07..ff85b5fd5 100644
--- a/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
+++ b/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
@@ -165,7 +165,7 @@ export const customerFields = [
 				default: '',
 				description: 'URL of the customer’s photo',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Address',
@@ -701,7 +701,7 @@ export const customerFields = [
 					alwaysOpenEditWindow: true,
 				},
 				default: '',
-				description: 'Advanced search <a href="https://developer.helpscout.com/mailbox-api/endpoints/customers/list/#query">Examples</a>'
+				description: 'Advanced search <a href="https://developer.helpscout.com/mailbox-api/endpoints/customers/list/#query">Examples</a>',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
index a43545a32..886cfa2b2 100644
--- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
@@ -1,8 +1,8 @@
 import { OptionsWithUri } from 'request';
 import {
-	IHookFunctions,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
+	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 import {
@@ -22,7 +22,7 @@ export async function helpscoutApiRequest(this: IExecuteFunctions | IExecuteSing
 		body,
 		qs,
 		uri: uri || `https://api.helpscout.net${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		if (Object.keys(option).length !== 0) {
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index ce1f02d64..4b7229917 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -8,8 +8,8 @@ import {
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/HelpScout/ThreadDescription.ts b/packages/nodes-base/nodes/HelpScout/ThreadDescription.ts
index eb2039745..6a1665698 100644
--- a/packages/nodes-base/nodes/HelpScout/ThreadDescription.ts
+++ b/packages/nodes-base/nodes/HelpScout/ThreadDescription.ts
@@ -69,23 +69,23 @@ export const threadFields = [
 		options: [
 			{
 				name: 'Chat',
-				value: 'chat'
+				value: 'chat',
 			},
 			{
 				name: 'Customer',
-				value: 'customer'
+				value: 'customer',
 			},
 			{
 				name: 'Note',
-				value: 'note'
+				value: 'note',
 			},
 			{
 				name: 'Phone',
-				value: 'phone'
+				value: 'phone',
 			},
 			{
 				name: 'Reply',
-				value: 'reply'
+				value: 'reply',
 			},
 		],
 		default: '',
@@ -167,7 +167,7 @@ export const threadFields = [
 				default: false,
 				description: 'When imported is set to true, no outgoing emails or notifications will be generated.',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Attachments',
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index ddedbc082..4b70c5838 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -1,12 +1,14 @@
 import * as cheerio from 'cheerio';
 import { IExecuteFunctions } from 'n8n-core';
 import {
+	IDataObject,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IDataObject,
 } from 'n8n-workflow';
 
+type Cheerio = ReturnType<typeof cheerio>;
+
 interface IValueData {
 	attribute?: string;
 	cssSelector: string;
@@ -204,8 +206,8 @@ export class HtmlExtract implements INodeType {
 						description: 'Removes automatically all spaces and newlines from<br />the beginning and end of the values.',
 					},
 				],
-			}
-		]
+			},
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest.node.ts
index e30896252..2478c335f 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest.node.ts
@@ -3,11 +3,11 @@ import {
 	IExecuteFunctions,
 } from 'n8n-core';
 import {
+	IBinaryData,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IBinaryData,
 } from 'n8n-workflow';
 
 import { OptionsWithUri } from 'request';
@@ -102,27 +102,27 @@ export class HttpRequest implements INodeType {
 				options: [
 					{
 						name: 'Basic Auth',
-						value: 'basicAuth'
+						value: 'basicAuth',
 					},
 					{
 						name: 'Digest Auth',
-						value: 'digestAuth'
+						value: 'digestAuth',
 					},
 					{
 						name: 'Header Auth',
-						value: 'headerAuth'
+						value: 'headerAuth',
 					},
 					{
 						name: 'OAuth1',
-						value: 'oAuth1'
+						value: 'oAuth1',
 					},
 					{
 						name: 'OAuth2',
-						value: 'oAuth2'
+						value: 'oAuth2',
 					},
 					{
 						name: 'None',
-						value: 'none'
+						value: 'none',
 					},
 				],
 				default: 'none',
@@ -135,27 +135,27 @@ export class HttpRequest implements INodeType {
 				options: [
 					{
 						name: 'DELETE',
-						value: 'DELETE'
+						value: 'DELETE',
 					},
 					{
 						name: 'GET',
-						value: 'GET'
+						value: 'GET',
 					},
 					{
 						name: 'HEAD',
-						value: 'HEAD'
+						value: 'HEAD',
 					},
 					{
 						name: 'PATCH',
-						value: 'PATCH'
+						value: 'PATCH',
 					},
 					{
 						name: 'POST',
-						value: 'POST'
+						value: 'POST',
 					},
 					{
 						name: 'PUT',
-						value: 'PUT'
+						value: 'PUT',
 					},
 				],
 				default: 'GET',
@@ -184,15 +184,15 @@ export class HttpRequest implements INodeType {
 				options: [
 					{
 						name: 'File',
-						value: 'file'
+						value: 'file',
 					},
 					{
 						name: 'JSON',
-						value: 'json'
+						value: 'json',
 					},
 					{
 						name: 'String',
-						value: 'string'
+						value: 'string',
 					},
 				],
 				default: 'json',
@@ -260,19 +260,19 @@ export class HttpRequest implements INodeType {
 						options: [
 							{
 								name: 'JSON',
-								value: 'json'
+								value: 'json',
 							},
 							{
 								name: 'RAW/Custom',
-								value: 'raw'
+								value: 'raw',
 							},
 							{
 								name: 'Form-Data Multipart',
-								value: 'multipart-form-data'
+								value: 'multipart-form-data',
 							},
 							{
 								name: 'Form Urlencoded',
-								value: 'form-urlencoded'
+								value: 'form-urlencoded',
 							},
 						],
 						default: 'json',
@@ -455,7 +455,7 @@ export class HttpRequest implements INodeType {
 								default: '',
 								description: 'Value of the parameter.',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -511,7 +511,7 @@ export class HttpRequest implements INodeType {
 								default: '',
 								description: 'Value to set for the header.',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -567,11 +567,11 @@ export class HttpRequest implements INodeType {
 								default: '',
 								description: 'Value of the parameter.',
 							},
-						]
+						],
 					},
 				],
 			},
-		]
+		],
 	};
 
 
@@ -620,8 +620,8 @@ export class HttpRequest implements INodeType {
 			},
 		};
 
-		let response: any; // tslint:disable-line:no-any
 		const returnItems: INodeExecutionData[] = [];
+		const requestPromises = [];
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
 			const url = this.getNodeParameter('url', itemIndex) as string;
@@ -660,11 +660,7 @@ export class HttpRequest implements INodeType {
 				let optionData: OptionData;
 				for (const parameterName of Object.keys(jsonParameters)) {
 					optionData = jsonParameters[parameterName] as OptionData;
-					const tempValue = this.getNodeParameter(parameterName, itemIndex, {}) as string | object;
-					if (tempValue === '') {
-						// Paramter is empty so skip it
-						continue;
-					}
+					const tempValue = this.getNodeParameter(parameterName, itemIndex, '') as string | object;
 					const sendBinaryData = this.getNodeParameter('sendBinaryData', itemIndex, false) as boolean;
 
 					if (optionData.name === 'body' && parametersAreJson === true) {
@@ -729,6 +725,11 @@ export class HttpRequest implements INodeType {
 						}
 					}
 
+					if (tempValue === '') {
+						// Paramter is empty so skip it
+						continue;
+					}
+
 					// @ts-ignore
 					requestOptions[optionData.name] = tempValue;
 
@@ -771,6 +772,19 @@ export class HttpRequest implements INodeType {
 				}
 			}
 
+			if (responseFormat === 'file') {
+				requestOptions.encoding = null;
+				requestOptions.body = JSON.stringify(requestOptions.body);
+				if (requestOptions.headers === undefined) {
+					requestOptions.headers = {};
+				}
+				requestOptions.headers['Content-Type'] = 'application/json';
+			} else if (options.bodyContentType === 'raw') {
+				requestOptions.json = false;
+			} else {
+				requestOptions.json = true;
+			}
+
 			// Add Content Type if any are set
 			if (options.bodyContentCustomMimeType) {
 				if(requestOptions.headers === undefined) {
@@ -807,34 +821,48 @@ export class HttpRequest implements INodeType {
 				}
 			}
 
-			if (responseFormat === 'file') {
-				requestOptions.encoding = null;
-			} else if(options.bodyContentType === 'raw') {
-				requestOptions.json = false;
+			// Now that the options are all set make the actual http request
+			if (oAuth1Api !== undefined) {
+				requestPromises.push(this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions));
+			} else if (oAuth2Api !== undefined) {
+				requestPromises.push(this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, { tokenType: 'Bearer' }));
 			} else {
-				requestOptions.json = true;
+				requestPromises.push(this.helpers.request(requestOptions));
 			}
-			try {
-				// Now that the options are all set make the actual http request
-				if (oAuth1Api !== undefined) {
-					//@ts-ignore
-					response = await this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
-				}
-				else if (oAuth2Api !== undefined) {
-					//@ts-ignore
-					response = await this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, { tokenType: 'Bearer' });
+		}
+
+		// @ts-ignore
+		const promisesResponses = await Promise.allSettled(requestPromises);
+
+		let response: any; // tslint:disable-line:no-any
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			// @ts-ignore
+			response = promisesResponses.shift();
+
+			if (response!.status !== 'fulfilled') {
+				if (this.continueOnFail() !== true) {
+					// throw error;
+					throw new Error(response!.reason);
 				} else {
-					response = await this.helpers.request(requestOptions);
-				}
-			} catch (error) {
-				if (this.continueOnFail() === true) {
-					returnItems.push({ json: { error } });
+					// Return the actual reason as error
+					returnItems.push(
+						{
+							json: {
+								error: response.reason,
+							},
+						},
+					);
 					continue;
 				}
-
-				throw error;
 			}
 
+			response = response.value;
+
+			const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
+			const url = this.getNodeParameter('url', itemIndex) as string;
+
+			const fullResponse = !!options.fullResponse as boolean;
+
 			if (responseFormat === 'file') {
 				const dataPropertyName = this.getNodeParameter('dataPropertyName', 0) as string;
 
@@ -853,23 +881,22 @@ export class HttpRequest implements INodeType {
 
 				const fileName = (url).split('/').pop();
 
-
 				if (fullResponse === true) {
 					const returnItem: IDataObject = {};
 					for (const property of fullReponseProperties) {
 						if (property === 'body') {
 							continue;
 						}
- 						returnItem[property] = response[property];
+ 						returnItem[property] = response![property];
 					}
 
 					newItem.json = returnItem;
 
-					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(response.body, fileName);
+					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(response!.body, fileName);
 				} else {
 					newItem.json = items[itemIndex].json;
 
-					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(response, fileName);
+					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(response!, fileName);
 				}
 
 				items[itemIndex] = newItem;
@@ -880,11 +907,11 @@ export class HttpRequest implements INodeType {
 					const returnItem: IDataObject = {};
 					for (const property of fullReponseProperties) {
 						if (property === 'body') {
-							returnItem[dataPropertyName] = response[property];
+							returnItem[dataPropertyName] = response![property];
 							continue;
 						}
 
-						returnItem[property] = response[property];
+						returnItem[property] = response![property];
 					}
 					returnItems.push({ json: returnItem });
 				} else {
@@ -899,7 +926,7 @@ export class HttpRequest implements INodeType {
 				if (fullResponse === true) {
 					const returnItem: IDataObject = {};
 					for (const property of fullReponseProperties) {
-						returnItem[property] = response[property];
+						returnItem[property] = response![property];
 					}
 
 					if (responseFormat === 'json' && typeof returnItem.body === 'string') {
diff --git a/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts b/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts
index 2ab124d21..e319a0e38 100644
--- a/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/CompanyDescription.ts
@@ -138,7 +138,7 @@ export const companyFields = [
 				name: 'companyDomainName',
 				type: 'string',
 				default: '',
-				description: 'The domain name of the company or organization'
+				description: 'The domain name of the company or organization',
 			},
 			{
 				displayName: 'Company Owner',
@@ -155,7 +155,7 @@ export const companyFields = [
 				name: 'countryRegion',
 				type: 'string',
 				default: '',
-				description: 'The country/region in which the company or organization is located.'
+				description: 'The country/region in which the company or organization is located.',
 			},
 			{
 				displayName: 'Description',
@@ -186,7 +186,7 @@ export const companyFields = [
 				name: 'industry',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getCompanyIndustries'
+					loadOptionsMethod: 'getCompanyIndustries',
 				},
 				default: '',
 				description: 'The type of business the company performs.',
@@ -357,7 +357,7 @@ export const companyFields = [
 				name: 'webTechnologies',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getCompanyWebTechnologies'
+					loadOptionsMethod: 'getCompanyWebTechnologies',
 				},
 				default: '',
 				description: 'The web technologies used by the company or organization. Powered by HubSpot Insights.',
@@ -376,7 +376,7 @@ export const companyFields = [
 				default: '',
 				description: 'The year the company was created. Powered by HubSpot Insights.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 company:update                             */
@@ -454,7 +454,7 @@ export const companyFields = [
 				name: 'companyDomainName',
 				type: 'string',
 				default: '',
-				description: 'The domain name of the company or organization'
+				description: 'The domain name of the company or organization',
 			},
 			{
 				displayName: 'Company Owmer',
@@ -471,7 +471,7 @@ export const companyFields = [
 				name: 'countryRegion',
 				type: 'string',
 				default: '',
-				description: 'The country/region in which the company or organization is located.'
+				description: 'The country/region in which the company or organization is located.',
 			},
 			{
 				displayName: 'Description',
@@ -502,7 +502,7 @@ export const companyFields = [
 				name: 'industry',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getCompanyIndustries'
+					loadOptionsMethod: 'getCompanyIndustries',
 				},
 				default: '',
 				description: 'The type of business the company performs.',
@@ -679,7 +679,7 @@ export const companyFields = [
 				name: 'webTechnologies',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getCompanyWebTechnologies'
+					loadOptionsMethod: 'getCompanyWebTechnologies',
 				},
 				default: '',
 				description: 'The web technologies used by the company or organization. Powered by HubSpot Insights.',
@@ -698,7 +698,7 @@ export const companyFields = [
 				default: '',
 				description: 'The year the company was created. Powered by HubSpot Insights.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                  company:get                               */
@@ -745,7 +745,7 @@ export const companyFields = [
 				default: false,
 				description: `Returns any merge history if the company has been previously merged with another company record. Defaults to false.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 company:getAll                             */
@@ -836,7 +836,7 @@ export const companyFields = [
 				description: `Works similarly to properties=, but this parameter will include the history for the specified property,<br/>
 				instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 company:delete                             */
@@ -937,7 +937,7 @@ export const companyFields = [
 				description: `By default, you will only get data for the most recent version of a property in the "versions" data.<br/>
 				If you include this parameter, you will get data for all previous versions.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                            company:searchByDomain                          */
@@ -1030,6 +1030,6 @@ export const companyFields = [
 				Including this parameter will include the data for the specified property in the results.<br/>
 				You can include this parameter multiple times to request multiple properties separed by ,.`,
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Hubspot/ContactDescription.ts b/packages/nodes-base/nodes/Hubspot/ContactDescription.ts
index 29be29c39..1191cca13 100644
--- a/packages/nodes-base/nodes/Hubspot/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/ContactDescription.ts
@@ -124,7 +124,7 @@ export const contactFields = [
 					loadOptionsMethod:'getCompanies' ,
 				},
 				default: '',
-				description: 'Companies associated with the ticket'
+				description: 'Companies associated with the ticket',
 			},
 			{
 				displayName: 'City',
@@ -316,7 +316,7 @@ export const contactFields = [
 				name: 'lifeCycleStage',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getContactLifeCycleStages'
+					loadOptionsMethod: 'getContactLifeCycleStages',
 				},
 				default: '',
 				description: `The qualification of contacts to sales readiness. It can be set through imports, forms, workflows, and manually on a per contact basis.`,
@@ -380,7 +380,7 @@ export const contactFields = [
 				name: 'phoneNumber',
 				type: 'string',
 				default: '',
-				description: `A contact's primary phone number`
+				description: `A contact's primary phone number`,
 			},
 			{
 				displayName: 'Properties',
@@ -407,7 +407,7 @@ export const contactFields = [
 				name: 'postalCode',
 				type: 'string',
 				default: '',
-				description: `The contact's zip code. This might be set via import, form, or integration.`
+				description: `The contact's zip code. This might be set via import, form, or integration.`,
 			},
 			{
 				displayName: 'Preffered Language',
@@ -417,49 +417,49 @@ export const contactFields = [
 					loadOptionsMethod: 'getContactPrefferedLanguages',
 				},
 				default: '',
-				description: `Set your contact's preferred language for communications. This property can be changed from an import, form, or integration.`
+				description: `Set your contact's preferred language for communications. This property can be changed from an import, form, or integration.`,
 			},
 			{
 				displayName: 'Relationship Status',
 				name: 'relationshipStatus',
 				type: 'string',
 				default: '',
-				description: `A contact's relationship status. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`
+				description: `A contact's relationship status. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`,
 			},
 			{
 				displayName: 'Salutation',
 				name: 'salutation',
 				type: 'string',
 				default: '',
-				description: `The title used to address a contact`
+				description: `The title used to address a contact`,
 			},
 			{
 				displayName: 'School',
 				name: 'school',
 				type: 'string',
 				default: '',
-				description: `A contact's school. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`
+				description: `A contact's school. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`,
 			},
 			{
 				displayName: 'Seniority',
 				name: 'seniority',
 				type: 'string',
 				default: '',
-				description: `A contact's seniority. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`
+				description: `A contact's seniority. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`,
 			},
 			{
 				displayName: 'Start Date',
 				name: 'startDate',
 				type: 'dateTime',
 				default: '',
-				description: `A contact's start date. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`
+				description: `A contact's start date. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`,
 			},
 			{
 				displayName: 'State/Region',
 				name: 'stateRegion',
 				type: 'string',
 				default: '',
-				description: `The contact's state of residence. This might be set via import, form, or integration.`
+				description: `The contact's state of residence. This might be set via import, form, or integration.`,
 			},
 			{
 				displayName: 'Status',
@@ -469,35 +469,35 @@ export const contactFields = [
 					loadOptionsMethod: 'getContactStatuses',
 				},
 				default: '',
-				description: `The status of the contact's content membership.`
+				description: `The status of the contact's content membership.`,
 			},
 			{
 				displayName: 'Street Address',
 				name: 'streetAddress',
 				type: 'string',
 				default: '',
-				description: `A contact's street address, including apartment or unit #`
+				description: `A contact's street address, including apartment or unit #`,
 			},
 			{
 				displayName: 'Twitter Username',
 				name: 'twitterUsername',
 				type: 'string',
 				default: '',
-				description: `The contact's Twitter handle. This is set by HubSpot using the contact's email address.`
+				description: `The contact's Twitter handle. This is set by HubSpot using the contact's email address.`,
 			},
 			{
 				displayName: 'Website URL',
 				name: 'websiteUrl',
 				type: 'string',
 				default: '',
-				description: `The contact's company website`
+				description: `The contact's company website`,
 			},
 			{
 				displayName: 'Work Email',
 				name: 'workEmail',
 				type: 'string',
 				default: '',
-				description: `A contact's work email. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`
+				description: `A contact's work email. This property is required for the Facebook Ads Integration. This property will be automatically synced via the Lead Ads tool`,
 			},
 		],
 	},
@@ -1031,17 +1031,17 @@ export const contactFields = [
 										default: '',
 									},
 								],
-							}
+							},
 						],
 						description: 'Use filters to limit the results to only CRM objects with matching property values. More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>',
 					},
 				],
-			}
+			},
 		],
 		description: `When multiple filters are provided within a filterGroup, they will be combined using a logical AND operator.<br>
 		When multiple filterGroups are provided, they will be combined using a logical OR operator.<br>
 		The system supports a maximum of three filterGroups with up to three filters each.<br>
-		More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>`
+		More info <a href="https://developers.hubspot.com/docs/api/crm/search">here</a>`,
 	},
 	{
 		displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/Hubspot/DealDescription.ts b/packages/nodes-base/nodes/Hubspot/DealDescription.ts
index fac19b248..837c37a23 100644
--- a/packages/nodes-base/nodes/Hubspot/DealDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/DealDescription.ts
@@ -67,7 +67,7 @@ export const dealFields = [
 		type: 'options',
 		required: true,
 		typeOptions: {
-			loadOptionsMethod: 'getDealStages'
+			loadOptionsMethod: 'getDealStages',
 		},
 		displayOptions: {
 			show: {
@@ -151,7 +151,7 @@ export const dealFields = [
 				},
 				default: [],
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 deal:update                                */
@@ -203,7 +203,7 @@ export const dealFields = [
 				type: 'options',
 				required: true,
 				typeOptions: {
-					loadOptionsMethod: 'getDealStages'
+					loadOptionsMethod: 'getDealStages',
 				},
 				default: '',
 				description: 'The dealstage is required when creating a deal. See the CRM Pipelines API for details on managing pipelines and stages.',
@@ -235,7 +235,7 @@ export const dealFields = [
 				},
 				default: '',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                  deal:get                                  */
@@ -283,7 +283,7 @@ export const dealFields = [
 				description: `By default, you will only get data for the most recent version of a property in the "versions" data.<br/>
 				If you include this parameter, you will get data for all previous versions.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 deal:getAll                                */
@@ -372,7 +372,7 @@ export const dealFields = [
 				description: `Works similarly to properties=, but this parameter will include the history for the specified property,<br/>
 				instead of just including the current value. Use this parameter when you need the full history of changes to a property's value.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 deal:delete                                */
@@ -474,6 +474,6 @@ export const dealFields = [
 				description: `By default, you will only get data for the most recent version of a property in the "versions" data.<br/>
 				If you include this parameter, you will get data for all previous versions.`,
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
index ad62fd76a..aaae8c589 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
@@ -17,28 +17,28 @@ import {
  } from './GenericFunctions';
 
  import {
-	contactOperations,
 	contactFields,
+	contactOperations,
 } from './ContactDescription';
 
  import {
-	companyOperations,
 	companyFields,
+	companyOperations,
 } from './CompanyDescription';
 
 import {
-	dealOperations,
 	dealFields,
+	dealOperations,
 } from './DealDescription';
 
 import {
-	formOperations,
 	formFields,
+	formOperations,
  } from './FormDescription';
 
  import {
-	ticketOperations,
 	ticketFields,
+	ticketOperations,
 } from './TicketDescription';
 
 import {
@@ -46,8 +46,8 @@ import {
 } from './FormInterface';
 
 import {
-	IDeal,
 	IAssociation,
+	IDeal,
 } from './DealInterface';
 
 import {
@@ -1762,7 +1762,7 @@ export class Hubspot implements INodeType {
 					if (stage) {
 						body.properties.push({
 							name: 'dealstage',
-							value: stage
+							value: stage,
 						});
 					}
 					if (additionalFields.associatedCompany) {
@@ -1774,31 +1774,31 @@ export class Hubspot implements INodeType {
 					if (additionalFields.dealName) {
 						body.properties.push({
 							name: 'dealname',
-							value: additionalFields.dealName as string
+							value: additionalFields.dealName as string,
 						});
 					}
 					if (additionalFields.closeDate) {
 						body.properties.push({
 							name: 'closedate',
-							value: new Date(additionalFields.closeDate as string).getTime()
+							value: new Date(additionalFields.closeDate as string).getTime(),
 						});
 					}
 					if (additionalFields.amount) {
 						body.properties.push({
 							name: 'amount',
-							value: additionalFields.amount as string
+							value: additionalFields.amount as string,
 						});
 					}
 					if (additionalFields.dealType) {
 						body.properties.push({
 							name: 'dealtype',
-							value: additionalFields.dealType as string
+							value: additionalFields.dealType as string,
 						});
 					}
 					if (additionalFields.pipeline) {
 						body.properties.push({
 							name: 'pipeline',
-							value: additionalFields.pipeline as string
+							value: additionalFields.pipeline as string,
 						});
 					}
 					body.associations = association;
@@ -1819,31 +1819,31 @@ export class Hubspot implements INodeType {
 					if (updateFields.dealName) {
 						body.properties.push({
 							name: 'dealname',
-							value: updateFields.dealName as string
+							value: updateFields.dealName as string,
 						});
 					}
 					if (updateFields.closeDate) {
 						body.properties.push({
 							name: 'closedate',
-							value: new Date(updateFields.closeDate as string).getTime()
+							value: new Date(updateFields.closeDate as string).getTime(),
 						});
 					}
 					if (updateFields.amount) {
 						body.properties.push({
 							name: 'amount',
-							value: updateFields.amount as string
+							value: updateFields.amount as string,
 						});
 					}
 					if (updateFields.dealType) {
 						body.properties.push({
 							name: 'dealtype',
-							value: updateFields.dealType as string
+							value: updateFields.dealType as string,
 						});
 					}
 					if (updateFields.pipeline) {
 						body.properties.push({
 							name: 'pipeline',
-							value: updateFields.pipeline as string
+							value: updateFields.pipeline as string,
 						});
 					}
 					const endpoint = `/deals/v1/deal/${dealId}`;
@@ -1987,7 +1987,7 @@ export class Hubspot implements INodeType {
 					if (additionalFields.category) {
 						body.push({
 							name: 'hs_ticket_category',
-							value: additionalFields.category as string
+							value: additionalFields.category as string,
 						});
 					}
 					if (additionalFields.closeDate) {
@@ -2005,31 +2005,31 @@ export class Hubspot implements INodeType {
 					if (additionalFields.description) {
 						body.push({
 							name: 'content',
-							value: additionalFields.description as string
+							value: additionalFields.description as string,
 						});
 					}
 					if (additionalFields.priority) {
 						body.push({
 							name: 'hs_ticket_priority',
-							value: additionalFields.priority as string
+							value: additionalFields.priority as string,
 						});
 					}
 					if (additionalFields.resolution) {
 						body.push({
 							name: 'hs_resolution',
-							value: additionalFields.resolution as string
+							value: additionalFields.resolution as string,
 						});
 					}
 					if (additionalFields.source) {
 						body.push({
 							name: 'source_type',
-							value: additionalFields.source as string
+							value: additionalFields.source as string,
 						});
 					}
 					if (additionalFields.ticketOwnerId) {
 						body.push({
 							name: 'hubspot_owner_id',
-							value: additionalFields.ticketOwnerId as string
+							value: additionalFields.ticketOwnerId as string,
 						});
 					}
 					const endpoint = '/crm-objects/v1/objects/tickets';
@@ -2123,7 +2123,7 @@ export class Hubspot implements INodeType {
 					if (updateFields.category) {
 						body.push({
 							name: 'hs_ticket_category',
-							value: updateFields.category as string
+							value: updateFields.category as string,
 						});
 					}
 					if (updateFields.closeDate) {
@@ -2141,31 +2141,31 @@ export class Hubspot implements INodeType {
 					if (updateFields.description) {
 						body.push({
 							name: 'content',
-							value: updateFields.description as string
+							value: updateFields.description as string,
 						});
 					}
 					if (updateFields.priority) {
 						body.push({
 							name: 'hs_ticket_priority',
-							value: updateFields.priority as string
+							value: updateFields.priority as string,
 						});
 					}
 					if (updateFields.resolution) {
 						body.push({
 							name: 'hs_resolution',
-							value: updateFields.resolution as string
+							value: updateFields.resolution as string,
 						});
 					}
 					if (updateFields.source) {
 						body.push({
 							name: 'source_type',
-							value: updateFields.source as string
+							value: updateFields.source as string,
 						});
 					}
 					if (updateFields.ticketOwnerId) {
 						body.push({
 							name: 'hubspot_owner_id',
-							value: updateFields.ticketOwnerId as string
+							value: updateFields.ticketOwnerId as string,
 						});
 					}
 					const endpoint = `/crm-objects/v1/objects/tickets/${ticketId}`;
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 0970172ea..1274d929f 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -4,10 +4,10 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Hubspot/TicketDescription.ts b/packages/nodes-base/nodes/Hubspot/TicketDescription.ts
index f810f2f03..adf6236b5 100644
--- a/packages/nodes-base/nodes/Hubspot/TicketDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/TicketDescription.ts
@@ -57,7 +57,7 @@ export const ticketFields = [
 		type: 'options',
 		required: true,
 		typeOptions: {
-			loadOptionsMethod: 'getTicketPipelines'
+			loadOptionsMethod: 'getTicketPipelines',
 		},
 		displayOptions: {
 			show: {
@@ -139,7 +139,7 @@ export const ticketFields = [
 					loadOptionsMethod:'getCompanies' ,
 				},
 				default: [],
-				description: 'Companies associated with the ticket'
+				description: 'Companies associated with the ticket',
 			},
 			{
 				displayName: 'Contact Ids',
@@ -149,7 +149,7 @@ export const ticketFields = [
 					loadOptionsMethod:'getContacts' ,
 				},
 				default: [],
-				description: 'Contacts associated with the ticket'
+				description: 'Contacts associated with the ticket',
 			},
 			{
 				displayName: 'Category',
@@ -274,7 +274,7 @@ export const ticketFields = [
 					loadOptionsMethod:'getCompanies' ,
 				},
 				default: [],
-				description: 'Companies associated with the ticket'
+				description: 'Companies associated with the ticket',
 			},
 			{
 				displayName: 'Contact Ids',
@@ -284,7 +284,7 @@ export const ticketFields = [
 					loadOptionsMethod:'getContacts' ,
 				},
 				default: [],
-				description: 'Contact associated with the ticket'
+				description: 'Contact associated with the ticket',
 			},
 			{
 				displayName: 'Category',
@@ -325,7 +325,7 @@ export const ticketFields = [
 				name: 'pipelineId',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getTicketPipelines'
+					loadOptionsMethod: 'getTicketPipelines',
 				},
 				default: '',
 				description: 'The ID of the pipeline the ticket is in. ',
diff --git a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
index e566db93e..0cceacd77 100644
--- a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
@@ -18,7 +18,7 @@ export async function hunterApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs,
 		body,
 		uri: uri ||`https://api.hunter.io/v2${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Hunter/Hunter.node.ts b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
index d4e1f8d76..c3f6d147d 100644
--- a/packages/nodes-base/nodes/Hunter/Hunter.node.ts
+++ b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
@@ -3,9 +3,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	hunterApiRequest,
@@ -31,7 +31,7 @@ export class Hunter implements INodeType {
 			{
 				name: 'hunterApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -150,7 +150,7 @@ export class Hunter implements INodeType {
 								name: 'Generic',
 								value: 'generic',
 							},
-						]
+						],
 					},
 					{
 						displayName: 'Seniority',
@@ -170,7 +170,7 @@ export class Hunter implements INodeType {
 								name: 'Executive',
 								value: 'executive',
 							},
-						]
+						],
 					},
 					{
 						displayName: 'Department',
@@ -218,7 +218,7 @@ export class Hunter implements INodeType {
 								name: 'Communication',
 								value: 'communication',
 							},
-						]
+						],
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/If.node.ts b/packages/nodes-base/nodes/If.node.ts
index 9b649050b..70bac4fb5 100644
--- a/packages/nodes-base/nodes/If.node.ts
+++ b/packages/nodes-base/nodes/If.node.ts
@@ -53,11 +53,11 @@ export class If implements INodeType {
 								options: [
 									{
 										name: 'Equal',
-										value: 'equal'
+										value: 'equal',
 									},
 									{
 										name: 'Not Equal',
-										value: 'notEqual'
+										value: 'notEqual',
 									},
 								],
 								default: 'equal',
@@ -90,27 +90,27 @@ export class If implements INodeType {
 								options: [
 									{
 										name: 'Smaller',
-										value: 'smaller'
+										value: 'smaller',
 									},
 									{
 										name: 'Smaller Equal',
-										value: 'smallerEqual'
+										value: 'smallerEqual',
 									},
 									{
 										name: 'Equal',
-										value: 'equal'
+										value: 'equal',
 									},
 									{
 										name: 'Not Equal',
-										value: 'notEqual'
+										value: 'notEqual',
 									},
 									{
 										name: 'Larger',
-										value: 'larger'
+										value: 'larger',
 									},
 									{
 										name: 'Larger Equal',
-										value: 'largerEqual'
+										value: 'largerEqual',
 									},
 								],
 								default: 'smaller',
@@ -143,23 +143,23 @@ export class If implements INodeType {
 								options: [
 									{
 										name: 'Contains',
-										value: 'contains'
+										value: 'contains',
 									},
 									{
 										name: 'Equal',
-										value: 'equal'
+										value: 'equal',
 									},
 									{
 										name: 'Not Contains',
-										value: 'notContains'
+										value: 'notContains',
 									},
 									{
 										name: 'Not Equal',
-										value: 'notEqual'
+										value: 'notEqual',
 									},
 									{
 										name: 'Regex',
-										value: 'regex'
+										value: 'regex',
 									},
 								],
 								default: 'equal',
@@ -206,12 +206,12 @@ export class If implements INodeType {
 					{
 						name: 'ALL',
 						description: 'Only if all conditions are meet it goes into "true" branch.',
-						value: 'all'
+						value: 'all',
 					},
 					{
 						name: 'ANY',
 						description: 'If any of the conditions is meet it goes into "true" branch.',
-						value: 'any'
+						value: 'any',
 					},
 				],
 				default: 'all',
diff --git a/packages/nodes-base/nodes/Intercom/CompanyDescription.ts b/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
index df8239719..f2b0a00d8 100644
--- a/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
@@ -173,7 +173,7 @@ export const companyFields = [
 				default: '',
 				description: 'Tag representing the Lead',
 			},
-		]
+		],
 	},
 
 /* -------------------------------------------------------------------------- */
@@ -335,7 +335,7 @@ export const companyFields = [
 				default: '',
 				description: `The URL for this company's website. Please note that the value<br />specified here is not validated. Accepts any string.`,
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Custom Attributes',
@@ -404,7 +404,7 @@ export const companyFields = [
 						default: '',
 					},
 				],
-			}
+			},
 		],
 		description: 'A hash of key/value pairs to represent custom data you want to attribute to a user.',
 	},
diff --git a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
index be68ef0c3..94a2f50f8 100644
--- a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
@@ -2,9 +2,9 @@ import { OptionsWithUri } from 'request';
 
 import {
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions
 } from 'n8n-core';
 
 import {
@@ -26,7 +26,7 @@ export async function intercomApiRequest(this: IHookFunctions | IExecuteFunction
 		qs: query,
 		uri: uri || `https://api.intercom.io${endpoint}`,
 		body,
-		json: true
+		json: true,
 	};
 
 	try {
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index d7d1890d5..181b37d96 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -3,15 +3,15 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
-	leadOpeations,
 	leadFields,
+	leadOpeations,
 } from './LeadDescription';
 import {
 	intercomApiRequest,
@@ -19,13 +19,22 @@ import {
 	validateJSON,
 } from './GenericFunctions';
 import {
+	IAvatar,
 	ILead,
 	ILeadCompany,
-	IAvatar,
  } from './LeadInterface';
-import { userOpeations, userFields } from './UserDescription';
-import { IUser, IUserCompany } from './UserInterface';
-import { companyOperations, companyFields } from './CompanyDescription';
+import {
+	userFields,
+	userOpeations,
+} from './UserDescription';
+import {
+	IUser,
+	IUserCompany,
+} from './UserInterface';
+import {
+	companyFields,
+	companyOperations,
+} from './CompanyDescription';
 import { ICompany } from './CompanyInteface';
 
 export class Intercom implements INodeType {
@@ -47,7 +56,7 @@ export class Intercom implements INodeType {
 			{
 				name: 'intercomApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/Intercom/LeadDescription.ts b/packages/nodes-base/nodes/Intercom/LeadDescription.ts
index e7414ac8b..df0d88ba4 100644
--- a/packages/nodes-base/nodes/Intercom/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/LeadDescription.ts
@@ -37,7 +37,7 @@ export const leadOpeations = [
 				name: 'Delete',
 				value: 'delete',
 				description: 'Delete a lead',
-			}
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -235,7 +235,7 @@ export const leadFields = [
 				default: '',
 				description: 'The phone number of the lead',
 			},
-		]
+		],
 	},
 
 /* -------------------------------------------------------------------------- */
@@ -445,7 +445,7 @@ export const leadFields = [
 				default: '',
 				description: 'Identifies what specifically was clicked to bring the user to the site',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Custom Attributes',
@@ -514,7 +514,7 @@ export const leadFields = [
 						default: '',
 					},
 				],
-			}
+			},
 		],
 		description: 'A hash of key/value pairs to represent custom data you want to attribute to a user.',
 	},
diff --git a/packages/nodes-base/nodes/Intercom/UserDescription.ts b/packages/nodes-base/nodes/Intercom/UserDescription.ts
index b54952b5f..91de3a488 100644
--- a/packages/nodes-base/nodes/Intercom/UserDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/UserDescription.ts
@@ -37,7 +37,7 @@ export const userOpeations = [
 				name: 'Delete',
 				value: 'delete',
 				description: 'Delete a user',
-			}
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -339,7 +339,7 @@ export const userFields = [
 					'update',
 				],
 				resource: [
-					'user'
+					'user',
 				],
 			},
 		},
@@ -357,7 +357,7 @@ export const userFields = [
 					'update',
 				],
 				resource: [
-					'user'
+					'user',
 				],
 			},
 		},
@@ -371,13 +371,13 @@ export const userFields = [
 							'update',
 						],
 						'/resource': [
-							'user'
+							'user',
 						],
 					},
 					hide: {
 						'/updateBy': [
 							'email',
-						]
+						],
 					},
 				},
 				type: 'string',
@@ -393,14 +393,14 @@ export const userFields = [
 							'update',
 						],
 						'/resource': [
-							'user'
+							'user',
 						],
 					},
 					hide: {
 						'/updateBy': [
 							'email',
 							'userId',
-						]
+						],
 					},
 				},
 				type: 'string',
@@ -498,7 +498,7 @@ export const userFields = [
 				default: '',
 				description: 'Identifies what specifically was clicked to bring the user to the site',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Custom Attributes',
@@ -567,7 +567,7 @@ export const userFields = [
 						default: '',
 					},
 				],
-			}
+			},
 		],
 		description: 'A hash of key/value pairs to represent custom data you want to attribute to a user.',
 	},
diff --git a/packages/nodes-base/nodes/Interval.node.ts b/packages/nodes-base/nodes/Interval.node.ts
index 328833f3f..9abe96879 100644
--- a/packages/nodes-base/nodes/Interval.node.ts
+++ b/packages/nodes-base/nodes/Interval.node.ts
@@ -38,21 +38,21 @@ export class Interval implements INodeType {
 				options: [
 					{
 						name: 'Seconds',
-						value: 'seconds'
+						value: 'seconds',
 					},
 					{
 						name: 'Minutes',
-						value: 'minutes'
+						value: 'minutes',
 					},
 					{
 						name: 'Hours',
-						value: 'hours'
+						value: 'hours',
 					},
 				],
 				default: 'seconds',
 				description: 'Unit of the interval value.',
 			},
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/InvoiceNinja/ClientDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/ClientDescription.ts
index 4a9a467d8..d5325575d 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/ClientDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/ClientDescription.ts
@@ -99,7 +99,7 @@ export const clientFields = [
 				type: 'string',
 				default: '',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Billing Address',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
index 3bf3f6977..11ad90d08 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
@@ -315,7 +315,7 @@ export const expenseFields = [
 				},
 				default: '',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 expense:delete                             */
diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
index 9d690807c..dc9fabeb0 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
@@ -29,7 +29,7 @@ export async function invoiceNinjaApiRequest(this: IHookFunctions | IExecuteFunc
 		qs: query,
 		uri: uri || `${baseUrl}/api/v1${endpoint}`,
 		body,
-		json: true
+		json: true,
 	};
 	try {
 		return await this.helpers.request!(options);
diff --git a/packages/nodes-base/nodes/InvoiceNinja/ISOCountryCodes.ts b/packages/nodes-base/nodes/InvoiceNinja/ISOCountryCodes.ts
index 3948ee628..19eb79621 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/ISOCountryCodes.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/ISOCountryCodes.ts
@@ -2,1580 +2,1580 @@ import { IDataObject } from "n8n-workflow";
 
 export const countryCodes = [
 	{
-	  "name": "Afghanistan",
-	  "alpha2": "AF",
-	  "alpha3": "AFG",
-	  "numeric": "004"
+		"name": "Afghanistan",
+		"alpha2": "AF",
+		"alpha3": "AFG",
+		"numeric": "004",
 	},
 	{
-	  "name": "Åland Islands",
-	  "alpha2": "AX",
-	  "alpha3": "ALA",
-	  "numeric": "248",
-	  "altName": "Aland Islands"
+		"name": "Åland Islands",
+		"alpha2": "AX",
+		"alpha3": "ALA",
+		"numeric": "248",
+		"altName": "Aland Islands",
 	},
 	{
-	  "name": "Albania",
-	  "alpha2": "AL",
-	  "alpha3": "ALB",
-	  "numeric": "008"
+		"name": "Albania",
+		"alpha2": "AL",
+		"alpha3": "ALB",
+		"numeric": "008",
 	},
 	{
-	  "name": "Algeria",
-	  "alpha2": "DZ",
-	  "alpha3": "DZA",
-	  "numeric": "012"
+		"name": "Algeria",
+		"alpha2": "DZ",
+		"alpha3": "DZA",
+		"numeric": "012",
 	},
 	{
-	  "name": "American Samoa",
-	  "alpha2": "AS",
-	  "alpha3": "ASM",
-	  "numeric": "016"
+		"name": "American Samoa",
+		"alpha2": "AS",
+		"alpha3": "ASM",
+		"numeric": "016",
 	},
 	{
-	  "name": "Andorra",
-	  "alpha2": "AD",
-	  "alpha3": "AND",
-	  "numeric": "020"
+		"name": "Andorra",
+		"alpha2": "AD",
+		"alpha3": "AND",
+		"numeric": "020",
 	},
 	{
-	  "name": "Angola",
-	  "alpha2": "AO",
-	  "alpha3": "AGO",
-	  "numeric": "024"
+		"name": "Angola",
+		"alpha2": "AO",
+		"alpha3": "AGO",
+		"numeric": "024",
 	},
 	{
-	  "name": "Anguilla",
-	  "alpha2": "AI",
-	  "alpha3": "AIA",
-	  "numeric": "660"
+		"name": "Anguilla",
+		"alpha2": "AI",
+		"alpha3": "AIA",
+		"numeric": "660",
 	},
 	{
-	  "name": "Antarctica",
-	  "alpha2": "AQ",
-	  "alpha3": "ATA",
-	  "numeric": "010"
+		"name": "Antarctica",
+		"alpha2": "AQ",
+		"alpha3": "ATA",
+		"numeric": "010",
 	},
 	{
-	  "name": "Antigua and Barbuda",
-	  "alpha2": "AG",
-	  "alpha3": "ATG",
-	  "numeric": "028"
+		"name": "Antigua and Barbuda",
+		"alpha2": "AG",
+		"alpha3": "ATG",
+		"numeric": "028",
 	},
 	{
-	  "name": "Argentina",
-	  "alpha2": "AR",
-	  "alpha3": "ARG",
-	  "numeric": "032"
+		"name": "Argentina",
+		"alpha2": "AR",
+		"alpha3": "ARG",
+		"numeric": "032",
 	},
 	{
-	  "name": "Armenia",
-	  "alpha2": "AM",
-	  "alpha3": "ARM",
-	  "numeric": "051"
+		"name": "Armenia",
+		"alpha2": "AM",
+		"alpha3": "ARM",
+		"numeric": "051",
 	},
 	{
-	  "name": "Aruba",
-	  "alpha2": "AW",
-	  "alpha3": "ABW",
-	  "numeric": "533"
+		"name": "Aruba",
+		"alpha2": "AW",
+		"alpha3": "ABW",
+		"numeric": "533",
 	},
 	{
-	  "name": "Australia",
-	  "alpha2": "AU",
-	  "alpha3": "AUS",
-	  "numeric": "036"
+		"name": "Australia",
+		"alpha2": "AU",
+		"alpha3": "AUS",
+		"numeric": "036",
 	},
 	{
-	  "name": "Austria",
-	  "alpha2": "AT",
-	  "alpha3": "AUT",
-	  "numeric": "040"
+		"name": "Austria",
+		"alpha2": "AT",
+		"alpha3": "AUT",
+		"numeric": "040",
 	},
 	{
-	  "name": "Azerbaijan",
-	  "alpha2": "AZ",
-	  "alpha3": "AZE",
-	  "numeric": "031"
+		"name": "Azerbaijan",
+		"alpha2": "AZ",
+		"alpha3": "AZE",
+		"numeric": "031",
 	},
 	{
-	  "name": "Bahamas (the)",
-	  "alpha2": "BS",
-	  "alpha3": "BHS",
-	  "numeric": "044",
-	  "altName": "Bahamas"
+		"name": "Bahamas (the)",
+		"alpha2": "BS",
+		"alpha3": "BHS",
+		"numeric": "044",
+		"altName": "Bahamas",
 	},
 	{
-	  "name": "Bahrain",
-	  "alpha2": "BH",
-	  "alpha3": "BHR",
-	  "numeric": "048"
+		"name": "Bahrain",
+		"alpha2": "BH",
+		"alpha3": "BHR",
+		"numeric": "048",
 	},
 	{
-	  "name": "Bangladesh",
-	  "alpha2": "BD",
-	  "alpha3": "BGD",
-	  "numeric": "050"
+		"name": "Bangladesh",
+		"alpha2": "BD",
+		"alpha3": "BGD",
+		"numeric": "050",
 	},
 	{
-	  "name": "Barbados",
-	  "alpha2": "BB",
-	  "alpha3": "BRB",
-	  "numeric": "052"
+		"name": "Barbados",
+		"alpha2": "BB",
+		"alpha3": "BRB",
+		"numeric": "052",
 	},
 	{
-	  "name": "Belarus",
-	  "alpha2": "BY",
-	  "alpha3": "BLR",
-	  "numeric": "112"
+		"name": "Belarus",
+		"alpha2": "BY",
+		"alpha3": "BLR",
+		"numeric": "112",
 	},
 	{
-	  "name": "Belgium",
-	  "alpha2": "BE",
-	  "alpha3": "BEL",
-	  "numeric": "056"
+		"name": "Belgium",
+		"alpha2": "BE",
+		"alpha3": "BEL",
+		"numeric": "056",
 	},
 	{
-	  "name": "Belize",
-	  "alpha2": "BZ",
-	  "alpha3": "BLZ",
-	  "numeric": "084"
+		"name": "Belize",
+		"alpha2": "BZ",
+		"alpha3": "BLZ",
+		"numeric": "084",
 	},
 	{
-	  "name": "Benin",
-	  "alpha2": "BJ",
-	  "alpha3": "BEN",
-	  "numeric": "204"
+		"name": "Benin",
+		"alpha2": "BJ",
+		"alpha3": "BEN",
+		"numeric": "204",
 	},
 	{
-	  "name": "Bermuda",
-	  "alpha2": "BM",
-	  "alpha3": "BMU",
-	  "numeric": "060"
+		"name": "Bermuda",
+		"alpha2": "BM",
+		"alpha3": "BMU",
+		"numeric": "060",
 	},
 	{
-	  "name": "Bhutan",
-	  "alpha2": "BT",
-	  "alpha3": "BTN",
-	  "numeric": "064"
+		"name": "Bhutan",
+		"alpha2": "BT",
+		"alpha3": "BTN",
+		"numeric": "064",
 	},
 	{
-	  "name": "Bolivia (Plurinational State of)",
-	  "alpha2": "BO",
-	  "alpha3": "BOL",
-	  "numeric": "068",
-	  "altName": "Bolivia"
+		"name": "Bolivia (Plurinational State of)",
+		"alpha2": "BO",
+		"alpha3": "BOL",
+		"numeric": "068",
+		"altName": "Bolivia",
 	},
 	{
-	  "name": "Bonaire, Sint Eustatius and Saba",
-	  "alpha2": "BQ",
-	  "alpha3": "BES",
-	  "numeric": "535"
+		"name": "Bonaire, Sint Eustatius and Saba",
+		"alpha2": "BQ",
+		"alpha3": "BES",
+		"numeric": "535",
 	},
 	{
-	  "name": "Bosnia and Herzegovina",
-	  "alpha2": "BA",
-	  "alpha3": "BIH",
-	  "numeric": "070"
+		"name": "Bosnia and Herzegovina",
+		"alpha2": "BA",
+		"alpha3": "BIH",
+		"numeric": "070",
 	},
 	{
-	  "name": "Botswana",
-	  "alpha2": "BW",
-	  "alpha3": "BWA",
-	  "numeric": "072"
+		"name": "Botswana",
+		"alpha2": "BW",
+		"alpha3": "BWA",
+		"numeric": "072",
 	},
 	{
-	  "name": "Bouvet Island",
-	  "alpha2": "BV",
-	  "alpha3": "BVT",
-	  "numeric": "074"
+		"name": "Bouvet Island",
+		"alpha2": "BV",
+		"alpha3": "BVT",
+		"numeric": "074",
 	},
 	{
-	  "name": "Brazil",
-	  "alpha2": "BR",
-	  "alpha3": "BRA",
-	  "numeric": "076"
+		"name": "Brazil",
+		"alpha2": "BR",
+		"alpha3": "BRA",
+		"numeric": "076",
 	},
 	{
-	  "name": "British Indian Ocean Territory (the)",
-	  "alpha2": "IO",
-	  "alpha3": "IOT",
-	  "numeric": "086",
-	  "altName": "British Indian Ocean Territory"
+		"name": "British Indian Ocean Territory (the)",
+		"alpha2": "IO",
+		"alpha3": "IOT",
+		"numeric": "086",
+		"altName": "British Indian Ocean Territory",
 	},
 	{
-	  "name": "Brunei Darussalam",
-	  "alpha2": "BN",
-	  "alpha3": "BRN",
-	  "numeric": "096",
-	  "shortName": "Brunei"
+		"name": "Brunei Darussalam",
+		"alpha2": "BN",
+		"alpha3": "BRN",
+		"numeric": "096",
+		"shortName": "Brunei",
 	},
 	{
-	  "name": "Bulgaria",
-	  "alpha2": "BG",
-	  "alpha3": "BGR",
-	  "numeric": "100"
+		"name": "Bulgaria",
+		"alpha2": "BG",
+		"alpha3": "BGR",
+		"numeric": "100",
 	},
 	{
-	  "name": "Burkina Faso",
-	  "alpha2": "BF",
-	  "alpha3": "BFA",
-	  "numeric": "854"
+		"name": "Burkina Faso",
+		"alpha2": "BF",
+		"alpha3": "BFA",
+		"numeric": "854",
 	},
 	{
-	  "name": "Burundi",
-	  "alpha2": "BI",
-	  "alpha3": "BDI",
-	  "numeric": "108"
+		"name": "Burundi",
+		"alpha2": "BI",
+		"alpha3": "BDI",
+		"numeric": "108",
 	},
 	{
-	  "name": "Cabo Verde",
-	  "alpha2": "CV",
-	  "alpha3": "CPV",
-	  "numeric": "132",
-	  "altName": "Cape Verde"
+		"name": "Cabo Verde",
+		"alpha2": "CV",
+		"alpha3": "CPV",
+		"numeric": "132",
+		"altName": "Cape Verde",
 	},
 	{
-	  "name": "Cambodia",
-	  "alpha2": "KH",
-	  "alpha3": "KHM",
-	  "numeric": "116"
+		"name": "Cambodia",
+		"alpha2": "KH",
+		"alpha3": "KHM",
+		"numeric": "116",
 	},
 	{
-	  "name": "Cameroon",
-	  "alpha2": "CM",
-	  "alpha3": "CMR",
-	  "numeric": "120"
+		"name": "Cameroon",
+		"alpha2": "CM",
+		"alpha3": "CMR",
+		"numeric": "120",
 	},
 	{
-	  "name": "Canada",
-	  "alpha2": "CA",
-	  "alpha3": "CAN",
-	  "numeric": "124"
+		"name": "Canada",
+		"alpha2": "CA",
+		"alpha3": "CAN",
+		"numeric": "124",
 	},
 	{
-	  "name": "Cayman Islands (the)",
-	  "alpha2": "KY",
-	  "alpha3": "CYM",
-	  "numeric": "136",
-	  "altName": "Cayman Islands"
+		"name": "Cayman Islands (the)",
+		"alpha2": "KY",
+		"alpha3": "CYM",
+		"numeric": "136",
+		"altName": "Cayman Islands",
 	},
 	{
-	  "name": "Central African Republic (the)",
-	  "alpha2": "CF",
-	  "alpha3": "CAF",
-	  "numeric": "140",
-	  "altName": "Central African Republic"
+		"name": "Central African Republic (the)",
+		"alpha2": "CF",
+		"alpha3": "CAF",
+		"numeric": "140",
+		"altName": "Central African Republic",
 	},
 	{
-	  "name": "Chad",
-	  "alpha2": "TD",
-	  "alpha3": "TCD",
-	  "numeric": "148"
+		"name": "Chad",
+		"alpha2": "TD",
+		"alpha3": "TCD",
+		"numeric": "148",
 	},
 	{
-	  "name": "Chile",
-	  "alpha2": "CL",
-	  "alpha3": "CHL",
-	  "numeric": "152"
+		"name": "Chile",
+		"alpha2": "CL",
+		"alpha3": "CHL",
+		"numeric": "152",
 	},
 	{
-	  "name": "China",
-	  "alpha2": "CN",
-	  "alpha3": "CHN",
-	  "numeric": "156"
+		"name": "China",
+		"alpha2": "CN",
+		"alpha3": "CHN",
+		"numeric": "156",
 	},
 	{
-	  "name": "Christmas Island",
-	  "alpha2": "CX",
-	  "alpha3": "CXR",
-	  "numeric": "162"
+		"name": "Christmas Island",
+		"alpha2": "CX",
+		"alpha3": "CXR",
+		"numeric": "162",
 	},
 	{
-	  "name": "Cocos (Keeling) Islands (the)",
-	  "alpha2": "CC",
-	  "alpha3": "CCK",
-	  "numeric": "166",
-	  "altName": "Cocos (Keeling) Islands",
-	  "shortName": "Cocos Islands"
+		"name": "Cocos (Keeling) Islands (the)",
+		"alpha2": "CC",
+		"alpha3": "CCK",
+		"numeric": "166",
+		"altName": "Cocos (Keeling) Islands",
+		"shortName": "Cocos Islands",
 	},
 	{
-	  "name": "Colombia",
-	  "alpha2": "CO",
-	  "alpha3": "COL",
-	  "numeric": "170"
+		"name": "Colombia",
+		"alpha2": "CO",
+		"alpha3": "COL",
+		"numeric": "170",
 	},
 	{
-	  "name": "Comoros (the)",
-	  "alpha2": "KM",
-	  "alpha3": "COM",
-	  "numeric": "174",
-	  "altName": "Comoros"
+		"name": "Comoros (the)",
+		"alpha2": "KM",
+		"alpha3": "COM",
+		"numeric": "174",
+		"altName": "Comoros",
 	},
 	{
-	  "name": "Congo (the Democratic Republic of the)",
-	  "alpha2": "CD",
-	  "alpha3": "COD",
-	  "numeric": "180",
-	  "altName": "Congo, (Kinshasa)",
-	  "shortName": "Democratic Republic of the Congo"
+		"name": "Congo (the Democratic Republic of the)",
+		"alpha2": "CD",
+		"alpha3": "COD",
+		"numeric": "180",
+		"altName": "Congo, (Kinshasa)",
+		"shortName": "Democratic Republic of the Congo",
 	},
 	{
-	  "name": "Congo (the)",
-	  "alpha2": "CG",
-	  "alpha3": "COG",
-	  "numeric": "178",
-	  "altName": "Congo (Brazzaville)",
-	  "shortName": "Republic of the Congo"
+		"name": "Congo (the)",
+		"alpha2": "CG",
+		"alpha3": "COG",
+		"numeric": "178",
+		"altName": "Congo (Brazzaville)",
+		"shortName": "Republic of the Congo",
 	},
 	{
-	  "name": "Cook Islands (the)",
-	  "alpha2": "CK",
-	  "alpha3": "COK",
-	  "numeric": "184",
-	  "altName": "Cook Islands"
+		"name": "Cook Islands (the)",
+		"alpha2": "CK",
+		"alpha3": "COK",
+		"numeric": "184",
+		"altName": "Cook Islands",
 	},
 	{
-	  "name": "Costa Rica",
-	  "alpha2": "CR",
-	  "alpha3": "CRI",
-	  "numeric": "188"
+		"name": "Costa Rica",
+		"alpha2": "CR",
+		"alpha3": "CRI",
+		"numeric": "188",
 	},
 	{
-	  "name": "Côte d'Ivoire",
-	  "alpha2": "CI",
-	  "alpha3": "CIV",
-	  "numeric": "384",
-	  "shortName": "Ivory Coast"
+		"name": "Côte d'Ivoire",
+		"alpha2": "CI",
+		"alpha3": "CIV",
+		"numeric": "384",
+		"shortName": "Ivory Coast",
 	},
 	{
-	  "name": "Croatia",
-	  "alpha2": "HR",
-	  "alpha3": "HRV",
-	  "numeric": "191"
+		"name": "Croatia",
+		"alpha2": "HR",
+		"alpha3": "HRV",
+		"numeric": "191",
 	},
 	{
-	  "name": "Cuba",
-	  "alpha2": "CU",
-	  "alpha3": "CUB",
-	  "numeric": "192"
+		"name": "Cuba",
+		"alpha2": "CU",
+		"alpha3": "CUB",
+		"numeric": "192",
 	},
 	{
-	  "name": "Curaçao",
-	  "alpha2": "CW",
-	  "alpha3": "CUW",
-	  "numeric": "531",
-	  "shortName": "Curacao"
+		"name": "Curaçao",
+		"alpha2": "CW",
+		"alpha3": "CUW",
+		"numeric": "531",
+		"shortName": "Curacao",
 	},
 	{
-	  "name": "Cyprus",
-	  "alpha2": "CY",
-	  "alpha3": "CYP",
-	  "numeric": "196"
+		"name": "Cyprus",
+		"alpha2": "CY",
+		"alpha3": "CYP",
+		"numeric": "196",
 	},
 	{
-	  "name": "Czechia",
-	  "alpha2": "CZ",
-	  "alpha3": "CZE",
-	  "numeric": "203",
-	  "altName": "Czech Republic"
+		"name": "Czechia",
+		"alpha2": "CZ",
+		"alpha3": "CZE",
+		"numeric": "203",
+		"altName": "Czech Republic",
 	},
 	{
-	  "name": "Denmark",
-	  "alpha2": "DK",
-	  "alpha3": "DNK",
-	  "numeric": "208"
+		"name": "Denmark",
+		"alpha2": "DK",
+		"alpha3": "DNK",
+		"numeric": "208",
 	},
 	{
-	  "name": "Djibouti",
-	  "alpha2": "DJ",
-	  "alpha3": "DJI",
-	  "numeric": "262"
+		"name": "Djibouti",
+		"alpha2": "DJ",
+		"alpha3": "DJI",
+		"numeric": "262",
 	},
 	{
-	  "name": "Dominica",
-	  "alpha2": "DM",
-	  "alpha3": "DMA",
-	  "numeric": "212"
+		"name": "Dominica",
+		"alpha2": "DM",
+		"alpha3": "DMA",
+		"numeric": "212",
 	},
 	{
-	  "name": "Dominican Republic (the)",
-	  "alpha2": "DO",
-	  "alpha3": "DOM",
-	  "numeric": "214",
-	  "altName": "Dominican Republic"
+		"name": "Dominican Republic (the)",
+		"alpha2": "DO",
+		"alpha3": "DOM",
+		"numeric": "214",
+		"altName": "Dominican Republic",
 	},
 	{
-	  "name": "Ecuador",
-	  "alpha2": "EC",
-	  "alpha3": "ECU",
-	  "numeric": "218"
+		"name": "Ecuador",
+		"alpha2": "EC",
+		"alpha3": "ECU",
+		"numeric": "218",
 	},
 	{
-	  "name": "Egypt",
-	  "alpha2": "EG",
-	  "alpha3": "EGY",
-	  "numeric": "818"
+		"name": "Egypt",
+		"alpha2": "EG",
+		"alpha3": "EGY",
+		"numeric": "818",
 	},
 	{
-	  "name": "El Salvador",
-	  "alpha2": "SV",
-	  "alpha3": "SLV",
-	  "numeric": "222"
+		"name": "El Salvador",
+		"alpha2": "SV",
+		"alpha3": "SLV",
+		"numeric": "222",
 	},
 	{
-	  "name": "Equatorial Guinea",
-	  "alpha2": "GQ",
-	  "alpha3": "GNQ",
-	  "numeric": "226"
+		"name": "Equatorial Guinea",
+		"alpha2": "GQ",
+		"alpha3": "GNQ",
+		"numeric": "226",
 	},
 	{
-	  "name": "Eritrea",
-	  "alpha2": "ER",
-	  "alpha3": "ERI",
-	  "numeric": "232"
+		"name": "Eritrea",
+		"alpha2": "ER",
+		"alpha3": "ERI",
+		"numeric": "232",
 	},
 	{
-	  "name": "Estonia",
-	  "alpha2": "EE",
-	  "alpha3": "EST",
-	  "numeric": "233"
+		"name": "Estonia",
+		"alpha2": "EE",
+		"alpha3": "EST",
+		"numeric": "233",
 	},
 	{
-	  "name": "Ethiopia",
-	  "alpha2": "ET",
-	  "alpha3": "ETH",
-	  "numeric": "231"
+		"name": "Ethiopia",
+		"alpha2": "ET",
+		"alpha3": "ETH",
+		"numeric": "231",
 	},
 	{
-	  "name": "Falkland Islands (the) [Malvinas]",
-	  "alpha2": "FK",
-	  "alpha3": "FLK",
-	  "numeric": "238",
-	  "altName": "Falkland Islands (Malvinas)",
-	  "shortName": "Falkland Islands"
+		"name": "Falkland Islands (the) [Malvinas]",
+		"alpha2": "FK",
+		"alpha3": "FLK",
+		"numeric": "238",
+		"altName": "Falkland Islands (Malvinas)",
+		"shortName": "Falkland Islands",
 	},
 	{
-	  "name": "Faroe Islands (the)",
-	  "alpha2": "FO",
-	  "alpha3": "FRO",
-	  "numeric": "234",
-	  "altName": "Faroe Islands"
+		"name": "Faroe Islands (the)",
+		"alpha2": "FO",
+		"alpha3": "FRO",
+		"numeric": "234",
+		"altName": "Faroe Islands",
 	},
 	{
-	  "name": "Fiji",
-	  "alpha2": "FJ",
-	  "alpha3": "FJI",
-	  "numeric": "242"
+		"name": "Fiji",
+		"alpha2": "FJ",
+		"alpha3": "FJI",
+		"numeric": "242",
 	},
 	{
-	  "name": "Finland",
-	  "alpha2": "FI",
-	  "alpha3": "FIN",
-	  "numeric": "246"
+		"name": "Finland",
+		"alpha2": "FI",
+		"alpha3": "FIN",
+		"numeric": "246",
 	},
 	{
-	  "name": "France",
-	  "alpha2": "FR",
-	  "alpha3": "FRA",
-	  "numeric": "250"
+		"name": "France",
+		"alpha2": "FR",
+		"alpha3": "FRA",
+		"numeric": "250",
 	},
 	{
-	  "name": "French Guiana",
-	  "alpha2": "GF",
-	  "alpha3": "GUF",
-	  "numeric": "254"
+		"name": "French Guiana",
+		"alpha2": "GF",
+		"alpha3": "GUF",
+		"numeric": "254",
 	},
 	{
-	  "name": "French Polynesia",
-	  "alpha2": "PF",
-	  "alpha3": "PYF",
-	  "numeric": "258"
+		"name": "French Polynesia",
+		"alpha2": "PF",
+		"alpha3": "PYF",
+		"numeric": "258",
 	},
 	{
-	  "name": "French Southern Territories (the)",
-	  "alpha2": "TF",
-	  "alpha3": "ATF",
-	  "numeric": "260",
-	  "altName": "French Southern Territories"
+		"name": "French Southern Territories (the)",
+		"alpha2": "TF",
+		"alpha3": "ATF",
+		"numeric": "260",
+		"altName": "French Southern Territories",
 	},
 	{
-	  "name": "Gabon",
-	  "alpha2": "GA",
-	  "alpha3": "GAB",
-	  "numeric": "266"
+		"name": "Gabon",
+		"alpha2": "GA",
+		"alpha3": "GAB",
+		"numeric": "266",
 	},
 	{
-	  "name": "Gambia (the)",
-	  "alpha2": "GM",
-	  "alpha3": "GMB",
-	  "numeric": "270",
-	  "altName": "Gambia"
+		"name": "Gambia (the)",
+		"alpha2": "GM",
+		"alpha3": "GMB",
+		"numeric": "270",
+		"altName": "Gambia",
 	},
 	{
-	  "name": "Georgia",
-	  "alpha2": "GE",
-	  "alpha3": "GEO",
-	  "numeric": "268"
+		"name": "Georgia",
+		"alpha2": "GE",
+		"alpha3": "GEO",
+		"numeric": "268",
 	},
 	{
-	  "name": "Germany",
-	  "alpha2": "DE",
-	  "alpha3": "DEU",
-	  "numeric": "276"
+		"name": "Germany",
+		"alpha2": "DE",
+		"alpha3": "DEU",
+		"numeric": "276",
 	},
 	{
-	  "name": "Ghana",
-	  "alpha2": "GH",
-	  "alpha3": "GHA",
-	  "numeric": "288"
+		"name": "Ghana",
+		"alpha2": "GH",
+		"alpha3": "GHA",
+		"numeric": "288",
 	},
 	{
-	  "name": "Gibraltar",
-	  "alpha2": "GI",
-	  "alpha3": "GIB",
-	  "numeric": "292"
+		"name": "Gibraltar",
+		"alpha2": "GI",
+		"alpha3": "GIB",
+		"numeric": "292",
 	},
 	{
-	  "name": "Greece",
-	  "alpha2": "GR",
-	  "alpha3": "GRC",
-	  "numeric": "300"
+		"name": "Greece",
+		"alpha2": "GR",
+		"alpha3": "GRC",
+		"numeric": "300",
 	},
 	{
-	  "name": "Greenland",
-	  "alpha2": "GL",
-	  "alpha3": "GRL",
-	  "numeric": "304"
+		"name": "Greenland",
+		"alpha2": "GL",
+		"alpha3": "GRL",
+		"numeric": "304",
 	},
 	{
-	  "name": "Grenada",
-	  "alpha2": "GD",
-	  "alpha3": "GRD",
-	  "numeric": "308"
+		"name": "Grenada",
+		"alpha2": "GD",
+		"alpha3": "GRD",
+		"numeric": "308",
 	},
 	{
-	  "name": "Guadeloupe",
-	  "alpha2": "GP",
-	  "alpha3": "GLP",
-	  "numeric": "312"
+		"name": "Guadeloupe",
+		"alpha2": "GP",
+		"alpha3": "GLP",
+		"numeric": "312",
 	},
 	{
-	  "name": "Guam",
-	  "alpha2": "GU",
-	  "alpha3": "GUM",
-	  "numeric": "316"
+		"name": "Guam",
+		"alpha2": "GU",
+		"alpha3": "GUM",
+		"numeric": "316",
 	},
 	{
-	  "name": "Guatemala",
-	  "alpha2": "GT",
-	  "alpha3": "GTM",
-	  "numeric": "320"
+		"name": "Guatemala",
+		"alpha2": "GT",
+		"alpha3": "GTM",
+		"numeric": "320",
 	},
 	{
-	  "name": "Guernsey",
-	  "alpha2": "GG",
-	  "alpha3": "GGY",
-	  "numeric": "831"
+		"name": "Guernsey",
+		"alpha2": "GG",
+		"alpha3": "GGY",
+		"numeric": "831",
 	},
 	{
-	  "name": "Guinea",
-	  "alpha2": "GN",
-	  "alpha3": "GIN",
-	  "numeric": "324"
+		"name": "Guinea",
+		"alpha2": "GN",
+		"alpha3": "GIN",
+		"numeric": "324",
 	},
 	{
-	  "name": "Guinea-Bissau",
-	  "alpha2": "GW",
-	  "alpha3": "GNB",
-	  "numeric": "624"
+		"name": "Guinea-Bissau",
+		"alpha2": "GW",
+		"alpha3": "GNB",
+		"numeric": "624",
 	},
 	{
-	  "name": "Guyana",
-	  "alpha2": "GY",
-	  "alpha3": "GUY",
-	  "numeric": "328"
+		"name": "Guyana",
+		"alpha2": "GY",
+		"alpha3": "GUY",
+		"numeric": "328",
 	},
 	{
-	  "name": "Haiti",
-	  "alpha2": "HT",
-	  "alpha3": "HTI",
-	  "numeric": "332"
+		"name": "Haiti",
+		"alpha2": "HT",
+		"alpha3": "HTI",
+		"numeric": "332",
 	},
 	{
-	  "name": "Heard Island and McDonald Islands",
-	  "alpha2": "HM",
-	  "alpha3": "HMD",
-	  "numeric": "334",
-	  "altName": "Heard and Mcdonald Islands"
+		"name": "Heard Island and McDonald Islands",
+		"alpha2": "HM",
+		"alpha3": "HMD",
+		"numeric": "334",
+		"altName": "Heard and Mcdonald Islands",
 	},
 	{
-	  "name": "Holy See (the)",
-	  "alpha2": "VA",
-	  "alpha3": "VAT",
-	  "numeric": "336",
-	  "altName": "Holy See (Vatican City State)",
-	  "shortName": "Vatican"
+		"name": "Holy See (the)",
+		"alpha2": "VA",
+		"alpha3": "VAT",
+		"numeric": "336",
+		"altName": "Holy See (Vatican City State)",
+		"shortName": "Vatican",
 	},
 	{
-	  "name": "Honduras",
-	  "alpha2": "HN",
-	  "alpha3": "HND",
-	  "numeric": "340"
+		"name": "Honduras",
+		"alpha2": "HN",
+		"alpha3": "HND",
+		"numeric": "340",
 	},
 	{
-	  "name": "Hong Kong",
-	  "alpha2": "HK",
-	  "alpha3": "HKG",
-	  "numeric": "344",
-	  "altName": "Hong Kong, SAR China"
+		"name": "Hong Kong",
+		"alpha2": "HK",
+		"alpha3": "HKG",
+		"numeric": "344",
+		"altName": "Hong Kong, SAR China",
 	},
 	{
-	  "name": "Hungary",
-	  "alpha2": "HU",
-	  "alpha3": "HUN",
-	  "numeric": "348"
+		"name": "Hungary",
+		"alpha2": "HU",
+		"alpha3": "HUN",
+		"numeric": "348",
 	},
 	{
-	  "name": "Iceland",
-	  "alpha2": "IS",
-	  "alpha3": "ISL",
-	  "numeric": "352"
+		"name": "Iceland",
+		"alpha2": "IS",
+		"alpha3": "ISL",
+		"numeric": "352",
 	},
 	{
-	  "name": "India",
-	  "alpha2": "IN",
-	  "alpha3": "IND",
-	  "numeric": "356"
+		"name": "India",
+		"alpha2": "IN",
+		"alpha3": "IND",
+		"numeric": "356",
 	},
 	{
-	  "name": "Indonesia",
-	  "alpha2": "ID",
-	  "alpha3": "IDN",
-	  "numeric": "360"
+		"name": "Indonesia",
+		"alpha2": "ID",
+		"alpha3": "IDN",
+		"numeric": "360",
 	},
 	{
-	  "name": "Iran (Islamic Republic of)",
-	  "alpha2": "IR",
-	  "alpha3": "IRN",
-	  "numeric": "364",
-	  "altName": "Iran, Islamic Republic of",
-	  "shortName": "Iran"
+		"name": "Iran (Islamic Republic of)",
+		"alpha2": "IR",
+		"alpha3": "IRN",
+		"numeric": "364",
+		"altName": "Iran, Islamic Republic of",
+		"shortName": "Iran",
 	},
 	{
-	  "name": "Iraq",
-	  "alpha2": "IQ",
-	  "alpha3": "IRQ",
-	  "numeric": "368"
+		"name": "Iraq",
+		"alpha2": "IQ",
+		"alpha3": "IRQ",
+		"numeric": "368",
 	},
 	{
-	  "name": "Ireland",
-	  "alpha2": "IE",
-	  "alpha3": "IRL",
-	  "numeric": "372"
+		"name": "Ireland",
+		"alpha2": "IE",
+		"alpha3": "IRL",
+		"numeric": "372",
 	},
 	{
-	  "name": "Isle of Man",
-	  "alpha2": "IM",
-	  "alpha3": "IMN",
-	  "numeric": "833"
+		"name": "Isle of Man",
+		"alpha2": "IM",
+		"alpha3": "IMN",
+		"numeric": "833",
 	},
 	{
-	  "name": "Israel",
-	  "alpha2": "IL",
-	  "alpha3": "ISR",
-	  "numeric": "376"
+		"name": "Israel",
+		"alpha2": "IL",
+		"alpha3": "ISR",
+		"numeric": "376",
 	},
 	{
-	  "name": "Italy",
-	  "alpha2": "IT",
-	  "alpha3": "ITA",
-	  "numeric": "380"
+		"name": "Italy",
+		"alpha2": "IT",
+		"alpha3": "ITA",
+		"numeric": "380",
 	},
 	{
-	  "name": "Jamaica",
-	  "alpha2": "JM",
-	  "alpha3": "JAM",
-	  "numeric": "388"
+		"name": "Jamaica",
+		"alpha2": "JM",
+		"alpha3": "JAM",
+		"numeric": "388",
 	},
 	{
-	  "name": "Japan",
-	  "alpha2": "JP",
-	  "alpha3": "JPN",
-	  "numeric": "392"
+		"name": "Japan",
+		"alpha2": "JP",
+		"alpha3": "JPN",
+		"numeric": "392",
 	},
 	{
-	  "name": "Jersey",
-	  "alpha2": "JE",
-	  "alpha3": "JEY",
-	  "numeric": "832"
+		"name": "Jersey",
+		"alpha2": "JE",
+		"alpha3": "JEY",
+		"numeric": "832",
 	},
 	{
-	  "name": "Jordan",
-	  "alpha2": "JO",
-	  "alpha3": "JOR",
-	  "numeric": "400"
+		"name": "Jordan",
+		"alpha2": "JO",
+		"alpha3": "JOR",
+		"numeric": "400",
 	},
 	{
-	  "name": "Kazakhstan",
-	  "alpha2": "KZ",
-	  "alpha3": "KAZ",
-	  "numeric": "398"
+		"name": "Kazakhstan",
+		"alpha2": "KZ",
+		"alpha3": "KAZ",
+		"numeric": "398",
 	},
 	{
-	  "name": "Kenya",
-	  "alpha2": "KE",
-	  "alpha3": "KEN",
-	  "numeric": "404"
+		"name": "Kenya",
+		"alpha2": "KE",
+		"alpha3": "KEN",
+		"numeric": "404",
 	},
 	{
-	  "name": "Kiribati",
-	  "alpha2": "KI",
-	  "alpha3": "KIR",
-	  "numeric": "296"
+		"name": "Kiribati",
+		"alpha2": "KI",
+		"alpha3": "KIR",
+		"numeric": "296",
 	},
 	{
-	  "name": "Korea (the Democratic People's Republic of)",
-	  "alpha2": "KP",
-	  "alpha3": "PRK",
-	  "numeric": "408",
-	  "altName": "Korea (North)",
-	  "shortName": "North Korea"
+		"name": "Korea (the Democratic People's Republic of)",
+		"alpha2": "KP",
+		"alpha3": "PRK",
+		"numeric": "408",
+		"altName": "Korea (North)",
+		"shortName": "North Korea",
 	},
 	{
-	  "name": "Korea (the Republic of)",
-	  "alpha2": "KR",
-	  "alpha3": "KOR",
-	  "numeric": "410",
-	  "altName": "Korea (South)",
-	  "shortName": "South Korea"
+		"name": "Korea (the Republic of)",
+		"alpha2": "KR",
+		"alpha3": "KOR",
+		"numeric": "410",
+		"altName": "Korea (South)",
+		"shortName": "South Korea",
 	},
 	{
-	  "name": "Kuwait",
-	  "alpha2": "KW",
-	  "alpha3": "KWT",
-	  "numeric": "414"
+		"name": "Kuwait",
+		"alpha2": "KW",
+		"alpha3": "KWT",
+		"numeric": "414",
 	},
 	{
-	  "name": "Kyrgyzstan",
-	  "alpha2": "KG",
-	  "alpha3": "KGZ",
-	  "numeric": "417"
+		"name": "Kyrgyzstan",
+		"alpha2": "KG",
+		"alpha3": "KGZ",
+		"numeric": "417",
 	},
 	{
-	  "name": "Lao People's Democratic Republic (the)",
-	  "alpha2": "LA",
-	  "alpha3": "LAO",
-	  "numeric": "418",
-	  "altName": "Lao PDR",
-	  "shortName": "Laos"
+		"name": "Lao People's Democratic Republic (the)",
+		"alpha2": "LA",
+		"alpha3": "LAO",
+		"numeric": "418",
+		"altName": "Lao PDR",
+		"shortName": "Laos",
 	},
 	{
-	  "name": "Latvia",
-	  "alpha2": "LV",
-	  "alpha3": "LVA",
-	  "numeric": "428"
+		"name": "Latvia",
+		"alpha2": "LV",
+		"alpha3": "LVA",
+		"numeric": "428",
 	},
 	{
-	  "name": "Lebanon",
-	  "alpha2": "LB",
-	  "alpha3": "LBN",
-	  "numeric": "422"
+		"name": "Lebanon",
+		"alpha2": "LB",
+		"alpha3": "LBN",
+		"numeric": "422",
 	},
 	{
-	  "name": "Lesotho",
-	  "alpha2": "LS",
-	  "alpha3": "LSO",
-	  "numeric": "426"
+		"name": "Lesotho",
+		"alpha2": "LS",
+		"alpha3": "LSO",
+		"numeric": "426",
 	},
 	{
-	  "name": "Liberia",
-	  "alpha2": "LR",
-	  "alpha3": "LBR",
-	  "numeric": "430"
+		"name": "Liberia",
+		"alpha2": "LR",
+		"alpha3": "LBR",
+		"numeric": "430",
 	},
 	{
-	  "name": "Libya",
-	  "alpha2": "LY",
-	  "alpha3": "LBY",
-	  "numeric": "434"
+		"name": "Libya",
+		"alpha2": "LY",
+		"alpha3": "LBY",
+		"numeric": "434",
 	},
 	{
-	  "name": "Liechtenstein",
-	  "alpha2": "LI",
-	  "alpha3": "LIE",
-	  "numeric": "438"
+		"name": "Liechtenstein",
+		"alpha2": "LI",
+		"alpha3": "LIE",
+		"numeric": "438",
 	},
 	{
-	  "name": "Lithuania",
-	  "alpha2": "LT",
-	  "alpha3": "LTU",
-	  "numeric": "440"
+		"name": "Lithuania",
+		"alpha2": "LT",
+		"alpha3": "LTU",
+		"numeric": "440",
 	},
 	{
-	  "name": "Luxembourg",
-	  "alpha2": "LU",
-	  "alpha3": "LUX",
-	  "numeric": "442"
+		"name": "Luxembourg",
+		"alpha2": "LU",
+		"alpha3": "LUX",
+		"numeric": "442",
 	},
 	{
-	  "name": "Macao",
-	  "alpha2": "MO",
-	  "alpha3": "MAC",
-	  "numeric": "446",
-	  "altName": "Macao, SAR China",
-	  "shortName": "Macau"
+		"name": "Macao",
+		"alpha2": "MO",
+		"alpha3": "MAC",
+		"numeric": "446",
+		"altName": "Macao, SAR China",
+		"shortName": "Macau",
 	},
 	{
-	  "name": "Macedonia (the former Yugoslav Republic of)",
-	  "alpha2": "MK",
-	  "alpha3": "MKD",
-	  "numeric": "807",
-	  "altName": "Macedonia, Republic of",
-	  "shortName": "Macedonia"
+		"name": "Macedonia (the former Yugoslav Republic of)",
+		"alpha2": "MK",
+		"alpha3": "MKD",
+		"numeric": "807",
+		"altName": "Macedonia, Republic of",
+		"shortName": "Macedonia",
 	},
 	{
-	  "name": "Madagascar",
-	  "alpha2": "MG",
-	  "alpha3": "MDG",
-	  "numeric": "450"
+		"name": "Madagascar",
+		"alpha2": "MG",
+		"alpha3": "MDG",
+		"numeric": "450",
 	},
 	{
-	  "name": "Malawi",
-	  "alpha2": "MW",
-	  "alpha3": "MWI",
-	  "numeric": "454"
+		"name": "Malawi",
+		"alpha2": "MW",
+		"alpha3": "MWI",
+		"numeric": "454",
 	},
 	{
-	  "name": "Malaysia",
-	  "alpha2": "MY",
-	  "alpha3": "MYS",
-	  "numeric": "458"
+		"name": "Malaysia",
+		"alpha2": "MY",
+		"alpha3": "MYS",
+		"numeric": "458",
 	},
 	{
-	  "name": "Maldives",
-	  "alpha2": "MV",
-	  "alpha3": "MDV",
-	  "numeric": "462"
+		"name": "Maldives",
+		"alpha2": "MV",
+		"alpha3": "MDV",
+		"numeric": "462",
 	},
 	{
-	  "name": "Mali",
-	  "alpha2": "ML",
-	  "alpha3": "MLI",
-	  "numeric": "466"
+		"name": "Mali",
+		"alpha2": "ML",
+		"alpha3": "MLI",
+		"numeric": "466",
 	},
 	{
-	  "name": "Malta",
-	  "alpha2": "MT",
-	  "alpha3": "MLT",
-	  "numeric": "470"
+		"name": "Malta",
+		"alpha2": "MT",
+		"alpha3": "MLT",
+		"numeric": "470",
 	},
 	{
-	  "name": "Marshall Islands (the)",
-	  "alpha2": "MH",
-	  "alpha3": "MHL",
-	  "numeric": "584",
-	  "altName": "Marshall Islands"
+		"name": "Marshall Islands (the)",
+		"alpha2": "MH",
+		"alpha3": "MHL",
+		"numeric": "584",
+		"altName": "Marshall Islands",
 	},
 	{
-	  "name": "Martinique",
-	  "alpha2": "MQ",
-	  "alpha3": "MTQ",
-	  "numeric": "474"
+		"name": "Martinique",
+		"alpha2": "MQ",
+		"alpha3": "MTQ",
+		"numeric": "474",
 	},
 	{
-	  "name": "Mauritania",
-	  "alpha2": "MR",
-	  "alpha3": "MRT",
-	  "numeric": "478"
+		"name": "Mauritania",
+		"alpha2": "MR",
+		"alpha3": "MRT",
+		"numeric": "478",
 	},
 	{
-	  "name": "Mauritius",
-	  "alpha2": "MU",
-	  "alpha3": "MUS",
-	  "numeric": "480"
+		"name": "Mauritius",
+		"alpha2": "MU",
+		"alpha3": "MUS",
+		"numeric": "480",
 	},
 	{
-	  "name": "Mayotte",
-	  "alpha2": "YT",
-	  "alpha3": "MYT",
-	  "numeric": "175"
+		"name": "Mayotte",
+		"alpha2": "YT",
+		"alpha3": "MYT",
+		"numeric": "175",
 	},
 	{
-	  "name": "Mexico",
-	  "alpha2": "MX",
-	  "alpha3": "MEX",
-	  "numeric": "484"
+		"name": "Mexico",
+		"alpha2": "MX",
+		"alpha3": "MEX",
+		"numeric": "484",
 	},
 	{
-	  "name": "Micronesia (Federated States of)",
-	  "alpha2": "FM",
-	  "alpha3": "FSM",
-	  "numeric": "583",
-	  "altName": "Micronesia, Federated States of",
-	  "shortName": "Micronesia"
+		"name": "Micronesia (Federated States of)",
+		"alpha2": "FM",
+		"alpha3": "FSM",
+		"numeric": "583",
+		"altName": "Micronesia, Federated States of",
+		"shortName": "Micronesia",
 	},
 	{
-	  "name": "Moldova (the Republic of)",
-	  "alpha2": "MD",
-	  "alpha3": "MDA",
-	  "numeric": "498",
-	  "altName": "Moldova"
+		"name": "Moldova (the Republic of)",
+		"alpha2": "MD",
+		"alpha3": "MDA",
+		"numeric": "498",
+		"altName": "Moldova",
 	},
 	{
-	  "name": "Monaco",
-	  "alpha2": "MC",
-	  "alpha3": "MCO",
-	  "numeric": "492"
+		"name": "Monaco",
+		"alpha2": "MC",
+		"alpha3": "MCO",
+		"numeric": "492",
 	},
 	{
-	  "name": "Mongolia",
-	  "alpha2": "MN",
-	  "alpha3": "MNG",
-	  "numeric": "496"
+		"name": "Mongolia",
+		"alpha2": "MN",
+		"alpha3": "MNG",
+		"numeric": "496",
 	},
 	{
-	  "name": "Montenegro",
-	  "alpha2": "ME",
-	  "alpha3": "MNE",
-	  "numeric": "499"
+		"name": "Montenegro",
+		"alpha2": "ME",
+		"alpha3": "MNE",
+		"numeric": "499",
 	},
 	{
-	  "name": "Montserrat",
-	  "alpha2": "MS",
-	  "alpha3": "MSR",
-	  "numeric": "500"
+		"name": "Montserrat",
+		"alpha2": "MS",
+		"alpha3": "MSR",
+		"numeric": "500",
 	},
 	{
-	  "name": "Morocco",
-	  "alpha2": "MA",
-	  "alpha3": "MAR",
-	  "numeric": "504"
+		"name": "Morocco",
+		"alpha2": "MA",
+		"alpha3": "MAR",
+		"numeric": "504",
 	},
 	{
-	  "name": "Mozambique",
-	  "alpha2": "MZ",
-	  "alpha3": "MOZ",
-	  "numeric": "508"
+		"name": "Mozambique",
+		"alpha2": "MZ",
+		"alpha3": "MOZ",
+		"numeric": "508",
 	},
 	{
-	  "name": "Myanmar",
-	  "alpha2": "MM",
-	  "alpha3": "MMR",
-	  "numeric": "104"
+		"name": "Myanmar",
+		"alpha2": "MM",
+		"alpha3": "MMR",
+		"numeric": "104",
 	},
 	{
-	  "name": "Namibia",
-	  "alpha2": "NA",
-	  "alpha3": "NAM",
-	  "numeric": "516"
+		"name": "Namibia",
+		"alpha2": "NA",
+		"alpha3": "NAM",
+		"numeric": "516",
 	},
 	{
-	  "name": "Nauru",
-	  "alpha2": "NR",
-	  "alpha3": "NRU",
-	  "numeric": "520"
+		"name": "Nauru",
+		"alpha2": "NR",
+		"alpha3": "NRU",
+		"numeric": "520",
 	},
 	{
-	  "name": "Nepal",
-	  "alpha2": "NP",
-	  "alpha3": "NPL",
-	  "numeric": "524"
+		"name": "Nepal",
+		"alpha2": "NP",
+		"alpha3": "NPL",
+		"numeric": "524",
 	},
 	{
-	  "name": "Netherlands (the)",
-	  "alpha2": "NL",
-	  "alpha3": "NLD",
-	  "numeric": "528",
-	  "altName": "Netherlands"
+		"name": "Netherlands (the)",
+		"alpha2": "NL",
+		"alpha3": "NLD",
+		"numeric": "528",
+		"altName": "Netherlands",
 	},
 	{
-	  "name": "New Caledonia",
-	  "alpha2": "NC",
-	  "alpha3": "NCL",
-	  "numeric": "540"
+		"name": "New Caledonia",
+		"alpha2": "NC",
+		"alpha3": "NCL",
+		"numeric": "540",
 	},
 	{
-	  "name": "New Zealand",
-	  "alpha2": "NZ",
-	  "alpha3": "NZL",
-	  "numeric": "554"
+		"name": "New Zealand",
+		"alpha2": "NZ",
+		"alpha3": "NZL",
+		"numeric": "554",
 	},
 	{
-	  "name": "Nicaragua",
-	  "alpha2": "NI",
-	  "alpha3": "NIC",
-	  "numeric": "558"
+		"name": "Nicaragua",
+		"alpha2": "NI",
+		"alpha3": "NIC",
+		"numeric": "558",
 	},
 	{
-	  "name": "Niger (the)",
-	  "alpha2": "NE",
-	  "alpha3": "NER",
-	  "numeric": "562",
-	  "altName": "Niger"
+		"name": "Niger (the)",
+		"alpha2": "NE",
+		"alpha3": "NER",
+		"numeric": "562",
+		"altName": "Niger",
 	},
 	{
-	  "name": "Nigeria",
-	  "alpha2": "NG",
-	  "alpha3": "NGA",
-	  "numeric": "566"
+		"name": "Nigeria",
+		"alpha2": "NG",
+		"alpha3": "NGA",
+		"numeric": "566",
 	},
 	{
-	  "name": "Niue",
-	  "alpha2": "NU",
-	  "alpha3": "NIU",
-	  "numeric": "570"
+		"name": "Niue",
+		"alpha2": "NU",
+		"alpha3": "NIU",
+		"numeric": "570",
 	},
 	{
-	  "name": "Norfolk Island",
-	  "alpha2": "NF",
-	  "alpha3": "NFK",
-	  "numeric": "574"
+		"name": "Norfolk Island",
+		"alpha2": "NF",
+		"alpha3": "NFK",
+		"numeric": "574",
 	},
 	{
-	  "name": "Northern Mariana Islands (the)",
-	  "alpha2": "MP",
-	  "alpha3": "MNP",
-	  "numeric": "580",
-	  "altName": "Northern Mariana Islands"
+		"name": "Northern Mariana Islands (the)",
+		"alpha2": "MP",
+		"alpha3": "MNP",
+		"numeric": "580",
+		"altName": "Northern Mariana Islands",
 	},
 	{
-	  "name": "Norway",
-	  "alpha2": "NO",
-	  "alpha3": "NOR",
-	  "numeric": "578"
+		"name": "Norway",
+		"alpha2": "NO",
+		"alpha3": "NOR",
+		"numeric": "578",
 	},
 	{
-	  "name": "Oman",
-	  "alpha2": "OM",
-	  "alpha3": "OMN",
-	  "numeric": "512"
+		"name": "Oman",
+		"alpha2": "OM",
+		"alpha3": "OMN",
+		"numeric": "512",
 	},
 	{
-	  "name": "Pakistan",
-	  "alpha2": "PK",
-	  "alpha3": "PAK",
-	  "numeric": "586"
+		"name": "Pakistan",
+		"alpha2": "PK",
+		"alpha3": "PAK",
+		"numeric": "586",
 	},
 	{
-	  "name": "Palau",
-	  "alpha2": "PW",
-	  "alpha3": "PLW",
-	  "numeric": "585"
+		"name": "Palau",
+		"alpha2": "PW",
+		"alpha3": "PLW",
+		"numeric": "585",
 	},
 	{
-	  "name": "Palestine, State of",
-	  "alpha2": "PS",
-	  "alpha3": "PSE",
-	  "numeric": "275",
-	  "altName": "Palestinian Territory",
-	  "shortName": "Palestine"
+		"name": "Palestine, State of",
+		"alpha2": "PS",
+		"alpha3": "PSE",
+		"numeric": "275",
+		"altName": "Palestinian Territory",
+		"shortName": "Palestine",
 	},
 	{
-	  "name": "Panama",
-	  "alpha2": "PA",
-	  "alpha3": "PAN",
-	  "numeric": "591"
+		"name": "Panama",
+		"alpha2": "PA",
+		"alpha3": "PAN",
+		"numeric": "591",
 	},
 	{
-	  "name": "Papua New Guinea",
-	  "alpha2": "PG",
-	  "alpha3": "PNG",
-	  "numeric": "598"
+		"name": "Papua New Guinea",
+		"alpha2": "PG",
+		"alpha3": "PNG",
+		"numeric": "598",
 	},
 	{
-	  "name": "Paraguay",
-	  "alpha2": "PY",
-	  "alpha3": "PRY",
-	  "numeric": "600"
+		"name": "Paraguay",
+		"alpha2": "PY",
+		"alpha3": "PRY",
+		"numeric": "600",
 	},
 	{
-	  "name": "Peru",
-	  "alpha2": "PE",
-	  "alpha3": "PER",
-	  "numeric": "604"
+		"name": "Peru",
+		"alpha2": "PE",
+		"alpha3": "PER",
+		"numeric": "604",
 	},
 	{
-	  "name": "Philippines (the)",
-	  "alpha2": "PH",
-	  "alpha3": "PHL",
-	  "numeric": "608",
-	  "altName": "Philippines"
+		"name": "Philippines (the)",
+		"alpha2": "PH",
+		"alpha3": "PHL",
+		"numeric": "608",
+		"altName": "Philippines",
 	},
 	{
-	  "name": "Pitcairn",
-	  "alpha2": "PN",
-	  "alpha3": "PCN",
-	  "numeric": "612"
+		"name": "Pitcairn",
+		"alpha2": "PN",
+		"alpha3": "PCN",
+		"numeric": "612",
 	},
 	{
-	  "name": "Poland",
-	  "alpha2": "PL",
-	  "alpha3": "POL",
-	  "numeric": "616"
+		"name": "Poland",
+		"alpha2": "PL",
+		"alpha3": "POL",
+		"numeric": "616",
 	},
 	{
-	  "name": "Portugal",
-	  "alpha2": "PT",
-	  "alpha3": "PRT",
-	  "numeric": "620"
+		"name": "Portugal",
+		"alpha2": "PT",
+		"alpha3": "PRT",
+		"numeric": "620",
 	},
 	{
-	  "name": "Puerto Rico",
-	  "alpha2": "PR",
-	  "alpha3": "PRI",
-	  "numeric": "630"
+		"name": "Puerto Rico",
+		"alpha2": "PR",
+		"alpha3": "PRI",
+		"numeric": "630",
 	},
 	{
-	  "name": "Qatar",
-	  "alpha2": "QA",
-	  "alpha3": "QAT",
-	  "numeric": "634"
+		"name": "Qatar",
+		"alpha2": "QA",
+		"alpha3": "QAT",
+		"numeric": "634",
 	},
 	{
-	  "name": "Réunion",
-	  "alpha2": "RE",
-	  "alpha3": "REU",
-	  "numeric": "638",
-	  "shortName": "Reunion"
+		"name": "Réunion",
+		"alpha2": "RE",
+		"alpha3": "REU",
+		"numeric": "638",
+		"shortName": "Reunion",
 	},
 	{
-	  "name": "Romania",
-	  "alpha2": "RO",
-	  "alpha3": "ROU",
-	  "numeric": "642"
+		"name": "Romania",
+		"alpha2": "RO",
+		"alpha3": "ROU",
+		"numeric": "642",
 	},
 	{
-	  "name": "Russian Federation (the)",
-	  "alpha2": "RU",
-	  "alpha3": "RUS",
-	  "numeric": "643",
-	  "altName": "Russian Federation",
-	  "shortName": "Russia"
+		"name": "Russian Federation (the)",
+		"alpha2": "RU",
+		"alpha3": "RUS",
+		"numeric": "643",
+		"altName": "Russian Federation",
+		"shortName": "Russia",
 	},
 	{
-	  "name": "Rwanda",
-	  "alpha2": "RW",
-	  "alpha3": "RWA",
-	  "numeric": "646"
+		"name": "Rwanda",
+		"alpha2": "RW",
+		"alpha3": "RWA",
+		"numeric": "646",
 	},
 	{
-	  "name": "Saint Barthélemy",
-	  "alpha2": "BL",
-	  "alpha3": "BLM",
-	  "numeric": "652",
-	  "altName": "Saint-Barthélemy",
-	  "shortName": "Saint Barthelemy"
+		"name": "Saint Barthélemy",
+		"alpha2": "BL",
+		"alpha3": "BLM",
+		"numeric": "652",
+		"altName": "Saint-Barthélemy",
+		"shortName": "Saint Barthelemy",
 	},
 	{
-	  "name": "Saint Helena, Ascension and Tristan da Cunha",
-	  "alpha2": "SH",
-	  "alpha3": "SHN",
-	  "numeric": "654",
-	  "altName": "Saint Helena"
+		"name": "Saint Helena, Ascension and Tristan da Cunha",
+		"alpha2": "SH",
+		"alpha3": "SHN",
+		"numeric": "654",
+		"altName": "Saint Helena",
 	},
 	{
-	  "name": "Saint Kitts and Nevis",
-	  "alpha2": "KN",
-	  "alpha3": "KNA",
-	  "numeric": "659"
+		"name": "Saint Kitts and Nevis",
+		"alpha2": "KN",
+		"alpha3": "KNA",
+		"numeric": "659",
 	},
 	{
-	  "name": "Saint Lucia",
-	  "alpha2": "LC",
-	  "alpha3": "LCA",
-	  "numeric": "662"
+		"name": "Saint Lucia",
+		"alpha2": "LC",
+		"alpha3": "LCA",
+		"numeric": "662",
 	},
 	{
-	  "name": "Saint Martin (French part)",
-	  "alpha2": "MF",
-	  "alpha3": "MAF",
-	  "numeric": "663",
-	  "altName": "Saint-Martin (French part)",
-	  "shortName": "Saint Martin"
+		"name": "Saint Martin (French part)",
+		"alpha2": "MF",
+		"alpha3": "MAF",
+		"numeric": "663",
+		"altName": "Saint-Martin (French part)",
+		"shortName": "Saint Martin",
 	},
 	{
-	  "name": "Saint Pierre and Miquelon",
-	  "alpha2": "PM",
-	  "alpha3": "SPM",
-	  "numeric": "666"
+		"name": "Saint Pierre and Miquelon",
+		"alpha2": "PM",
+		"alpha3": "SPM",
+		"numeric": "666",
 	},
 	{
-	  "name": "Saint Vincent and the Grenadines",
-	  "alpha2": "VC",
-	  "alpha3": "VCT",
-	  "numeric": "670",
-	  "altName": "Saint Vincent and Grenadines"
+		"name": "Saint Vincent and the Grenadines",
+		"alpha2": "VC",
+		"alpha3": "VCT",
+		"numeric": "670",
+		"altName": "Saint Vincent and Grenadines",
 	},
 	{
-	  "name": "Samoa",
-	  "alpha2": "WS",
-	  "alpha3": "WSM",
-	  "numeric": "882"
+		"name": "Samoa",
+		"alpha2": "WS",
+		"alpha3": "WSM",
+		"numeric": "882",
 	},
 	{
-	  "name": "San Marino",
-	  "alpha2": "SM",
-	  "alpha3": "SMR",
-	  "numeric": "674"
+		"name": "San Marino",
+		"alpha2": "SM",
+		"alpha3": "SMR",
+		"numeric": "674",
 	},
 	{
-	  "name": "Sao Tome and Principe",
-	  "alpha2": "ST",
-	  "alpha3": "STP",
-	  "numeric": "678"
+		"name": "Sao Tome and Principe",
+		"alpha2": "ST",
+		"alpha3": "STP",
+		"numeric": "678",
 	},
 	{
-	  "name": "Saudi Arabia",
-	  "alpha2": "SA",
-	  "alpha3": "SAU",
-	  "numeric": "682"
+		"name": "Saudi Arabia",
+		"alpha2": "SA",
+		"alpha3": "SAU",
+		"numeric": "682",
 	},
 	{
-	  "name": "Senegal",
-	  "alpha2": "SN",
-	  "alpha3": "SEN",
-	  "numeric": "686"
+		"name": "Senegal",
+		"alpha2": "SN",
+		"alpha3": "SEN",
+		"numeric": "686",
 	},
 	{
-	  "name": "Serbia",
-	  "alpha2": "RS",
-	  "alpha3": "SRB",
-	  "numeric": "688"
+		"name": "Serbia",
+		"alpha2": "RS",
+		"alpha3": "SRB",
+		"numeric": "688",
 	},
 	{
-	  "name": "Seychelles",
-	  "alpha2": "SC",
-	  "alpha3": "SYC",
-	  "numeric": "690"
+		"name": "Seychelles",
+		"alpha2": "SC",
+		"alpha3": "SYC",
+		"numeric": "690",
 	},
 	{
-	  "name": "Sierra Leone",
-	  "alpha2": "SL",
-	  "alpha3": "SLE",
-	  "numeric": "694"
+		"name": "Sierra Leone",
+		"alpha2": "SL",
+		"alpha3": "SLE",
+		"numeric": "694",
 	},
 	{
-	  "name": "Singapore",
-	  "alpha2": "SG",
-	  "alpha3": "SGP",
-	  "numeric": "702"
+		"name": "Singapore",
+		"alpha2": "SG",
+		"alpha3": "SGP",
+		"numeric": "702",
 	},
 	{
-	  "name": "Sint Maarten (Dutch part)",
-	  "alpha2": "SX",
-	  "alpha3": "SXM",
-	  "numeric": "534",
-	  "shortName": "Sint Maarten"
+		"name": "Sint Maarten (Dutch part)",
+		"alpha2": "SX",
+		"alpha3": "SXM",
+		"numeric": "534",
+		"shortName": "Sint Maarten",
 	},
 	{
-	  "name": "Slovakia",
-	  "alpha2": "SK",
-	  "alpha3": "SVK",
-	  "numeric": "703"
+		"name": "Slovakia",
+		"alpha2": "SK",
+		"alpha3": "SVK",
+		"numeric": "703",
 	},
 	{
-	  "name": "Slovenia",
-	  "alpha2": "SI",
-	  "alpha3": "SVN",
-	  "numeric": "705"
+		"name": "Slovenia",
+		"alpha2": "SI",
+		"alpha3": "SVN",
+		"numeric": "705",
 	},
 	{
-	  "name": "Solomon Islands",
-	  "alpha2": "SB",
-	  "alpha3": "SLB",
-	  "numeric": "090"
+		"name": "Solomon Islands",
+		"alpha2": "SB",
+		"alpha3": "SLB",
+		"numeric": "090",
 	},
 	{
-	  "name": "Somalia",
-	  "alpha2": "SO",
-	  "alpha3": "SOM",
-	  "numeric": "706"
+		"name": "Somalia",
+		"alpha2": "SO",
+		"alpha3": "SOM",
+		"numeric": "706",
 	},
 	{
-	  "name": "South Africa",
-	  "alpha2": "ZA",
-	  "alpha3": "ZAF",
-	  "numeric": "710"
+		"name": "South Africa",
+		"alpha2": "ZA",
+		"alpha3": "ZAF",
+		"numeric": "710",
 	},
 	{
-	  "name": "South Georgia and the South Sandwich Islands",
-	  "alpha2": "GS",
-	  "alpha3": "SGS",
-	  "numeric": "239"
+		"name": "South Georgia and the South Sandwich Islands",
+		"alpha2": "GS",
+		"alpha3": "SGS",
+		"numeric": "239",
 	},
 	{
-	  "name": "South Sudan",
-	  "alpha2": "SS",
-	  "alpha3": "SSD",
-	  "numeric": "728"
+		"name": "South Sudan",
+		"alpha2": "SS",
+		"alpha3": "SSD",
+		"numeric": "728",
 	},
 	{
-	  "name": "Spain",
-	  "alpha2": "ES",
-	  "alpha3": "ESP",
-	  "numeric": "724"
+		"name": "Spain",
+		"alpha2": "ES",
+		"alpha3": "ESP",
+		"numeric": "724",
 	},
 	{
-	  "name": "Sri Lanka",
-	  "alpha2": "LK",
-	  "alpha3": "LKA",
-	  "numeric": "144"
+		"name": "Sri Lanka",
+		"alpha2": "LK",
+		"alpha3": "LKA",
+		"numeric": "144",
 	},
 	{
-	  "name": "Sudan (the)",
-	  "alpha2": "SD",
-	  "alpha3": "SDN",
-	  "numeric": "729",
-	  "altName": "Sudan"
+		"name": "Sudan (the)",
+		"alpha2": "SD",
+		"alpha3": "SDN",
+		"numeric": "729",
+		"altName": "Sudan",
 	},
 	{
-	  "name": "Suriname",
-	  "alpha2": "SR",
-	  "alpha3": "SUR",
-	  "numeric": "740"
+		"name": "Suriname",
+		"alpha2": "SR",
+		"alpha3": "SUR",
+		"numeric": "740",
 	},
 	{
-	  "name": "Svalbard and Jan Mayen",
-	  "alpha2": "SJ",
-	  "alpha3": "SJM",
-	  "numeric": "744",
-	  "altName": "Svalbard and Jan Mayen Islands"
+		"name": "Svalbard and Jan Mayen",
+		"alpha2": "SJ",
+		"alpha3": "SJM",
+		"numeric": "744",
+		"altName": "Svalbard and Jan Mayen Islands",
 	},
 	{
-	  "name": "Swaziland",
-	  "alpha2": "SZ",
-	  "alpha3": "SWZ",
-	  "numeric": "748"
+		"name": "Swaziland",
+		"alpha2": "SZ",
+		"alpha3": "SWZ",
+		"numeric": "748",
 	},
 	{
-	  "name": "Sweden",
-	  "alpha2": "SE",
-	  "alpha3": "SWE",
-	  "numeric": "752"
+		"name": "Sweden",
+		"alpha2": "SE",
+		"alpha3": "SWE",
+		"numeric": "752",
 	},
 	{
-	  "name": "Switzerland",
-	  "alpha2": "CH",
-	  "alpha3": "CHE",
-	  "numeric": "756"
+		"name": "Switzerland",
+		"alpha2": "CH",
+		"alpha3": "CHE",
+		"numeric": "756",
 	},
 	{
-	  "name": "Syrian Arab Republic",
-	  "alpha2": "SY",
-	  "alpha3": "SYR",
-	  "numeric": "760",
-	  "altName": "Syrian Arab Republic (Syria)",
-	  "shortName": "Syria"
+		"name": "Syrian Arab Republic",
+		"alpha2": "SY",
+		"alpha3": "SYR",
+		"numeric": "760",
+		"altName": "Syrian Arab Republic (Syria)",
+		"shortName": "Syria",
 	},
 	{
-	  "name": "Taiwan (Province of China)",
-	  "alpha2": "TW",
-	  "alpha3": "TWN",
-	  "numeric": "158",
-	  "altName": "Taiwan, Republic of China",
-	  "shortName": "Taiwan"
+		"name": "Taiwan (Province of China)",
+		"alpha2": "TW",
+		"alpha3": "TWN",
+		"numeric": "158",
+		"altName": "Taiwan, Republic of China",
+		"shortName": "Taiwan",
 	},
 	{
-	  "name": "Tajikistan",
-	  "alpha2": "TJ",
-	  "alpha3": "TJK",
-	  "numeric": "762"
+		"name": "Tajikistan",
+		"alpha2": "TJ",
+		"alpha3": "TJK",
+		"numeric": "762",
 	},
 	{
-	  "name": "Tanzania, United Republic of",
-	  "alpha2": "TZ",
-	  "alpha3": "TZA",
-	  "numeric": "834",
-	  "shortName": "Tanzania"
+		"name": "Tanzania, United Republic of",
+		"alpha2": "TZ",
+		"alpha3": "TZA",
+		"numeric": "834",
+		"shortName": "Tanzania",
 	},
 	{
-	  "name": "Thailand",
-	  "alpha2": "TH",
-	  "alpha3": "THA",
-	  "numeric": "764"
+		"name": "Thailand",
+		"alpha2": "TH",
+		"alpha3": "THA",
+		"numeric": "764",
 	},
 	{
-	  "name": "Timor-Leste",
-	  "alpha2": "TL",
-	  "alpha3": "TLS",
-	  "numeric": "626",
-	  "shortName": "East Timor"
+		"name": "Timor-Leste",
+		"alpha2": "TL",
+		"alpha3": "TLS",
+		"numeric": "626",
+		"shortName": "East Timor",
 	},
 	{
-	  "name": "Togo",
-	  "alpha2": "TG",
-	  "alpha3": "TGO",
-	  "numeric": "768"
+		"name": "Togo",
+		"alpha2": "TG",
+		"alpha3": "TGO",
+		"numeric": "768",
 	},
 	{
-	  "name": "Tokelau",
-	  "alpha2": "TK",
-	  "alpha3": "TKL",
-	  "numeric": "772"
+		"name": "Tokelau",
+		"alpha2": "TK",
+		"alpha3": "TKL",
+		"numeric": "772",
 	},
 	{
-	  "name": "Tonga",
-	  "alpha2": "TO",
-	  "alpha3": "TON",
-	  "numeric": "776"
+		"name": "Tonga",
+		"alpha2": "TO",
+		"alpha3": "TON",
+		"numeric": "776",
 	},
 	{
-	  "name": "Trinidad and Tobago",
-	  "alpha2": "TT",
-	  "alpha3": "TTO",
-	  "numeric": "780"
+		"name": "Trinidad and Tobago",
+		"alpha2": "TT",
+		"alpha3": "TTO",
+		"numeric": "780",
 	},
 	{
-	  "name": "Tunisia",
-	  "alpha2": "TN",
-	  "alpha3": "TUN",
-	  "numeric": "788"
+		"name": "Tunisia",
+		"alpha2": "TN",
+		"alpha3": "TUN",
+		"numeric": "788",
 	},
 	{
-	  "name": "Turkey",
-	  "alpha2": "TR",
-	  "alpha3": "TUR",
-	  "numeric": "792"
+		"name": "Turkey",
+		"alpha2": "TR",
+		"alpha3": "TUR",
+		"numeric": "792",
 	},
 	{
-	  "name": "Turkmenistan",
-	  "alpha2": "TM",
-	  "alpha3": "TKM",
-	  "numeric": "795"
+		"name": "Turkmenistan",
+		"alpha2": "TM",
+		"alpha3": "TKM",
+		"numeric": "795",
 	},
 	{
-	  "name": "Turks and Caicos Islands (the)",
-	  "alpha2": "TC",
-	  "alpha3": "TCA",
-	  "numeric": "796",
-	  "altName": "Turks and Caicos Islands"
+		"name": "Turks and Caicos Islands (the)",
+		"alpha2": "TC",
+		"alpha3": "TCA",
+		"numeric": "796",
+		"altName": "Turks and Caicos Islands",
 	},
 	{
-	  "name": "Tuvalu",
-	  "alpha2": "TV",
-	  "alpha3": "TUV",
-	  "numeric": "798"
+		"name": "Tuvalu",
+		"alpha2": "TV",
+		"alpha3": "TUV",
+		"numeric": "798",
 	},
 	{
-	  "name": "Uganda",
-	  "alpha2": "UG",
-	  "alpha3": "UGA",
-	  "numeric": "800"
+		"name": "Uganda",
+		"alpha2": "UG",
+		"alpha3": "UGA",
+		"numeric": "800",
 	},
 	{
-	  "name": "Ukraine",
-	  "alpha2": "UA",
-	  "alpha3": "UKR",
-	  "numeric": "804"
+		"name": "Ukraine",
+		"alpha2": "UA",
+		"alpha3": "UKR",
+		"numeric": "804",
 	},
 	{
-	  "name": "United Arab Emirates (the)",
-	  "alpha2": "AE",
-	  "alpha3": "ARE",
-	  "numeric": "784",
-	  "altName": "United Arab Emirates"
+		"name": "United Arab Emirates (the)",
+		"alpha2": "AE",
+		"alpha3": "ARE",
+		"numeric": "784",
+		"altName": "United Arab Emirates",
 	},
 	{
-	  "name": "United Kingdom of Great Britain and Northern Ireland (the)",
-	  "alpha2": "GB",
-	  "alpha3": "GBR",
-	  "numeric": "826",
-	  "altName": "United Kingdom"
+		"name": "United Kingdom of Great Britain and Northern Ireland (the)",
+		"alpha2": "GB",
+		"alpha3": "GBR",
+		"numeric": "826",
+		"altName": "United Kingdom",
 	},
 	{
-	  "name": "United States Minor Outlying Islands (the)",
-	  "alpha2": "UM",
-	  "alpha3": "UMI",
-	  "numeric": "581",
-	  "altName": "US Minor Outlying Islands"
+		"name": "United States Minor Outlying Islands (the)",
+		"alpha2": "UM",
+		"alpha3": "UMI",
+		"numeric": "581",
+		"altName": "US Minor Outlying Islands",
 	},
 	{
-	  "name": "United States of America (the)",
-	  "alpha2": "US",
-	  "alpha3": "USA",
-	  "numeric": "840",
-	  "altName": "United States of America",
-	  "shortName": "United States"
+		"name": "United States of America (the)",
+		"alpha2": "US",
+		"alpha3": "USA",
+		"numeric": "840",
+		"altName": "United States of America",
+		"shortName": "United States",
 	},
 	{
-	  "name": "Uruguay",
-	  "alpha2": "UY",
-	  "alpha3": "URY",
-	  "numeric": "858"
+		"name": "Uruguay",
+		"alpha2": "UY",
+		"alpha3": "URY",
+		"numeric": "858",
 	},
 	{
-	  "name": "Uzbekistan",
-	  "alpha2": "UZ",
-	  "alpha3": "UZB",
-	  "numeric": "860"
+		"name": "Uzbekistan",
+		"alpha2": "UZ",
+		"alpha3": "UZB",
+		"numeric": "860",
 	},
 	{
-	  "name": "Vanuatu",
-	  "alpha2": "VU",
-	  "alpha3": "VUT",
-	  "numeric": "548"
+		"name": "Vanuatu",
+		"alpha2": "VU",
+		"alpha3": "VUT",
+		"numeric": "548",
 	},
 	{
-	  "name": "Venezuela (Bolivarian Republic of)",
-	  "alpha2": "VE",
-	  "alpha3": "VEN",
-	  "numeric": "862",
-	  "altName": "Venezuela (Bolivarian Republic)",
-	  "shortName": "Venezuela"
+		"name": "Venezuela (Bolivarian Republic of)",
+		"alpha2": "VE",
+		"alpha3": "VEN",
+		"numeric": "862",
+		"altName": "Venezuela (Bolivarian Republic)",
+		"shortName": "Venezuela",
 	},
 	{
-	  "name": "Viet Nam",
-	  "alpha2": "VN",
-	  "alpha3": "VNM",
-	  "numeric": "704",
-	  "shortName": "Vietnam"
+		"name": "Viet Nam",
+		"alpha2": "VN",
+		"alpha3": "VNM",
+		"numeric": "704",
+		"shortName": "Vietnam",
 	},
 	{
-	  "name": "Virgin Islands (British)",
-	  "alpha2": "VG",
-	  "alpha3": "VGB",
-	  "numeric": "092",
-	  "altName": "British Virgin Islands"
+		"name": "Virgin Islands (British)",
+		"alpha2": "VG",
+		"alpha3": "VGB",
+		"numeric": "092",
+		"altName": "British Virgin Islands",
 	},
 	{
-	  "name": "Virgin Islands (U.S.)",
-	  "alpha2": "VI",
-	  "alpha3": "VIR",
-	  "numeric": "850",
-	  "altName": "Virgin Islands, US",
-	  "shortName": "U.S. Virgin Islands"
+		"name": "Virgin Islands (U.S.)",
+		"alpha2": "VI",
+		"alpha3": "VIR",
+		"numeric": "850",
+		"altName": "Virgin Islands, US",
+		"shortName": "U.S. Virgin Islands",
 	},
 	{
-	  "name": "Wallis and Futuna",
-	  "alpha2": "WF",
-	  "alpha3": "WLF",
-	  "numeric": "876",
-	  "altName": "Wallis and Futuna Islands"
+		"name": "Wallis and Futuna",
+		"alpha2": "WF",
+		"alpha3": "WLF",
+		"numeric": "876",
+		"altName": "Wallis and Futuna Islands",
 	},
 	{
-	  "name": "Western Sahara*",
-	  "alpha2": "EH",
-	  "alpha3": "ESH",
-	  "numeric": "732",
-	  "altName": "Western Sahara"
+		"name": "Western Sahara*",
+		"alpha2": "EH",
+		"alpha3": "ESH",
+		"numeric": "732",
+		"altName": "Western Sahara",
 	},
 	{
-	  "name": "Yemen",
-	  "alpha2": "YE",
-	  "alpha3": "YEM",
-	  "numeric": "887"
+		"name": "Yemen",
+		"alpha2": "YE",
+		"alpha3": "YEM",
+		"numeric": "887",
 	},
 	{
-	  "name": "Zambia",
-	  "alpha2": "ZM",
-	  "alpha3": "ZMB",
-	  "numeric": "894"
+		"name": "Zambia",
+		"alpha2": "ZM",
+		"alpha3": "ZMB",
+		"numeric": "894",
 	},
 	{
-	  "name": "Zimbabwe",
-	  "alpha2": "ZW",
-	  "alpha3": "ZWE",
-	  "numeric": "716"
-	}
-  ] as IDataObject[];
+		"name": "Zimbabwe",
+		"alpha2": "ZW",
+		"alpha3": "ZWE",
+		"numeric": "716",
+	},
+] as IDataObject[];
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index b1be5bdcd..3979e165c 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -3,8 +3,8 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeExecutionData,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
index f84982c0f..3833dddcf 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
@@ -4,8 +4,8 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
index 88e247f1c..93cbdd5cc 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -10,8 +10,8 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
 	ICredentialDataDecryptedObject,
+	IDataObject,
 } from 'n8n-workflow';
 
 export async function jiraSoftwareCloudApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, endpoint: string, method: string, body: any = {}, query?: IDataObject, uri?: string): Promise<any> { // tslint:disable-line:no-any
@@ -48,7 +48,7 @@ export async function jiraSoftwareCloudApiRequest(this: IHookFunctions | IExecut
 		qs: query,
 		uri: uri || `${domain}/rest${endpoint}`,
 		body,
-		json: true
+		json: true,
 	};
 
 	try {
diff --git a/packages/nodes-base/nodes/Jira/IssueDescription.ts b/packages/nodes-base/nodes/Jira/IssueDescription.ts
index d29c9a535..30579f16d 100644
--- a/packages/nodes-base/nodes/Jira/IssueDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueDescription.ts
@@ -75,8 +75,8 @@ export const issueFields = [
 					'issue',
 				],
 				operation: [
-					'create'
-				]
+					'create',
+				],
 			},
 		},
 		typeOptions: {
@@ -98,8 +98,8 @@ export const issueFields = [
 					'issue',
 				],
 				operation: [
-					'create'
-				]
+					'create',
+				],
 			},
 		},
 		typeOptions: {
@@ -469,7 +469,7 @@ export const issueFields = [
 				editmeta Returns information about how each field can be edited.<br/>
 				changelog Returns a list of recent updates to an issue, sorted by date, starting from the most recent.<br/>
 				versionedRepresentations Returns a JSON array for each version of a field's value, with the highest number<br/>
-				representing the most recent version. Note: When included in the request, the fields parameter is ignored.`
+				representing the most recent version. Note: When included in the request, the fields parameter is ignored.`,
 			},
 			{
 				displayName: 'Fields',
@@ -482,7 +482,7 @@ export const issueFields = [
 				Use it to retrieve a subset of fields. Allowed values:<br/>
 				*all Returns all fields.<br/>
 				*navigable Returns navigable fields.<br/>
-				Any issue field, prefixed with a minus to exclude.<br/>`
+				Any issue field, prefixed with a minus to exclude.<br/>`,
 			},
 			{
 				displayName: 'Fields By Key',
@@ -508,7 +508,7 @@ export const issueFields = [
 				*all Returns all properties.<br/>
 				*all,-prop1 Returns all properties except prop1.<br/>
 				prop1,prop2 Returns prop1 and prop2 properties.<br/>
-				This parameter may be specified multiple times. For example, properties=prop1,prop2& properties=prop3.`
+				This parameter may be specified multiple times. For example, properties=prop1,prop2& properties=prop3.`,
 			},
 			{
 				displayName: 'Update History',
@@ -520,7 +520,7 @@ export const issueFields = [
 				Recently viewed project list, as shown under Projects in Jira. This also populates the
 				JQL issues search lastViewed field.`,
 			},
-		]
+		],
 	},
 
 /* -------------------------------------------------------------------------- */
@@ -800,7 +800,7 @@ export const issueFields = [
 				required: false,
 				default: '',
 				description: `The subject of the email notification for the issue. If this is not specified,
-				then the subject is set to the issue key and summary.`
+				then the subject is set to the issue key and summary.`,
 			},
 			{
 				displayName: 'Text Body',
@@ -812,7 +812,7 @@ export const issueFields = [
 				required: false,
 				default: '',
 				description: `The subject of the email notification for the issue.
-				If this is not specified, then the subject is set to the issue key and summary.`
+				If this is not specified, then the subject is set to the issue key and summary.`,
 			},
 		],
 	},
@@ -892,10 +892,10 @@ export const issueFields = [
 						default: [],
 						description: `List of groups to receive the notification.`,
 					},
-				]
+				],
 
-			}
-		]
+			},
+		],
 	},
 	{
 		displayName: 'Notification Recipients',
@@ -915,7 +915,7 @@ export const issueFields = [
 				],
 				jsonParameters: [
 					true,
-				]
+				],
 			},
 		},
 		default: '',
@@ -969,10 +969,10 @@ export const issueFields = [
 						default: [],
 						description: `List of groups to receive the notification.`,
 					},
-				]
+				],
 
-			}
-		]
+			},
+		],
 	},
 	{
 		displayName: 'Notification Recipients Restrictions',
@@ -992,7 +992,7 @@ export const issueFields = [
 				],
 				jsonParameters: [
 					true,
-				]
+				],
 			},
 		},
 		default: '',
@@ -1046,7 +1046,7 @@ export const issueFields = [
 				description: `Use expand to include additional information about transitions in the response.<br/>
 				 This parameter accepts transitions.fields, which returns information about the fields in the<br/>
 				 transition screen for each transition. Fields hidden from the screen are not returned. Use this<br/>
-				 information to populate the fields and update fields in Transition issue.`
+				 information to populate the fields and update fields in Transition issue.`,
 			},
 			{
 				displayName: 'Transition ID',
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 07c29bca9..0418f0b42 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -18,8 +18,8 @@ import {
 } from './GenericFunctions';
 
 import {
-	issueOperations,
 	issueFields,
+	issueOperations,
 } from './IssueDescription';
 
 import {
@@ -153,7 +153,7 @@ export class Jira implements INodeType {
 					}
 				} else {
 					for (const issueType of issueTypes) {
-						if (issueType.scope.project.id === projectId) {
+						if (issueType.scope === undefined || issueType.scope.project.id === projectId) {
 							const issueTypeName = issueType.name;
 							const issueTypeId = issueType.id;
 
@@ -216,7 +216,7 @@ export class Jira implements INodeType {
 					const users = await jiraSoftwareCloudApiRequest.call(this, '/api/2/user/search', 'GET', {},
 						{
 							username: "'",
-						}
+						},
 					);
 					for (const user of users) {
 						const userName = user.displayName;
@@ -279,7 +279,7 @@ export class Jira implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -524,7 +524,7 @@ export class Jira implements INodeType {
 								// @ts-ignore
 								notificationRecipients.users = notificationRecipientsValues.users.map(user => {
 									return {
-										accountId: user
+										accountId: user,
 									};
 								});
 							}
@@ -533,7 +533,7 @@ export class Jira implements INodeType {
 								// @ts-ignore
 								notificationRecipients.groups = notificationRecipientsValues.groups.map(group => {
 									return {
-										name: group
+										name: group,
 									};
 								});
 							}
@@ -547,7 +547,7 @@ export class Jira implements INodeType {
 								// @ts-ignore
 								notificationRecipientsRestrictions.groups = notificationRecipientsRestrictionsValues.groups.map(group => {
 									return {
-										name: group
+										name: group,
 									};
 								});
 							}
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index 41ecaecc3..72923f9ae 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -5,16 +5,16 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
-	jiraSoftwareCloudApiRequest,
+	allEvents,
 	eventExists,
 	getId,
-	allEvents,
+	jiraSoftwareCloudApiRequest,
 } from './GenericFunctions';
 
 import * as queryString from 'querystring';
@@ -284,59 +284,59 @@ export class JiraTrigger implements INodeType {
 						options: [
 							{
 								name: 'Attachment ID',
-								value: 'attachment.id'
+								value: 'attachment.id',
 							},
 							{
 								name: 'Board ID',
-								value: 'board.id'
+								value: 'board.id',
 							},
 							{
 								name: 'Comment ID',
-								value: 'comment.id'
+								value: 'comment.id',
 							},
 							{
 								name: 'Issue ID',
-								value: 'issue.id'
+								value: 'issue.id',
 							},
 							{
 								name: 'Merge Version ID',
-								value: 'mergeVersion.id'
+								value: 'mergeVersion.id',
 							},
 							{
 								name: 'Modified User Account ID',
-								value: 'modifiedUser.accountId'
+								value: 'modifiedUser.accountId',
 							},
 							{
 								name: 'Modified User Key',
-								value: 'modifiedUser.key'
+								value: 'modifiedUser.key',
 							},
 							{
 								name: 'Modified User Name',
-								value: 'modifiedUser.name'
+								value: 'modifiedUser.name',
 							},
 							{
 								name: 'Project ID',
-								value: 'project.id'
+								value: 'project.id',
 							},
 							{
 								name: 'Project Key',
-								value: 'project.key'
+								value: 'project.key',
 							},
 							{
 								name: 'Propery Key',
-								value: 'property.key'
+								value: 'property.key',
 							},
 							{
 								name: 'Sprint ID',
-								value: 'sprint.id'
+								value: 'sprint.id',
 							},
 							{
 								name: 'Version ID',
-								value: 'version.id'
+								value: 'version.id',
 							},
 							{
 								name: 'Worklog ID',
-								value: 'worklog.id'
+								value: 'worklog.id',
 							},
 						],
 						default: [],
@@ -448,7 +448,7 @@ export class JiraTrigger implements INodeType {
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(bodyData)
+				this.helpers.returnJsonArray(bodyData),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
index 555e06d69..85f6f0cee 100644
--- a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
@@ -22,7 +22,7 @@ export async function jotformApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs,
 		form: body,
 		uri: uri || `https://${credentials.apiDomain || 'api.jotform.com'}${resource}`,
-		json: true
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.form;
diff --git a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
index 9d05edcac..755b2bd61 100644
--- a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
+++ b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
@@ -9,8 +9,8 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -42,7 +42,7 @@ export class JotFormTrigger implements INodeType {
 			{
 				name: 'jotFormApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
@@ -59,7 +59,7 @@ export class JotFormTrigger implements INodeType {
 				type: 'options',
 				required: true,
 				typeOptions: {
-					loadOptionsMethod: 'getForms'
+					loadOptionsMethod: 'getForms',
 				},
 				default: '',
 				description: '',
diff --git a/packages/nodes-base/nodes/Keap/CompanyDescription.ts b/packages/nodes-base/nodes/Keap/CompanyDescription.ts
index edb73d1ce..4b91f1940 100644
--- a/packages/nodes-base/nodes/Keap/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Keap/CompanyDescription.ts
@@ -128,7 +128,7 @@ export const companyFields = [
 						name: 'countryCode',
 						type: 'string',
 						default: '',
-						description: 'ISO Alpha-3 Code'
+						description: 'ISO Alpha-3 Code',
 					},
 					{
 						displayName: 'Line 1',
@@ -213,7 +213,7 @@ export const companyFields = [
 						default: '',
 					},
 				],
-			}
+			},
 		],
 	},
 	{
diff --git a/packages/nodes-base/nodes/Keap/ContactDescription.ts b/packages/nodes-base/nodes/Keap/ContactDescription.ts
index b1611c518..5b5746f7a 100644
--- a/packages/nodes-base/nodes/Keap/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Keap/ContactDescription.ts
@@ -73,7 +73,7 @@ export const contactFields = [
 		},
 		default: 'email',
 		description: `Performs duplicate checking by one of the following options: Email, EmailAndName,</br>
-		if a match is found using the option provided, the existing contact will be updated`
+		if a match is found using the option provided, the existing contact will be updated`,
 	},
 	{
 		displayName: 'Additional Fields',
@@ -385,7 +385,7 @@ export const contactFields = [
 						default: '',
 					},
 				],
-			}
+			},
 		],
 	},
 	{
@@ -435,7 +435,7 @@ export const contactFields = [
 						default: '',
 					},
 				],
-			}
+			},
 		],
 	},
 	{
diff --git a/packages/nodes-base/nodes/Keap/ContactNoteDescription.ts b/packages/nodes-base/nodes/Keap/ContactNoteDescription.ts
index aa625c3b6..80eb2bf5f 100644
--- a/packages/nodes-base/nodes/Keap/ContactNoteDescription.ts
+++ b/packages/nodes-base/nodes/Keap/ContactNoteDescription.ts
@@ -325,7 +325,7 @@ export const contactNoteFields = [
 				name: 'contactId',
 				type: 'number',
 				typeOptions: {
-					minValue: 0
+					minValue: 0,
 				},
 				default: 0,
 			},
diff --git a/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts b/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
index 2d43239fb..eee5dc751 100644
--- a/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
+++ b/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
@@ -156,7 +156,7 @@ export const ecommerceOrderFields = [
 				type: 'string',
 				default: '',
 				description: `Uses multiple strings separated by comma as promo codes.</br>
-				The corresponding discount will be applied to the order.`
+				The corresponding discount will be applied to the order.`,
 			},
 			{
 				displayName: 'Sales Affiliate ID',
diff --git a/packages/nodes-base/nodes/Keap/EmailDescription.ts b/packages/nodes-base/nodes/Keap/EmailDescription.ts
index 0f7015250..841f28388 100644
--- a/packages/nodes-base/nodes/Keap/EmailDescription.ts
+++ b/packages/nodes-base/nodes/Keap/EmailDescription.ts
@@ -157,7 +157,7 @@ export const emailFields = [
 				type: 'string',
 				default: '',
 				description: `Provider id that sent the email, must be unique when combined with provider.</br>
-				If omitted a UUID without dashes is autogenerated for the record.`
+				If omitted a UUID without dashes is autogenerated for the record.`,
 			},
 			{
 				displayName: 'Plain Content',
diff --git a/packages/nodes-base/nodes/Keap/FileDescription.ts b/packages/nodes-base/nodes/Keap/FileDescription.ts
index 863590a61..b030170c6 100644
--- a/packages/nodes-base/nodes/Keap/FileDescription.ts
+++ b/packages/nodes-base/nodes/Keap/FileDescription.ts
@@ -48,7 +48,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
@@ -66,7 +66,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
@@ -182,7 +182,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
@@ -276,7 +276,7 @@ export const fileFields = [
 				name: 'contactId',
 				type: 'number',
 				typeOptions: {
-					minValue: 0
+					minValue: 0,
 				},
 				default: 0,
 				description: 'Filter based on Contact Id, if user has permission to see Contact files.',
diff --git a/packages/nodes-base/nodes/Keap/GenericFunctions.ts b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
index d00228fad..c2a4c2497 100644
--- a/packages/nodes-base/nodes/Keap/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
@@ -26,7 +26,7 @@ export async function keapApiRequest(this: IWebhookFunctions | IHookFunctions |
 		body,
 		qs,
 		uri: uri || `https://api.infusionsoft.com/crm/rest/v1${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		options = Object.assign({}, options, option);
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 3ba98cda7..59692d0df 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -3,13 +3,13 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
-	INodeExecutionData,
-	INodeTypeDescription,
-	INodeType,
-	ILoadOptionsFunctions,
-	INodePropertyOptions,
 	IBinaryKeyData,
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -19,57 +19,57 @@ import {
 } from './GenericFunctions';
 
 import {
-	contactOperations,
 	contactFields,
+	contactOperations,
 } from './ContactDescription';
 
 import {
-	contactNoteOperations,
 	contactNoteFields,
+	contactNoteOperations,
 } from './ContactNoteDescription';
 
 import {
-	contactTagOperations,
 	contactTagFields,
+	contactTagOperations,
 } from './ContactTagDescription';
 
 import {
-	ecommerceOrderOperations,
 	ecommerceOrderFields,
+	ecommerceOrderOperations,
 } from './EcommerceOrderDescripion';
 
 import {
-	ecommerceProductOperations,
 	ecommerceProductFields,
+	ecommerceProductOperations,
 } from './EcommerceProductDescription';
 
 import {
-	emailOperations,
 	emailFields,
+	emailOperations,
 } from './EmailDescription';
 
 import {
-	fileOperations,
 	fileFields,
+	fileOperations,
 } from './FileDescription';
 
 import {
-	companyOperations,
 	companyFields,
+	companyOperations,
  } from './CompanyDescription';
 
 import {
-	IContact,
 	IAddress,
-	IFax,
+	IContact,
 	IEmailContact,
-	ISocialAccount,
+	IFax,
 	IPhone,
+	ISocialAccount,
 } from './ConctactInterface';
 
 import {
-	IEmail,
 	IAttachment,
+	IEmail,
 } from './EmaiIInterface';
 
 import {
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index c5818165a..fe608e58a 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -5,11 +5,11 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Keap/keap.png b/packages/nodes-base/nodes/Keap/keap.png
index 4cf546680..6e65bc824 100644
Binary files a/packages/nodes-base/nodes/Keap/keap.png and b/packages/nodes-base/nodes/Keap/keap.png differ
diff --git a/packages/nodes-base/nodes/LinkFish/LinkFish.node.ts b/packages/nodes-base/nodes/LinkFish/LinkFish.node.ts
deleted file mode 100644
index 345124492..000000000
--- a/packages/nodes-base/nodes/LinkFish/LinkFish.node.ts
+++ /dev/null
@@ -1,350 +0,0 @@
-import { IExecuteSingleFunctions } from 'n8n-core';
-import {
-	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
-} from 'n8n-workflow';
-
-export class LinkFish implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'link.fish Scrape',
-		name: 'linkFish',
-		icon: 'file:linkfish.png',
-		group: ['input'],
-		version: 1,
-		description: 'Scrape data from an URL',
-		defaults: {
-			name: 'link.fish Scrape',
-			color: '#33AA22',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'linkFishApi',
-				required: true,
-			}
-		],
-		properties: [
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				options: [
-					{
-						name: 'All Data',
-						value: 'data',
-						description: 'Get all found data',
-					},
-					{
-						name: 'Apps',
-						value: 'apps',
-						description: 'Get mobile app information',
-					},
-					{
-						name: 'Social Media',
-						value: 'socialMedia',
-						description: 'Get social-media profiles',
-					},
-					{
-						name: 'Screenshot',
-						value: 'screenshot',
-						description: 'Get screenshot',
-					},
-				],
-				default: 'data',
-				description: 'The operation to perform.',
-			},
-
-			// ----------------------------------
-			//         All
-			// ----------------------------------
-			{
-				displayName: 'URL',
-				name: 'url',
-				type: 'string',
-				default: '',
-				required: true,
-				description: 'URL of which the data should be extracted.',
-
-			},
-
-			// ----------------------------------
-			//         data
-			// ----------------------------------
-			{
-				displayName: 'Item Format',
-				name: 'itemFormat',
-				type: 'options',
-				options: [
-					{
-						name: 'Normal',
-						value: 'normal'
-					},
-					{
-						name: 'Flat',
-						value: 'flat'
-					},
-				],
-				default: 'flat',
-				displayOptions: {
-					show: {
-						operation: [
-							'data'
-						],
-					},
-				},
-				description: 'If data should be returned in the "normal"<br />format or in the "flat" one which has all<br />items on one level.',
-			},
-			{
-				displayName: 'Simplify Types',
-				name: 'simplifySpecialTypes',
-				type: 'boolean',
-				default: true,
-				displayOptions: {
-					show: {
-						operation: [
-							'data'
-						],
-					},
-				},
-				description: 'If special types like "ParameterValue"<br />should be simplified to a key -> value pair.',
-			},
-
-			// ----------------------------------
-			//         screenshot
-			// ----------------------------------
-			{
-				displayName: 'Type',
-				name: 'type',
-				type: 'options',
-				options: [
-					{
-						name: 'Normal',
-						value: 'normal',
-						description: 'Creates a screenshot in 16:9 format.',
-					},
-					{
-						name: 'Full',
-						value: 'full',
-						description: 'Creates a full page screenshot.',
-					},
-				],
-				default: 'normal',
-				displayOptions: {
-					show: {
-						operation: [
-							'screenshot'
-						],
-					},
-				},
-				description: 'The file format the screenshot should be returned as.',
-			},
-			{
-				displayName: 'File Format',
-				name: 'fileFormat',
-				type: 'options',
-				options: [
-					{
-						name: 'JPG',
-						value: 'jpg',
-					},
-					{
-						name: 'PNG',
-						value: 'png',
-					},
-				],
-				default: 'jpg',
-				displayOptions: {
-					show: {
-						operation: [
-							'screenshot'
-						],
-					},
-				},
-				description: 'The file format the screenshot should be returned as.',
-			},
-			{
-				displayName: 'Width',
-				name: 'width',
-				type: 'number',
-				typeOptions: {
-					minValue: 50,
-					maxValue: 1280,
-				},
-				default: 640,
-				displayOptions: {
-					show: {
-						operation: [
-							'screenshot'
-						],
-					},
-				},
-				description: 'The width of the screenshot in pixel.',
-			},
-			{
-				displayName: 'Binary Property',
-				name: 'binaryPropertyName',
-				type: 'string',
-				default: 'data',
-				required: true,
-				displayOptions: {
-					show: {
-						operation: [
-							'screenshot',
-						],
-					},
-
-				},
-				placeholder: '',
-				description: 'Name of the binary property in which to save<br />the binary data of the screenshot.',
-			},
-
-			// ----------------------------------
-			//         Multiple ones
-			// ----------------------------------
-			{
-				displayName: 'Browser Render',
-				name: 'browserRender',
-				type: 'boolean',
-				default: false,
-				displayOptions: {
-					hide: {
-						operation: [
-							'screenshot'
-						],
-					},
-				},
-				description: 'Renders the website in a browser<br />(charges 5 instead of 1 credit!)',
-			},
-			{
-				displayName: 'Return URLs',
-				name: 'returnUrls',
-				type: 'boolean',
-				default: false,
-				displayOptions: {
-					hide: {
-						operation: [
-							'data',
-							'screenshot',
-						],
-					},
-				},
-				description: 'Returns app URLs instead of the identifiers.',
-			},
-		],
-	};
-
-
-	async executeSingle(this: IExecuteSingleFunctions): Promise<INodeExecutionData> {
-		const url = this.getNodeParameter('url') as string;
-
-		const credentials = this.getCredentials('linkFishApi');
-
-		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
-		}
-
-		let requestMethod = 'GET';
-
-		// For Post
-		const body: IDataObject = {
-			url,
-		};
-		// For Query string
-		const qs: IDataObject = {};
-
-		let endpoint: string;
-		let encoding: string | null = 'utf8';
-
-		const operation = this.getNodeParameter('operation') as string;
-
-		if (operation === 'data') {
-			requestMethod = 'POST';
-
-			body.browser_render = this.getNodeParameter('browserRender') as boolean;
-			body.item_format = this.getNodeParameter('itemFormat') as string;
-			body.simplify_special_types = this.getNodeParameter('simplifySpecialTypes') as boolean;
-
-			endpoint = 'data';
-		} else if (operation === 'apps') {
-			requestMethod = 'GET';
-
-			qs.browser_render = this.getNodeParameter('browserRender') as boolean;
-			qs.return_urls = this.getNodeParameter('returnUrls') as boolean;
-
-			endpoint = 'apps';
-		} else if (operation === 'socialMedia') {
-			requestMethod = 'GET';
-
-			qs.browser_render = this.getNodeParameter('browserRender') as boolean;
-			qs.return_urls = this.getNodeParameter('returnUrls') as boolean;
-
-			endpoint = 'social-media';
-		} else if (operation === 'screenshot') {
-			requestMethod = 'GET';
-			encoding = null;
-
-			qs.file_format = this.getNodeParameter('fileFormat') as string;
-			qs.type = this.getNodeParameter('type') as string;
-			qs.width = this.getNodeParameter('width') as number;
-
-			endpoint = 'browser-screenshot';
-		} else {
-			throw new Error(`The operation "${operation}" is not supported!`);
-		}
-
-		const options = {
-			method: requestMethod,
-			body,
-			headers: {
-				'x-lf-source': 'n8n',
-			},
-			qs,
-			uri: `https://api.link.fish/Urls/${endpoint}`,
-			auth: {
-				user: credentials.email as string,
-				pass: credentials.apiKey as string,
-			},
-			encoding,
-			json: true
-		};
-
-		const responseData = await this.helpers.request(options);
-
-		if (operation === 'screenshot') {
-			const item = this.getInputData();
-
-			const newItem: INodeExecutionData = {
-				json: item.json,
-				binary: {},
-			};
-
-			if (item.binary !== undefined) {
-				// Create a shallow copy of the binary data so that the old
-				// data references which do not get changed still stay behind
-				// but the incoming data does not get changed.
-				Object.assign(newItem.binary, item.binary);
-			}
-
-			// Add the returned data to the item as binary property
-			const binaryPropertyName = this.getNodeParameter('binaryPropertyName') as string;
-
-			let fileExtension = 'png';
-			let mimeType = 'image/png';
-			if (qs.file_format === 'jpg') {
-				fileExtension = 'jpg';
-				mimeType = 'image/jpeg';
-			}
-
-			newItem.binary![binaryPropertyName] = await this.helpers.prepareBinaryData(responseData, `screenshot.${fileExtension}`, mimeType);
-
-			return newItem;
-		}
-
-		return {
-			json: responseData,
-		};
-	}
-}
diff --git a/packages/nodes-base/nodes/LinkFish/linkfish.png b/packages/nodes-base/nodes/LinkFish/linkfish.png
deleted file mode 100644
index 4825f7d8e..000000000
Binary files a/packages/nodes-base/nodes/LinkFish/linkfish.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
new file mode 100644
index 000000000..09fe1e71f
--- /dev/null
+++ b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
@@ -0,0 +1,52 @@
+import {
+	OptionsWithUrl,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+export async function linkedInApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, binary?: boolean, headers?: object): Promise<any> { // tslint:disable-line:no-any
+	const options: OptionsWithUrl = {
+		headers: {
+			'Accept': 'application/json',
+			'X-Restli-Protocol-Version': '2.0.0',
+		},
+		method,
+		body,
+		url: binary ? endpoint : `https://api.linkedin.com/v2${endpoint}`,
+		json: true,
+	};
+
+	// If uploading binary data
+	if (binary) {
+		delete options.json;
+		options.encoding = null;
+	}
+
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
+
+	try {
+		return await this.helpers.requestOAuth2!.call(this, 'linkedInOAuth2Api', options, { tokenType: 'Bearer' });
+	} catch (error) {
+		if (error.respose && error.response.body && error.response.body.detail) {
+			throw new Error(`Linkedin Error response [${error.statusCode}]: ${error.response.body.detail}`);
+		}
+		throw error;
+	}
+}
+
+
+export function validateJSON(json: string | undefined): any { // tslint:disable-line:no-any
+	let result;
+	try {
+		result = JSON.parse(json!);
+	} catch (exception) {
+		result = '';
+	}
+	return result;
+}
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
new file mode 100644
index 000000000..81f01e545
--- /dev/null
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -0,0 +1,255 @@
+import {
+	BINARY_ENCODING,
+	IExecuteFunctions,
+} from 'n8n-core';
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { linkedInApiRequest } from './GenericFunctions';
+import {
+	postFields,
+	postOperations,
+} from './PostDescription';
+
+export class LinkedIn implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'LinkedIn',
+		name: 'linkedIn',
+		icon: 'file:linkedin.png',
+		group: ['input'],
+		version: 1,
+		description: 'Consume LinkedIn Api',
+		defaults: {
+			name: 'LinkedIn',
+			color: '#0075b4',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'linkedInOAuth2Api',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Post',
+						value: 'post',
+					},
+				],
+				default: 'post',
+				description: 'The resource to consume',
+			},
+			//POST
+			...postOperations,
+			...postFields,
+		],
+
+
+	};
+
+	methods = {
+		loadOptions: {
+			// Get Person URN which has to be used with other LinkedIn API Requests
+			// https://docs.microsoft.com/en-us/linkedin/consumer/integrations/self-serve/sign-in-with-linkedin
+			async getPersonUrn(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const person = await linkedInApiRequest.call(this, 'GET', '/me', {});
+				returnData.push({ name: `${person.localizedFirstName} ${person.localizedLastName}`, value: person.id });
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		let body = {};
+
+		for (let i = 0; i < items.length; i++) {
+			if (resource === 'post') {
+				if (operation === 'create') {
+					const text = this.getNodeParameter('text', i) as string;
+					const shareMediaCategory = this.getNodeParameter('shareMediaCategory', i) as string;
+					const postAs = this.getNodeParameter('postAs', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					let authorUrn = '';
+					let visibility = 'PUBLIC';
+
+					if (postAs === 'person') {
+						const personUrn = this.getNodeParameter('person', i) as string;
+						// Only if posting as a person can user decide if post visible by public or connections
+						visibility = additionalFields.visibility as string || 'PUBLIC';
+						authorUrn = `urn:li:person:${personUrn}`;
+					} else {
+						const organizationUrn = this.getNodeParameter('organization', i) as string;
+						authorUrn = `urn:li:organization:${organizationUrn}`;
+					}
+
+					let description = '';
+					let title = '';
+					let originalUrl = '';
+
+					if (shareMediaCategory === 'IMAGE') {
+
+						if (additionalFields.description) {
+							description = additionalFields.description as string;
+						}
+						if (additionalFields.title) {
+							title = additionalFields.title as string;
+						}
+						// Send a REQUEST to prepare a register of a media image file
+						const registerRequest = {
+							registerUploadRequest: {
+								recipes: [
+									'urn:li:digitalmediaRecipe:feedshare-image',
+								],
+								owner: authorUrn,
+								serviceRelationships: [
+									{
+										relationshipType: 'OWNER',
+										identifier: 'urn:li:userGeneratedContent',
+									},
+								],
+							},
+						};
+
+						const registerObject = await linkedInApiRequest.call(this, 'POST', '/assets?action=registerUpload', registerRequest);
+
+						// Response provides a specific upload URL that is used to upload the binary image file
+						const uploadUrl = registerObject.value.uploadMechanism['com.linkedin.digitalmedia.uploading.MediaUploadHttpRequest'].uploadUrl as string;
+						const asset = registerObject.value.asset as string;
+
+						// Prepare binary file upload
+						const item = items[i];
+
+						if (item.binary === undefined) {
+							throw new Error('No binary data exists on item!');
+						}
+
+						const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string;
+
+						if (item.binary[propertyNameUpload] === undefined) {
+							throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
+						}
+
+						// Buffer binary data
+						const buffer = Buffer.from(item.binary[propertyNameUpload].data, BINARY_ENCODING) as Buffer;
+						// Upload image
+						await linkedInApiRequest.call(this, 'POST', uploadUrl, buffer, true);
+
+						body = {
+							author: authorUrn,
+							lifecycleState: 'PUBLISHED',
+							specificContent: {
+								'com.linkedin.ugc.ShareContent': {
+									shareCommentary: {
+										text,
+									},
+									shareMediaCategory: 'IMAGE',
+									media: [
+										{
+											status: 'READY',
+											description: {
+												text: description,
+											},
+											media: asset,
+											title: {
+												text: title,
+											},
+										},
+									],
+								},
+							},
+							visibility: {
+								'com.linkedin.ugc.MemberNetworkVisibility': visibility,
+							},
+						};
+
+					} else if (shareMediaCategory === 'ARTICLE') {
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (additionalFields.description) {
+							description = additionalFields.description as string;
+						}
+						if (additionalFields.title) {
+							title = additionalFields.title as string;
+						}
+						if (additionalFields.originalUrl) {
+							originalUrl = additionalFields.originalUrl as string;
+						}
+
+						body = {
+							author: `${authorUrn}`,
+							lifecycleState: 'PUBLISHED',
+							specificContent: {
+								'com.linkedin.ugc.ShareContent': {
+									shareCommentary: {
+										text,
+									},
+									shareMediaCategory,
+									media: [
+										{
+											status: 'READY',
+											description: {
+												text: description,
+											},
+											originalUrl,
+											title: {
+												text: title,
+											},
+										},
+									],
+								},
+							},
+							visibility: {
+								'com.linkedin.ugc.MemberNetworkVisibility': visibility,
+							},
+						};
+					} else {
+						body = {
+							author: authorUrn,
+							lifecycleState: 'PUBLISHED',
+							specificContent: {
+								'com.linkedin.ugc.ShareContent': {
+									shareCommentary: {
+										text,
+									},
+									shareMediaCategory,
+								},
+							},
+							visibility: {
+								'com.linkedin.ugc.MemberNetworkVisibility': visibility,
+							},
+						};
+					}
+
+					const endpoint = '/ugcPosts';
+					responseData = await linkedInApiRequest.call(this, 'POST', endpoint, body);
+				}
+			}
+
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+			} else {
+				returnData.push(responseData as IDataObject);
+			}
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/LinkedIn/PostDescription.ts b/packages/nodes-base/nodes/LinkedIn/PostDescription.ts
new file mode 100644
index 000000000..bfcb66262
--- /dev/null
+++ b/packages/nodes-base/nodes/LinkedIn/PostDescription.ts
@@ -0,0 +1,250 @@
+import { INodeProperties } from "n8n-workflow";
+
+export const postOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'post',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new post',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const postFields = [
+/* -------------------------------------------------------------------------- */
+/*                                 post:create                              */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Post As',
+		name: 'postAs',
+		type: 'options',
+		default: '',
+		description: 'If to post on behalf of a user or an organization.',
+		options: [
+			{
+				name: 'Person',
+				value: 'person',
+			},
+			{
+				name: 'Organization',
+				value: 'organization',
+			},
+		],
+	},
+	{
+		displayName: 'Person',
+		name: 'person',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getPersonUrn',
+		},
+		default: '',
+		required: true,
+		description: 'Person as which the post should be posted as.',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				postAs: [
+					'person',
+				],
+				resource: [
+					'post',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Organization URN',
+		name: 'organization',
+		type: 'string',
+		default: '',
+		description: 'URN of Organization as which the post should be posted as',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				postAs: [
+					'organization',
+				],
+				resource: [
+					'post',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		default: '',
+		description: 'The primary content of the post.',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'post',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Media Category',
+		name: 'shareMediaCategory',
+		type: 'options',
+		default: 'NONE',
+		options: [
+			{
+				name: 'None',
+				value: 'NONE',
+				description: 'The post does not contain any media, and will only consist of text',
+			},
+			{
+				name: 'Article',
+				value: 'ARTICLE',
+				description: 'The post contains an article URL',
+			},
+			{
+				name: 'Image',
+				value: 'IMAGE',
+				description: 'The post contains an image',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'post',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Binary Property',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'post',
+				],
+				shareMediaCategory: [
+					'IMAGE',
+				],
+			},
+		},
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		description: 'Object property name which holds binary data',
+		required: true,
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'post',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Provide a short description for your image or article.',
+				displayOptions: {
+					show: {
+						'/shareMediaCategory': [
+							'ARTICLE',
+							'IMAGE',
+						],
+					},
+				},
+			},
+			{
+				displayName: 'Original URL',
+				name: 'originalUrl',
+				type: 'string',
+				default: '',
+				description: 'Provide the URL of the article you would like to share here.',
+				displayOptions: {
+					show: {
+						'/shareMediaCategory': [
+							'ARTICLE',
+						],
+					},
+				},
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				description: 'Customize the title of your image or article.',
+				displayOptions: {
+					show: {
+						'/shareMediaCategory': [
+							'ARTICLE',
+							'IMAGE',
+						],
+					},
+				},
+			},
+			{
+				displayName: 'Visibility',
+				name: 'visibility',
+				type: 'options',
+				default: 'PUBLIC',
+				description: 'Dictate if post will be seen by the public or only connections.',
+				displayOptions: {
+					show: {
+						'/postAs': [
+							'person',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Connections',
+						value: 'CONNECTIONS',
+					},
+					{
+						name: 'Public',
+						value: 'PUBLIC',
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/LinkedIn/linkedin.png b/packages/nodes-base/nodes/LinkedIn/linkedin.png
new file mode 100644
index 000000000..be815e9ed
Binary files /dev/null and b/packages/nodes-base/nodes/LinkedIn/linkedin.png differ
diff --git a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
index 442e6ac01..c8c24cd57 100644
--- a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
@@ -20,7 +20,7 @@ export async function mailchimpApiRequest(this: IHookFunctions | IExecuteFunctio
 
 	const options: OptionsWithUrl = {
 		headers: {
-			'Accept': 'application/json'
+			'Accept': 'application/json',
 		},
 		method,
 		qs,
@@ -49,6 +49,7 @@ export async function mailchimpApiRequest(this: IHookFunctions | IExecuteFunctio
 
 			const datacenter = (credentials.apiKey as string).split('-').pop();
 			options.url = `https://${datacenter}.${host}${endpoint}`;
+
 			return await this.helpers.request!(options);
 		} else {
 			const credentials = this.getCredentials('mailchimpOAuth2Api') as IDataObject;
@@ -110,3 +111,63 @@ function getMetadata(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFu
 	};
 	return this.helpers.request!(options);
 }
+
+export const campaignFieldsMetadata = [
+	'*',
+	'campaigns.id',
+	'campaigns.web_id',
+	'campaigns.type',
+	'campaigns.create_time',
+	'campaigns.archive_url',
+	'campaigns.long_archive_url',
+	'campaigns.status',
+	'campaigns.emails_sent',
+	'campaigns.send_time',
+	'campaigns.content_type',
+	'campaigns.needs_block_refresh',
+	'campaigns.resendable',
+	'campaigns.recipients',
+	'campaigns.recipients.list_id',
+	'campaigns.recipients.list_is_active',
+	'campaigns.recipients.list_name',
+	'campaigns.recipients.segment_text',
+	'campaigns.recipients.recipient_count',
+	'campaigns.settings',
+	'campaigns.settings.subject_line',
+	'campaigns.settings.preview_text',
+	'campaigns.settings.title',
+	'campaigns.settings.from_name',
+	'campaigns.settings.reply_to',
+	'campaigns.settings.use_conversation',
+	'campaigns.settings.to_name',
+	'campaigns.settings.folder_id',
+	'campaigns.settings.authenticate',
+	'campaigns.settings.auto_footer',
+	'campaigns.settings.inline_css',
+	'campaigns.settings.auto_tweet',
+	'campaigns.settings.fb_comments',
+	'campaigns.settings.timewarp',
+	'campaigns.settings.template_id',
+	'campaigns.settings.drag_and_drop',
+	'campaigns.tracking',
+	'campaigns.tracking.opens',
+	'campaigns.tracking.html_clicks',
+	'campaigns.tracking.text_clicks',
+	'campaigns.tracking.goal_tracking',
+	'campaigns.tracking.ecomm360',
+	'campaigns.tracking.google_analytics',
+	'campaigns.tracking.clicktale',
+	'campaigns.report_summary',
+	'campaigns.report_summary.opens',
+	'campaigns.report_summary.unique_opens',
+	'campaigns.report_summary.open_rate',
+	'campaigns.report_summary.clicks',
+	'campaigns.report_summary.subscriber_clicks',
+	'campaigns.report_summary.click_rate',
+	'campaigns.report_summary.click_rate.ecommerce',
+	'campaigns.report_summary.click_rate.ecommerce.total_orders',
+	'campaigns.report_summary.click_rate.ecommerce.total_spent',
+	'campaigns.report_summary.click_rate.ecommerce.total_revenue',
+	'campaigns.report_summary.delivery_status.enabled',
+	'campaigns._links',
+];
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index ff5ee6364..447ce8954 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -13,6 +13,7 @@ import {
 } from 'n8n-workflow';
 
 import {
+	campaignFieldsMetadata,
 	mailchimpApiRequest,
 	mailchimpApiRequestAllItems,
 	validateJSON,
@@ -113,6 +114,10 @@ export class Mailchimp implements INodeType {
 				name: 'resource',
 				type: 'options',
 				options: [
+					{
+						name: 'Campaign',
+						value: 'campaign',
+					},
 					{
 						name: 'List Group',
 						value: 'listGroup',
@@ -221,6 +226,54 @@ export class Mailchimp implements INodeType {
 				default: 'getAll',
 				description: 'The operation to perform.',
 			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type:'options',
+				required: true,
+				displayOptions : {
+					show: {
+						resource: [
+							'campaign',
+						],
+					},
+
+				},
+				options: [
+					{
+						name: 'Delete',
+						value: 'delete',
+						description: 'Delete a campaign',
+					},
+					{
+						name: 'Get',
+						value: 'get',
+						description: 'Get a campaign',
+					},
+					{
+						name: 'Get All',
+						value: 'getAll',
+						description: 'Get all the campaigns',
+					},
+					{
+						name: 'Replicate',
+						value: 'replicate',
+						description: 'Replicate a campaign',
+					},
+					{
+						name: 'Resend',
+						value: 'resend',
+						description: 'Creates a Resend to Non-Openers version of this campaign',
+					},
+					{
+						name: 'Send',
+						value: 'send',
+						description: 'Send a campaign',
+					},
+				],
+				default: 'getAll',
+				description: 'The operation to perform.',
+			},
 /* -------------------------------------------------------------------------- */
 /*                                 member:create                              */
 /* -------------------------------------------------------------------------- */
@@ -312,7 +365,7 @@ export class Mailchimp implements INodeType {
 				displayOptions: {
 					show: {
 						resource:[
-							'member'
+							'member',
 						],
 						operation: [
 							'create',
@@ -447,7 +500,7 @@ export class Mailchimp implements INodeType {
 								default: '',
 							},
 						],
-					}
+					},
 				],
 			},
 			{
@@ -462,7 +515,7 @@ export class Mailchimp implements INodeType {
 				displayOptions: {
 					show: {
 						resource:[
-							'member'
+							'member',
 						],
 						operation: [
 							'create',
@@ -563,7 +616,7 @@ export class Mailchimp implements INodeType {
 				displayOptions: {
 					show: {
 						resource:[
-							'member'
+							'member',
 						],
 						operation: [
 							'create',
@@ -748,7 +801,7 @@ export class Mailchimp implements INodeType {
 						default: '',
 						description: 'A comma-separated list of fields to exclude.',
 					},
-				]
+				],
 			},
 /* -------------------------------------------------------------------------- */
 /*                                 member:getAll                              */
@@ -967,7 +1020,7 @@ export class Mailchimp implements INodeType {
 				displayOptions: {
 					show: {
 						resource:[
-							'member'
+							'member',
 						],
 						operation: [
 							'update',
@@ -1021,7 +1074,7 @@ export class Mailchimp implements INodeType {
 						displayOptions: {
 							show: {
 								'/resource':[
-									'member'
+									'member',
 								],
 								'/operation':[
 									'update',
@@ -1086,7 +1139,7 @@ export class Mailchimp implements INodeType {
 						displayOptions: {
 							show: {
 								'/resource':[
-									'member'
+									'member',
 								],
 								'/operation':[
 									'update',
@@ -1207,7 +1260,7 @@ export class Mailchimp implements INodeType {
 						displayOptions: {
 							show: {
 								'/resource':[
-									'member'
+									'member',
 								],
 								'/operation':[
 									'update',
@@ -1373,7 +1426,7 @@ export class Mailchimp implements INodeType {
 				displayOptions: {
 					show: {
 						resource:[
-							'memberTag'
+							'memberTag',
 						],
 						operation: [
 							'create',
@@ -1500,6 +1553,219 @@ export class Mailchimp implements INodeType {
 				default: 500,
 				description: 'How many results to return.',
 			},
+/* -------------------------------------------------------------------------- */
+/*                                 campaign:getAll                            */
+/* -------------------------------------------------------------------------- */
+			{
+				displayName: 'Return All',
+				name: 'returnAll',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						resource: [
+							'campaign',
+						],
+						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: [
+							'campaign',
+						],
+						operation: [
+							'getAll',
+						],
+						returnAll: [
+							false,
+						],
+					},
+				},
+				typeOptions: {
+					minValue: 1,
+					maxValue: 1000,
+				},
+				default: 10,
+				description: 'How many results to return.',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						resource:[
+							'campaign',
+						],
+						operation: [
+							'getAll',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Before Create Time',
+						name: 'beforeCreateTime',
+						type: 'dateTime',
+						default: '',
+						description: 'Restrict the response to campaigns created before the set time.',
+					},
+					{
+						displayName: 'Before Send Time',
+						name: 'beforeSendTime',
+						type: 'dateTime',
+						default: '',
+						description: 'Restrict the response to campaigns sent before the set time.',
+					},
+					{
+						displayName: 'Exclude Fields',
+						name: 'excludeFields',
+						type: 'multiOptions',
+						typeOptions: {
+							loadOptionsMethod: 'getCampaignsFields',
+						},
+						default: [],
+						description: 'A comma-separated list of fields to exclude.',
+					},
+					{
+						displayName: 'Fields',
+						name: 'fields',
+						type: 'multiOptions',
+						typeOptions: {
+							loadOptionsMethod: 'getCampaignsFields',
+						},
+						default: [
+							'campaigns.id',
+							'campaigns.status',
+							'campaigns.tracking',
+							'campaigns.settings.from_name',
+							'campaigns.settings.reply_to',
+							'campaigns.settings.title',
+						],
+						description: 'A comma-separated list of fields to return.',
+					},
+					{
+						displayName: 'List ID',
+						name: 'listId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getLists',
+						},
+						default: '',
+						description: 'List of lists',
+					},
+					{
+						displayName: 'Since Create Time',
+						name: 'sinceCreateTime',
+						type: 'dateTime',
+						default: '',
+						description: 'Restrict the response to campaigns created after the set time.',
+					},
+					{
+						displayName: 'Since Send Time',
+						name: 'sinceSendTime',
+						type: 'dateTime',
+						default: '',
+						description: 'Restrict the response to campaigns sent after the set time.',
+					},
+					{
+						displayName: 'Sort Direction',
+						name: 'sortDirection',
+						type: 'options',
+						options: [
+							{
+								name: 'ASC',
+								value: 'ASC',
+							},
+							{
+								name: 'DESC',
+								value: 'DESC',
+							},
+						],
+						default: '',
+						description: 'Determines the order direction for sorted results.',
+					},
+					{
+						displayName: 'Sort Field',
+						name: 'sortField',
+						type: 'options',
+						options: [
+							{
+								name: 'Create Time',
+								value: 'create_time',
+							},
+							{
+								name: 'Send Time',
+								value: 'send_time',
+							},
+						],
+						default: '',
+						description: 'Returns files sorted by the specified field.',
+					},
+					{
+						displayName: 'Status',
+						name: 'status',
+						type: 'options',
+						options: [
+							{
+								name: 'Save',
+								value: 'save',
+							},
+							{
+								name: 'Sending',
+								value: 'sending',
+							},
+							{
+								name: 'Sent',
+								value: 'sent',
+							},
+							{
+								name: 'Schedule',
+								value: 'schedule',
+							},
+						],
+						default: '',
+						description: 'The status of the campaign.',
+					},
+				],
+			},
+/* -------------------------------------------------------------------------- */
+/*                                 campaign:send                              */
+/* -------------------------------------------------------------------------- */
+			{
+				displayName: 'Campaign ID',
+				name: 'campaignId',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'campaign',
+						],
+						operation: [
+							'send',
+							'get',
+							'delete',
+							'replicate',
+							'resend',
+						],
+					},
+				},
+				required: true,
+				default: '',
+				description: 'List of Campaigns',
+				options:[],
+			},
 		],
 	};
 
@@ -1556,7 +1822,34 @@ export class Mailchimp implements INodeType {
 				}
 				return returnData;
 			},
-		}
+
+			// Get all the available campaigns to display them to users so that they can select them easily
+			async getCampaigns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const campaigns = await mailchimpApiRequestAllItems.call(this, '/campaigns', 'GET', 'campaigns');
+				for (const campaign of campaigns) {
+					const campaignName = campaign.settings.title;
+					const campaignId = campaign.id;
+					returnData.push({
+						name: campaignName,
+						value: campaignId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the available fields to display them to users so that they can select them easily
+			async getCampaignsFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				for (const campaignFields of campaignFieldsMetadata) {
+					returnData.push({
+						name: campaignFields,
+						value: campaignFields,
+					});
+				}
+				return returnData;
+			},
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -1597,7 +1890,7 @@ export class Mailchimp implements INodeType {
 					const body: ICreateMemberBody = {
 						listId,
 						email_address: email,
-						status
+						status,
 					};
 					if (options.emailType) {
 						body.email_type = options.emailType as string;
@@ -1884,6 +2177,90 @@ export class Mailchimp implements INodeType {
 					responseData = { success: true };
 				}
 			}
+			if (resource === 'campaign') {
+				//https://mailchimp.com/developer/api/marketing/campaigns/list-campaigns/
+				if (operation === 'getAll') {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					if (options.status) {
+						qs.status = options.status as string;
+					}
+					if (options.beforeCreateTime) {
+						qs.before_create_time = options.beforeCreateTime as string;
+					}
+					if (options.beforeSendTime) {
+						qs.before_send_time = options.beforeSendTime as string;
+					}
+					if (options.excludeFields) {
+						qs.exclude_fields = (options.exclude_fields as string[]).join(',');
+					}
+					if (options.fields) {
+						qs.fields = (options.fields as string[]).join(',');
+						if ((options.fields as string[]).includes('*')) {
+							qs.fields = campaignFieldsMetadata.join(',');
+						}
+					} else {
+						qs.fields = [
+							'campaigns.id',
+							'campaigns.status',
+							'campaigns.tracking',
+							'campaigns.settings.from_name',
+							'campaigns.settings.title',
+							'campaigns.settings.reply_to',
+						].join(',');
+					}
+
+					if (options.listId) {
+						qs.list_id = options.listId as string;
+					}
+					if (options.sinceCreateTime) {
+						qs.since_create_time = options.sinceCreateTime as string;
+					}
+					if (options.sinceSendTime) {
+						qs.since_send_time = options.sinceSendTime as string;
+					}
+					if (options.sortDirection) {
+						qs.sort_dir = options.sortDirection as string;
+					}
+					if (options.sortField) {
+						qs.sort_field = options.sortField as string;
+					}
+					if (returnAll === true) {
+						responseData = await mailchimpApiRequestAllItems.call(this, `/campaigns`, 'GET', 'campaigns', {}, qs);
+					} else {
+						qs.count = this.getNodeParameter('limit', i) as number;
+						responseData = await mailchimpApiRequest.call(this, `/campaigns`, 'GET', {}, qs);
+						responseData = responseData.campaigns;
+					}
+				}
+				//https://mailchimp.com/developer/api/marketing/campaigns/send-campaign/
+				if (operation === 'send') {
+					const campaignId = this.getNodeParameter('campaignId', i) as string;
+					responseData = await mailchimpApiRequest.call(this, `/campaigns/${campaignId}/actions/send`, 'POST', {});
+					responseData = { success: true };
+				}
+				//https://mailchimp.com/developer/api/marketing/campaigns/get-campaign-info/
+				if (operation === 'get') {
+					const campaignId = this.getNodeParameter('campaignId', i) as string;
+					responseData = await mailchimpApiRequest.call(this, `/campaigns/${campaignId}`, 'GET', {});
+				}
+				//https://mailchimp.com/developer/api/marketing/campaigns/delete-campaign/
+				if (operation === 'delete') {
+					const campaignId = this.getNodeParameter('campaignId', i) as string;
+					responseData = await mailchimpApiRequest.call(this, `/campaigns/${campaignId}`, 'DELETE', {});
+					responseData = { success: true };
+				}
+				//https://mailchimp.com/developer/api/marketing/campaigns/replicate-campaign/
+				if (operation === 'replicate') {
+					const campaignId = this.getNodeParameter('campaignId', i) as string;
+					responseData = await mailchimpApiRequest.call(this, `/campaigns/${campaignId}/actions/replicate`, 'POST', {});
+				}
+				//https://mailchimp.com/developer/api/marketing/campaigns/resend-campaign/
+				if (operation === 'resend') {
+					const campaignId = this.getNodeParameter('campaignId', i) as string;
+					responseData = await mailchimpApiRequest.call(this, `/campaigns/${campaignId}/actions/create-resend`, 'POST', {});
+				}
+			}
 
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index 870078dc0..5a9e039c1 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -5,11 +5,11 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 import {
 	mailchimpApiRequest,
@@ -65,7 +65,7 @@ export class MailchimpTrigger implements INodeType {
 				httpMethod: 'POST',
 				reponseMode: 'onReceived',
 				path: 'webhook',
-			}
+			},
 		],
 		properties: [
 			{
@@ -93,7 +93,7 @@ export class MailchimpTrigger implements INodeType {
 				default: '',
 				description: 'The list that is gonna fire the event.',
 				typeOptions: {
-					loadOptionsMethod: 'getLists'
+					loadOptionsMethod: 'getLists',
 				},
 				options: [],
 			},
@@ -161,7 +161,7 @@ export class MailchimpTrigger implements INodeType {
 						description: `Whether the webhook is triggered by actions initiated via the API.`,
 					},
 				],
-			}
+			},
 		],
 	};
 
@@ -291,7 +291,7 @@ export class MailchimpTrigger implements INodeType {
 		}
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index 07c5445da..8e5c1de69 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -4,9 +4,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 
@@ -28,7 +28,7 @@ export class Mailgun implements INodeType {
 			{
 				name: 'mailgunApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -128,7 +128,7 @@ export class Mailgun implements INodeType {
 			to: toEmail,
 			subject,
 			text,
-			html
+			html,
 		};
 
 		if (ccEmail.length !== 0) {
@@ -154,7 +154,7 @@ export class Mailgun implements INodeType {
 					options: {
 						filename: item.binary[propertyName].fileName || 'unknown',
 
-					}
+					},
 				});
 			}
 
diff --git a/packages/nodes-base/nodes/Mailjet/EmailDescription.ts b/packages/nodes-base/nodes/Mailjet/EmailDescription.ts
index 34102fd93..703975719 100644
--- a/packages/nodes-base/nodes/Mailjet/EmailDescription.ts
+++ b/packages/nodes-base/nodes/Mailjet/EmailDescription.ts
@@ -47,7 +47,7 @@ export const emailFields = [
 				],
 				operation: [
 					'send',
-				]
+				],
 			},
 		},
 		placeholder: 'admin@example.com',
@@ -67,7 +67,7 @@ export const emailFields = [
 				],
 				operation: [
 					'send',
-				]
+				],
 			},
 		},
 	},
@@ -93,7 +93,7 @@ export const emailFields = [
 				],
 				operation: [
 					'send',
-				]
+				],
 			},
 		},
 		default: '',
@@ -113,7 +113,7 @@ export const emailFields = [
 				],
 				operation: [
 					'send',
-				]
+				],
 			},
 		},
 		default: '',
@@ -216,7 +216,7 @@ export const emailFields = [
 				description: 'Enable or disable open tracking on this message.',
 				default: 'account_default',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Variables',
@@ -232,7 +232,7 @@ export const emailFields = [
 				],
 				operation: [
 					'send',
-				]
+				],
 			},
 		},
 		placeholder: 'Add Variable',
@@ -254,7 +254,7 @@ export const emailFields = [
 						type: 'string',
 						default: '',
 					},
-				]
+				],
 			},
 		],
 	},
@@ -274,7 +274,7 @@ export const emailFields = [
 				],
 				operation: [
 					'sendTemplate',
-				]
+				],
 			},
 		},
 		placeholder: 'admin@example.com',
@@ -294,7 +294,7 @@ export const emailFields = [
 				],
 				operation: [
 					'sendTemplate',
-				]
+				],
 			},
 		},
 	},
@@ -311,7 +311,7 @@ export const emailFields = [
 				],
 				operation: [
 					'sendTemplate',
-				]
+				],
 			},
 		},
 	},
@@ -384,7 +384,7 @@ export const emailFields = [
 				type: 'boolean',
 				default: true,
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Variables',
@@ -400,7 +400,7 @@ export const emailFields = [
 				],
 				operation: [
 					'sendTemplate',
-				]
+				],
 			},
 		},
 		placeholder: 'Add Variable',
@@ -422,7 +422,7 @@ export const emailFields = [
 						type: 'string',
 						default: '',
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
index f24971979..aecdd5148 100644
--- a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
@@ -17,7 +17,7 @@ export async function mailjetApiRequest(this: IExecuteFunctions | IExecuteSingle
 		qs,
 		body,
 		uri: uri ||`https://api.mailjet.com${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
index 841494b67..a30d7ada1 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
@@ -3,9 +3,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	mailjetApiRequest,
diff --git a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
index aba063502..f25b39b0b 100644
--- a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
diff --git a/packages/nodes-base/nodes/Mailjet/SmsDescription.ts b/packages/nodes-base/nodes/Mailjet/SmsDescription.ts
index ef6c05bb8..f94e3f08f 100644
--- a/packages/nodes-base/nodes/Mailjet/SmsDescription.ts
+++ b/packages/nodes-base/nodes/Mailjet/SmsDescription.ts
@@ -42,7 +42,7 @@ export const smsFields = [
 				],
 				operation: [
 					'send',
-				]
+				],
 			},
 		},
 		description: 'Customizable sender name. Should be between 3 and 11 characters in length, only alphanumeric characters are allowed.',
@@ -60,7 +60,7 @@ export const smsFields = [
 				],
 				operation: [
 					'send',
-				]
+				],
 			},
 		},
 		description: 'Message recipient. Should be between 3 and 15 characters in length. The number always starts with a plus sign followed by a country code, followed by the number. Phone numbers are expected to comply with the E.164 format.',
@@ -81,7 +81,7 @@ export const smsFields = [
 				],
 				operation: [
 					'send',
-				]
+				],
 			},
 		},
 	},
diff --git a/packages/nodes-base/nodes/Mailjet/mailjet.png b/packages/nodes-base/nodes/Mailjet/mailjet.png
index c5c04611c..88c3f71cc 100644
Binary files a/packages/nodes-base/nodes/Mailjet/mailjet.png and b/packages/nodes-base/nodes/Mailjet/mailjet.png differ
diff --git a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
index 538579339..cf113c56c 100644
--- a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
@@ -26,15 +26,13 @@ export async function mandrillApiRequest(this: IExecuteFunctions | IHookFunction
 		method,
 		uri: `https://${endpoint}${resource}${action}.json`,
 		body: data,
-		json: true
+		json: true,
 	};
 
 
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		console.error(error);
-
 		const errorMessage = error.response.body.message || error.response.body.Message;
 		if (error.name === 'Invalid_Key') {
 			throw new Error('The provided API key is not a valid Mandrill API key');
@@ -58,13 +56,13 @@ export function getToEmailArray(toEmail: string): any { // tslint:disable-line:n
 		toEmailArray = _.map(array, (email) => {
 			return {
 				email,
-				type: 'to'
+				type: 'to',
 			};
 		});
 	} else {
 		toEmailArray = [{
 			email: toEmail,
-			type: 'to'
+			type: 'to',
 		}];
 	}
 	return toEmailArray;
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index 642faa1c3..c61173d18 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -114,7 +114,7 @@ export class Mandrill implements INodeType {
 			{
 				name: 'mandrillApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -221,7 +221,7 @@ export class Mandrill implements INodeType {
 						operation: [
 							'sendHtml',
 							'sendTemplate',
-						]
+						],
 					},
 				},
 			},
@@ -551,7 +551,7 @@ export class Mandrill implements INodeType {
 			},
 			{
 				displayName: 'Attachments',
-				name: 'attachments',
+				name: 'attachmentsJson',
 				type: 'json',
 				typeOptions: {
 					alwaysOpenEditWindow: true,
@@ -647,9 +647,9 @@ export class Mandrill implements INodeType {
 				displayOptions: {
 					show: {
 						jsonParameters: [
-							true
-						]
-					}
+							true,
+						],
+					},
 				},
 				typeOptions: {
 					alwaysOpenEditWindow: true,
@@ -692,7 +692,7 @@ export class Mandrill implements INodeType {
 								description: '',
 							},
 						],
-					}
+					},
 				],
 				description: 'Optional extra headers to add to the message (most headers are allowed).',
 			},
@@ -722,7 +722,7 @@ export class Mandrill implements INodeType {
 				}
 
 				return returnData;
-			}
+			},
 		},
 	};
 
@@ -816,9 +816,9 @@ export class Mandrill implements INodeType {
 					const metadataUi = this.getNodeParameter('metadataUi', i) as IDataObject;
 					if (!_.isEmpty(metadataUi)) {
 						// @ts-ignore
-						body.message.metadata = _.map(metadataUi.metadataValues, (o) => {
+						body.message.metadata = _.map(metadataUi.metadataValues, (o: IDataObject) => {
 							const aux: IDataObject = {};
-							aux[o.name] = o.value;
+							aux[o.name as string] = o.value;
 							return aux;
 						});
 					}
@@ -826,7 +826,7 @@ export class Mandrill implements INodeType {
 					const mergeVarsUi = this.getNodeParameter('mergeVarsUi', i) as IDataObject;
 					if (!_.isEmpty(mergeVarsUi)) {
 						// @ts-ignore
-						body.message.global_merge_vars = _.map(mergeVarsUi.mergeVarsValues, (o) => {
+						body.message.global_merge_vars = _.map(mergeVarsUi.mergeVarsValues, (o: IDataObject) => {
 							const aux: IDataObject = {};
 							aux.name = o.name;
 							aux.content = o.content;
@@ -835,13 +835,13 @@ export class Mandrill implements INodeType {
 					}
 
 					const attachmentsUi = this.getNodeParameter('attachmentsUi', i) as IDataObject;
-					let attachmentsBinary = [], attachmentsValues = [];
+					let attachmentsBinary: Attachments[] = [], attachmentsValues: Attachments[] = [];
 					if (!_.isEmpty(attachmentsUi)) {
 
 						if (attachmentsUi.hasOwnProperty('attachmentsValues')
 							&& !_.isEmpty(attachmentsUi.attachmentsValues)) {
 							// @ts-ignore
-							attachmentsValues = _.map(attachmentsUi.attachmentsValues, (o) => {
+							attachmentsValues = _.map(attachmentsUi.attachmentsValues, (o: IDataObject) => {
 								const aux: IDataObject = {};
 								// @ts-ignore
 								aux.name = o.name;
@@ -855,12 +855,12 @@ export class Mandrill implements INodeType {
 							&& !_.isEmpty(attachmentsUi.attachmentsBinary)
 							&& items[i].binary) {
 							// @ts-ignore
-							attachmentsBinary = _.map(attachmentsUi.attachmentsBinary, (o) => {
-								if (items[i].binary!.hasOwnProperty(o.property)) {
+							attachmentsBinary = _.map(attachmentsUi.attachmentsBinary, (o: IDataObject) => {
+								if (items[i].binary!.hasOwnProperty(o.property as string)) {
 									const aux: IDataObject = {};
-									aux.name = items[i].binary![o.property].fileName || 'unknown';
-									aux.content = items[i].binary![o.property].data;
-									aux.type = items[i].binary![o.property].mimeType;
+									aux.name = items[i].binary![o.property as string].fileName || 'unknown';
+									aux.content = items[i].binary![o.property as string].data;
+									aux.type = items[i].binary![o.property as string].mimeType;
 									return aux;
 								}
 							});
diff --git a/packages/nodes-base/nodes/Matrix/AccountDescription.ts b/packages/nodes-base/nodes/Matrix/AccountDescription.ts
new file mode 100644
index 000000000..893b11194
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/AccountDescription.ts
@@ -0,0 +1,27 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const accountOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Me',
+				value: 'me',
+				description: "Get current user's account information",
+			},
+		],
+		default: 'me',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Matrix/EventDescription.ts b/packages/nodes-base/nodes/Matrix/EventDescription.ts
new file mode 100644
index 000000000..81324a32b
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/EventDescription.ts
@@ -0,0 +1,73 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const eventOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'event',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get single event by ID',
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+
+export const eventFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 event:get                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Room ID',
+		name: 'roomId',
+		type: 'string',
+		default: '',
+		placeholder: '!123abc:matrix.org',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'event',
+				],
+			},
+		},
+		required: true,
+		description: 'The room related to the event',
+	},
+	{
+		displayName: 'Event ID',
+		name: 'eventId',
+		type: 'string',
+		default: '',
+		placeholder: '$1234abcd:matrix.org',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'event',
+				],
+			},
+		},
+		required: true,
+		description: 'The room related to the event',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
new file mode 100644
index 000000000..d52eb6350
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -0,0 +1,239 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import { IDataObject } from 'n8n-workflow';
+
+import {
+	BINARY_ENCODING,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import * as _ from 'lodash';
+import * as uuid from 'uuid/v4';
+
+
+interface MessageResponse {
+	chunk: Message[];
+}
+
+interface Message {
+	content: object;
+	room_id: string;
+	sender: string;
+	type: string;
+	user_id: string;
+
+}
+
+export async function matrixApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: string | object = {}, query: object = {}, headers: {} | undefined = undefined, option: {} = {}): Promise<any> { // tslint:disable-line:no-any
+	let options: OptionsWithUri = {
+		method,
+		headers: headers || {
+			'Content-Type': 'application/json; charset=utf-8',
+		},
+		body,
+		qs: query,
+		uri: '',
+		json: true,
+	};
+	options = Object.assign({}, options, option);
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
+	if (Object.keys(query).length === 0) {
+		delete options.qs;
+	}
+	try {
+
+		let response: any; // tslint:disable-line:no-any
+
+		const credentials = this.getCredentials('matrixApi');
+		if (credentials === undefined) {
+			throw new Error('No credentials got returned!');
+		}
+		//@ts-ignore
+		options.uri = `${credentials.homeserverUrl}/_matrix/${option.overridePrefix || 'client'}/r0${resource}`;
+		options.headers!.Authorization = `Bearer ${credentials.accessToken}`;
+		//@ts-ignore
+		response = await this.helpers.request(options);
+
+		// When working with images, the request cannot be JSON (it's raw binary data)
+		// But the output is JSON so we have to parse it manually.
+		//@ts-ignore
+		return options.overridePrefix === 'media' ? JSON.parse(response) : response;
+	} catch (error) {
+		if (error.statusCode === 401) {
+			// Return a clear error
+			throw new Error('Matrix credentials are not valid!');
+		}
+
+		if (error.response && error.response.body && error.response.body.error) {
+			// Try to return the error prettier
+			throw new Error(`Matrix error response [${error.statusCode}]: ${error.response.body.error}`);
+		}
+
+		// If that data does not exist for some reason return the actual error
+		throw error;
+	}
+}
+
+export async function handleMatrixCall(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, item: IDataObject, index: number, resource: string, operation: string): Promise<any> { // tslint:disable-line:no-any
+
+	if (resource === 'account') {
+		if (operation === 'me') {
+			return await matrixApiRequest.call(this, 'GET', '/account/whoami');
+		}
+	}
+	else if (resource === 'room') {
+		if (operation === 'create') {
+			const name = this.getNodeParameter('roomName', index) as string;
+			const preset = this.getNodeParameter('preset', index) as string;
+			const roomAlias = this.getNodeParameter('roomAlias', index) as string;
+			const body: IDataObject = {
+				name,
+				preset,
+			};
+			if (roomAlias) {
+				body.room_alias_name = roomAlias;
+			}
+			return await matrixApiRequest.call(this, 'POST', `/createRoom`, body);
+		} else if (operation === 'join') {
+			const roomIdOrAlias = this.getNodeParameter('roomIdOrAlias', index) as string;
+			return await matrixApiRequest.call(this, 'POST', `/rooms/${roomIdOrAlias}/join`);
+		} else if (operation === 'leave') {
+			const roomId = this.getNodeParameter('roomId', index) as string;
+			return await matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/leave`);
+		} else if (operation === 'invite') {
+			const roomId = this.getNodeParameter('roomId', index) as string;
+			const userId = this.getNodeParameter('userId', index) as string;
+			const body: IDataObject = {
+				user_id: userId,
+			};
+			return await matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/invite`, body);
+		} else if (operation === 'kick') {
+			const roomId = this.getNodeParameter('roomId', index) as string;
+			const userId = this.getNodeParameter('userId', index) as string;
+			const reason = this.getNodeParameter('reason', index) as string;
+			const body: IDataObject = {
+				user_id: userId,
+				reason,
+			};
+			return await matrixApiRequest.call(this, 'POST', `/rooms/${roomId}/kick`, body);
+		}
+	} else if (resource === 'message') {
+		if (operation === 'create') {
+			const roomId = this.getNodeParameter('roomId', index) as string;
+			const text = this.getNodeParameter('text', index) as string;
+			const body: IDataObject = {
+				msgtype: 'm.text',
+				body: text,
+			};
+			const messageId = uuid();
+			return await matrixApiRequest.call(this, 'PUT', `/rooms/${roomId}/send/m.room.message/${messageId}`, body);
+		} else if (operation === 'getAll') {
+			const roomId = this.getNodeParameter('roomId', index) as string;
+			const returnAll = this.getNodeParameter('returnAll', index) as boolean;
+			const otherOptions = this.getNodeParameter('otherOptions', index) as IDataObject;
+			const returnData: IDataObject[] = [];
+
+			if (returnAll) {
+				let responseData;
+				let from;
+				do {
+					const qs: IDataObject = {
+						dir: 'b', // Get latest messages first - doesn't return anything if we use f without a previous token.
+						from,
+					};
+
+					if (otherOptions.filter) {
+						qs.filter = otherOptions.filter;
+					}
+
+					responseData = await matrixApiRequest.call(this, 'GET', `/rooms/${roomId}/messages`, {}, qs);
+					returnData.push.apply(returnData, responseData.chunk);
+					from = responseData.end;
+				} while (responseData.chunk.length > 0);
+			} else {
+				const limit = this.getNodeParameter('limit', index) as number;
+				const qs: IDataObject = {
+					dir: 'b', // Get latest messages first - doesn't return anything if we use f without a previous token.
+					limit,
+				};
+
+				if (otherOptions.filter) {
+					qs.filter = otherOptions.filter;
+				}
+
+				const responseData = await matrixApiRequest.call(this, 'GET', `/rooms/${roomId}/messages`, {}, qs);
+				returnData.push.apply(returnData, responseData.chunk);
+			}
+
+			return returnData;
+		}
+	} else if (resource === 'event') {
+		if (operation === 'get') {
+			const roomId = this.getNodeParameter('roomId', index) as string;
+			const eventId = this.getNodeParameter('eventId', index) as string;
+			return await matrixApiRequest.call(this, 'GET', `/rooms/${roomId}/event/${eventId}`);
+		}
+	} else if (resource === 'media') {
+		if (operation === 'upload') {
+			const roomId = this.getNodeParameter('roomId', index) as string;
+			const mediaType = this.getNodeParameter('mediaType', index) as string;
+			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', index) as string;
+
+			let body;
+			const qs: IDataObject = {};
+			const headers: IDataObject = {};
+			let filename;
+
+			if (item.binary === undefined
+				//@ts-ignore
+				|| item.binary[binaryPropertyName] === undefined) {
+				throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+			}
+
+			//@ts-ignore
+			qs.filename = item.binary[binaryPropertyName].fileName;
+			//@ts-ignore
+			filename = item.binary[binaryPropertyName].fileName;
+
+			//@ts-ignore
+			body = Buffer.from(item.binary[binaryPropertyName].data, BINARY_ENCODING);
+			//@ts-ignore
+			headers['Content-Type'] = item.binary[binaryPropertyName].mimeType;
+			headers['accept'] = 'application/json,text/*;q=0.99';
+
+			const uploadRequestResult = await matrixApiRequest.call(this, 'POST', `/upload`, body, qs, headers, {
+				overridePrefix: 'media',
+				json: false,
+			});
+
+			body = {
+				msgtype: `m.${mediaType}`,
+				body: filename,
+				url: uploadRequestResult.content_uri,
+			};
+			const messageId = uuid();
+			return await matrixApiRequest.call(this, 'PUT', `/rooms/${roomId}/send/m.room.message/${messageId}`, body);
+
+		}
+	} else if (resource === 'roomMember') {
+		if (operation === 'getAll') {
+			const roomId = this.getNodeParameter('roomId', index) as string;
+			const filters = this.getNodeParameter('filters', index) as IDataObject;
+			const qs: IDataObject = {
+				membership: filters.membership ? filters.membership : '',
+				not_membership: filters.notMembership ? filters.notMembership : '',
+			};
+			const roomMembersResponse = await matrixApiRequest.call(this, 'GET', `/rooms/${roomId}/members`, {}, qs);
+			return roomMembersResponse.chunk;
+		}
+	}
+
+
+	throw new Error('Not implemented yet');
+}
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
new file mode 100644
index 000000000..5109adc2e
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -0,0 +1,172 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	handleMatrixCall,
+	matrixApiRequest,
+} from './GenericFunctions';
+
+import {
+	accountOperations
+} from './AccountDescription';
+
+import {
+	eventFields,
+	eventOperations,
+} from './EventDescription';
+
+import {
+	mediaFields,
+	mediaOperations,
+} from './MediaDescription';
+
+import {
+	messageFields,
+	messageOperations,
+} from './MessageDescription';
+
+import {
+	roomFields,
+	roomOperations,
+} from './RoomDescription';
+
+import {
+	roomMemberFields,
+	roomMemberOperations,
+} from './RoomMemberDescription';
+
+export class Matrix implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Matrix',
+		name: 'matrix',
+		icon: 'file:matrix.png',
+		group: ['output'],
+		version: 1,
+		description: 'Consume Matrix API',
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		defaults: {
+			name: 'Matrix',
+			color: '#772244',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'matrixApi',
+				required: true,
+			},
+		],
+		properties: [
+
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Account',
+						value: 'account',
+					},
+					{
+						name: 'Event',
+						value: 'event',
+					},
+					{
+						name: 'Media',
+						value: 'media',
+					},
+					{
+						name: 'Message',
+						value: 'message',
+					},
+					{
+						name: 'Room',
+						value: 'room',
+					},
+					{
+						name: 'Room Member',
+						value: 'roomMember',
+					},
+				],
+				default: 'message',
+				description: 'The resource to operate on.',
+			},
+			...accountOperations,
+			...eventOperations,
+			...eventFields,
+			...mediaOperations,
+			...mediaFields,
+			...messageOperations,
+			...messageFields,
+			...roomOperations,
+			...roomFields,
+			...roomMemberOperations,
+			...roomMemberFields,
+		],
+	};
+
+
+	methods = {
+		loadOptions: {
+			async getChannels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const joinedRoomsResponse = await matrixApiRequest.call(this, 'GET', '/joined_rooms');
+
+				await Promise.all(joinedRoomsResponse.joined_rooms.map(async (roomId: string) => {
+					try {
+						const roomNameResponse = await matrixApiRequest.call(this, 'GET', `/rooms/${roomId}/state/m.room.name`);
+						returnData.push({
+							name: roomNameResponse.name,
+							value: roomId,
+						});
+					} catch (e) {
+						// TODO: Check, there is probably another way to get the name of this private-chats
+						returnData.push({
+							name: `Unknown: ${roomId}`,
+							value: roomId,
+						});
+					}
+				}));
+
+				returnData.sort((a, b) => {
+					if (a.name < b.name) { return -1; }
+					if (a.name > b.name) { return 1; }
+					return 0;
+				});
+
+				return returnData;
+			},
+		},
+	};
+
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+
+		const items = this.getInputData() as IDataObject[];
+		const returnData: IDataObject[] = [];
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		for (let i = 0; i < items.length; i++) {
+			const responseData = await handleMatrixCall.call(this, items[i], i, resource, operation);
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+			} else {
+				returnData.push(responseData as IDataObject);
+			}
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Matrix/MediaDescription.ts b/packages/nodes-base/nodes/Matrix/MediaDescription.ts
new file mode 100644
index 000000000..aa236484d
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/MediaDescription.ts
@@ -0,0 +1,103 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const mediaOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'media',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Upload',
+				value: 'upload',
+				description: 'Send media to a chat room',
+			},
+		],
+		default: 'upload',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const mediaFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                               media:upload                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Room ID',
+		name: 'roomId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'media',
+				],
+				operation: [
+					'upload',
+				],
+			},
+		},
+		description: 'Room ID to post ',
+		required: true,
+	},
+	{
+		displayName: 'Binary Property',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'media',
+				],
+				operation: [
+					'upload',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Media type',
+		name: 'mediaType',
+		type: 'options',
+		default: 'image',
+		displayOptions: {
+			show: {
+				resource: [
+					'media',
+				],
+				operation: [
+					'upload',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'File',
+				value: 'file',
+				description: 'General file',
+			},
+			{
+				name: 'Image',
+				value: 'image',
+				description: 'Image media type',
+			},
+		],
+		description: 'Name of the uploaded file',
+		placeholder: 'mxc://matrix.org/uploaded-media-uri',
+		required: true,
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Matrix/MessageDescription.ts b/packages/nodes-base/nodes/Matrix/MessageDescription.ts
new file mode 100644
index 000000000..63ab4a2bc
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/MessageDescription.ts
@@ -0,0 +1,180 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const messageOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'message',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Send a message to a room',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Gets all messages from a room',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const messageFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                              message:create                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Room ID',
+		name: 'roomId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+		},
+		default: '',
+		placeholder: '!123abc:matrix.org',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'message',
+				],
+			},
+		},
+		required: true,
+		description: 'The channel to send the message to.',
+	},
+	{
+		displayName: 'Text',
+		name: 'text',
+		type: 'string',
+		typeOptions: {
+			alwaysOpenEditWindow: true,
+		},
+		default: '',
+		placeholder: 'Hello from n8n!',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'message',
+				],
+			},
+		},
+		description: 'The text to send.',
+	},
+
+
+	/* ----------------------------------------------------------------------- */
+	/*                                message:getAll                          */
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'Room ID',
+		name: 'roomId',
+		type: 'options',
+		default: '',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'message',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		description: 'The token to start returning events from. This token can be obtained from a prev_batch token returned for each room by the sync API',
+		required: true,
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				resource: [
+					'message',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		description: 'If all results should be returned or only up to a given limit.',
+		required: true,
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'message',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Other Options',
+		name: 'otherOptions',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: [
+					'message',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		description: 'Other options',
+		placeholder: 'Add options',
+		options: [
+			{
+				displayName: 'Filter',
+				name: 'filter',
+				type: 'string',
+				default: '',
+				description: 'A JSON RoomEventFilter to filter returned events with. More information can be found on this <a href="https://matrix.org/docs/spec/client_server/r0.6.0" target="_blank">page</a>.',
+				placeholder: '{"contains_url":true,"types":["m.room.message", "m.sticker"]}',
+			},
+		],
+	},
+
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Matrix/RoomDescription.ts b/packages/nodes-base/nodes/Matrix/RoomDescription.ts
new file mode 100644
index 000000000..8f07d4ff0
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/RoomDescription.ts
@@ -0,0 +1,277 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const roomOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'New chat room with defined settings',
+			},
+			{
+				name: 'Invite',
+				value: 'invite',
+				description: 'Invite a user to a room',
+			},
+			{
+				name: 'Join',
+				value: 'join',
+				description: 'Join a new room',
+			},
+			{
+				name: 'Kick',
+				value: 'kick',
+				description: 'Kick a user from a room',
+			},
+			{
+				name: 'Leave',
+				value: 'leave',
+				description: 'Leave a room',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+
+export const roomFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                room:create                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Room Name',
+		name: 'roomName',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'My new room',
+		description: 'The operation to perform.',
+		required: true,
+	},
+	{
+		displayName: 'Preset',
+		name: 'preset',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Private Chat',
+				value: 'private_chat',
+				description: 'Private chat',
+			},
+			{
+				name: 'Public Chat',
+				value: 'public_chat',
+				description: 'Open and public chat',
+			},
+		],
+		default: 'public_chat',
+		placeholder: 'My new room',
+		description: 'The operation to perform.',
+		required: true,
+	},
+	{
+		displayName: 'Room Alias',
+		name: 'roomAlias',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'coolest-room-around',
+		description: 'The operation to perform.',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                  room:join                                 */
+	/* -------------------------------------------------------------------------- */
+
+	{
+		displayName: 'Room ID or Alias',
+		name: 'roomIdOrAlias',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'join',
+				],
+			},
+		},
+		default: '',
+		description: 'Room ID or alias',
+		required: true,
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  room:leave                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Room ID',
+		name: 'roomId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'leave',
+				],
+			},
+		},
+		default: '',
+		description: 'Room ID',
+		required: true,
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 room:invite                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Room ID',
+		name: 'roomId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'invite',
+				],
+			},
+		},
+		default: '',
+		description: 'Room ID',
+		required: true,
+	},
+
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'invite',
+				],
+			},
+		},
+		default: '',
+		description: 'The fully qualified user ID of the invitee.',
+		placeholder: '@cheeky_monkey:matrix.org',
+		required: true,
+	},
+
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  room:kick                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Room ID',
+		name: 'roomId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'kick',
+				],
+			},
+		},
+		default: '',
+		description: 'Room ID',
+		required: true,
+	},
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'kick',
+				],
+			},
+		},
+		default: '',
+		description: 'The fully qualified user ID.',
+		placeholder: '@cheeky_monkey:matrix.org',
+		required: true,
+	},
+	{
+		displayName: 'Reason',
+		name: 'reason',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'room',
+				],
+				operation: [
+					'kick',
+				],
+			},
+		},
+		default: '',
+		description: 'Reason for kick',
+		placeholder: 'Telling unfunny jokes',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Matrix/RoomMemberDescription.ts b/packages/nodes-base/nodes/Matrix/RoomMemberDescription.ts
new file mode 100644
index 000000000..a72980e48
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/RoomMemberDescription.ts
@@ -0,0 +1,145 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const roomMemberOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'roomMember',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all members',
+			},
+		],
+		default: 'getAll',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+
+export const roomMemberFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                             roomMember:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Room ID',
+		name: 'roomId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'roomMember',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: '',
+		description: 'Room ID',
+		required: true,
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: [
+					'roomMember',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		description: 'Filtering options',
+		placeholder: 'Add filter',
+		options: [
+			{
+				displayName: 'Exclude membership',
+				name: 'notMembership',
+				type: 'options',
+				default: '',
+				description: 'Excludes members whose membership is other than selected (uses OR filter with membership)',
+				options: [
+					{
+						name: 'Any',
+						value: '',
+						description: 'Any user membership',
+					},
+					{
+						name: 'Ban',
+						value: 'ban',
+						description: 'Users removed from the room',
+					},
+					{
+						name: 'Invite',
+						value: 'invite',
+						description: 'Users invited to join',
+					},
+					{
+						name: 'Join',
+						value: 'join',
+						description: 'Users currently in the room',
+					},
+					{
+						name: 'Leave',
+						value: 'leave',
+						description: 'Users who left',
+					},
+				],
+			},
+			{
+				displayName: 'Membership',
+				name: 'membership',
+				type: 'options',
+				default: '',
+				description: 'Only fetch users with selected membership status (uses OR filter with exclude membership)',
+				options: [
+					{
+						name: 'Any',
+						value: '',
+						description: 'Any user membership',
+					},
+					{
+						name: 'Ban',
+						value: 'ban',
+						description: 'Users removed from the room',
+					},
+					{
+						name: 'Invite',
+						value: 'invite',
+						description: 'Users invited to join',
+					},
+					{
+						name: 'Join',
+						value: 'join',
+						description: 'Users currently in the room',
+					},
+					{
+						name: 'Leave',
+						value: 'leave',
+						description: 'Users who left',
+					},
+				],
+			},
+		],
+	},
+
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Matrix/matrix.png b/packages/nodes-base/nodes/Matrix/matrix.png
new file mode 100644
index 000000000..d90f36395
Binary files /dev/null and b/packages/nodes-base/nodes/Matrix/matrix.png differ
diff --git a/packages/nodes-base/nodes/Mattermost/GenericFunctions.ts b/packages/nodes-base/nodes/Mattermost/GenericFunctions.ts
index f34754bf7..735024e38 100644
--- a/packages/nodes-base/nodes/Mattermost/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mattermost/GenericFunctions.ts
@@ -6,13 +6,13 @@ import {
 
 import {
 	OptionsWithUri,
- } from 'request';
+} from 'request';
 
 import {
 	IDataObject,
- } from 'n8n-workflow';
+} from 'n8n-workflow';
 
-export interface IAttachment  {
+export interface IAttachment {
 	fields: {
 		item?: object[];
 	};
@@ -46,9 +46,9 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 		uri: `${credentials.baseUrl}/api/v4/${endpoint}`,
 		headers: {
 			Authorization: `Bearer ${credentials.accessToken}`,
-			'content-type': 'application/json; charset=utf-8'
+			'content-type': 'application/json; charset=utf-8',
 		},
-		json: true
+		json: true,
 	};
 
 	try {
diff --git a/packages/nodes-base/nodes/Mattermost/Mattermost.node.ts b/packages/nodes-base/nodes/Mattermost/Mattermost.node.ts
index cc7bc65ee..e6ff3b86b 100644
--- a/packages/nodes-base/nodes/Mattermost/Mattermost.node.ts
+++ b/packages/nodes-base/nodes/Mattermost/Mattermost.node.ts
@@ -1,14 +1,14 @@
 import {
 	IExecuteFunctions,
- } from 'n8n-core';
+} from 'n8n-core';
 
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
-	INodeTypeDescription,
-	INodePropertyOptions,
 	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -40,7 +40,7 @@ export class Mattermost implements INodeType {
 			{
 				name: 'mattermostApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -165,7 +165,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'channel',
@@ -183,7 +183,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'channel',
@@ -202,7 +202,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'channel',
@@ -219,7 +219,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'channel',
@@ -257,7 +257,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'delete'
+							'delete',
 						],
 						resource: [
 							'channel',
@@ -388,7 +388,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'restore'
+							'restore',
 						],
 						resource: [
 							'channel',
@@ -415,7 +415,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'addUser'
+							'addUser',
 						],
 						resource: [
 							'channel',
@@ -437,7 +437,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'addUser'
+							'addUser',
 						],
 						resource: [
 							'channel',
@@ -464,7 +464,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'statistics'
+							'statistics',
 						],
 						resource: [
 							'channel',
@@ -516,7 +516,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'post'
+							'post',
 						],
 						resource: [
 							'message',
@@ -536,7 +536,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'post'
+							'post',
 						],
 						resource: [
 							'message',
@@ -556,7 +556,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'post'
+							'post',
 						],
 						resource: [
 							'message',
@@ -606,7 +606,7 @@ export class Mattermost implements INodeType {
 										displayOptions: {
 											show: {
 												type: [
-													'select'
+													'select',
 												],
 											},
 										},
@@ -640,10 +640,10 @@ export class Mattermost implements INodeType {
 										displayOptions: {
 											show: {
 												data_source: [
-													'custom'
+													'custom',
 												],
 												type: [
-													'select'
+													'select',
 												],
 											},
 										},
@@ -668,7 +668,7 @@ export class Mattermost implements INodeType {
 														default: '',
 														description: 'Value of the option.',
 													},
-												]
+												],
 											},
 										],
 									},
@@ -732,15 +732,15 @@ export class Mattermost implements INodeType {
 																		default: '',
 																		description: 'Value of the property to set.',
 																	},
-																]
+																],
 															},
 														],
 													},
-												]
+												],
 											},
 										],
 									},
-								]
+								],
 							},
 						],
 					},
@@ -824,7 +824,7 @@ export class Mattermost implements INodeType {
 										default: true,
 										description: 'If items can be displayed next to each other.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -917,7 +917,7 @@ export class Mattermost implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'post'
+							'post',
 						],
 						resource: [
 							'message',
@@ -952,6 +952,11 @@ export class Mattermost implements INodeType {
 					},
 				},
 				options: [
+					{
+						name: 'Create',
+						value: 'create',
+						description: 'Create a new user',
+					},
 					{
 						name: 'Deactive',
 						value: 'deactive',
@@ -972,10 +977,283 @@ export class Mattermost implements INodeType {
 						value: 'getById',
 						description: 'Get a user by id',
 					},
+					{
+						name: 'Invite',
+						value: 'invite',
+						description: 'Invite user to team',
+					},
 				],
 				default: '',
 				description: 'The operation to perform.',
 			},
+			// ----------------------------------
+			//         user:create
+			// ----------------------------------
+			{
+				displayName: 'Username',
+				name: 'username',
+				type: 'string',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'create',
+						],
+					},
+				},
+				default: '',
+			},
+			{
+				displayName: 'Auth Service',
+				name: 'authService',
+				type: 'options',
+				options: [
+					{
+						name: 'Email',
+						value: 'email',
+					},
+					{
+						name: 'Gitlab',
+						value: 'gitlab',
+					},
+					{
+						name: 'Google',
+						value: 'google',
+					},
+					{
+						name: 'LDAP',
+						value: 'ldap',
+					},
+					{
+						name: 'Office365',
+						value: 'office365',
+					},
+					{
+						name: 'SAML',
+						value: 'saml',
+					},
+				],
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'create',
+						],
+					},
+				},
+				default: '',
+			},
+			{
+				displayName: 'Auth Data',
+				name: 'authData',
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'create',
+						],
+					},
+					hide: {
+						authService: [
+							'email',
+						],
+					},
+				},
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'create',
+						],
+						authService: [
+							'email',
+						],
+					},
+				},
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				type: 'string',
+				typeOptions: {
+					password: true,
+				},
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'create',
+						],
+						authService: [
+							'email',
+						],
+					},
+				},
+				default: '',
+				description: 'The password used for email authentication.',
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				displayOptions: {
+					show: {
+						operation: [
+							'create',
+						],
+						resource: [
+							'user',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'First Name',
+						name: 'first_name',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Last Name',
+						name: 'last_name',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Locale',
+						name: 'locale',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Nickname',
+						name: 'nickname',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Notification Settings',
+						name: 'notificationUi',
+						type: 'fixedCollection',
+						placeholder: 'Add Notification Setting',
+						default: {},
+						typeOptions: {
+							multipleValues: false,
+						},
+						options: [
+							{
+								displayName: 'Notify',
+								name: 'notificationValues',
+								values: [
+									{
+										displayName: 'Channel',
+										name: 'channel',
+										type: 'boolean',
+										default: true,
+										description: `Set to "true" to enable channel-wide notifications (@channel, @all, etc.), "false" to disable. Defaults to "true".`,
+									},
+									{
+										displayName: 'Desktop',
+										name: 'desktop',
+										type: 'options',
+										options: [
+											{
+												name: 'All',
+												value: 'all',
+												description: 'Notifications for all activity',
+											},
+											{
+												name: 'Mention',
+												value: 'mention',
+												description: 'Mentions and direct messages only',
+											},
+											{
+												name: 'None',
+												value: 'none',
+												description: 'Mentions and direct messages only',
+											},
+										],
+										default: 'all',
+									},
+									{
+										displayName: 'Desktop Sound',
+										name: 'desktop_sound',
+										type: 'boolean',
+										default: true,
+										description: `Set to "true" to enable sound on desktop notifications, "false" to disable. Defaults to "true".`,
+									},
+									{
+										displayName: 'Email',
+										name: 'email',
+										type: 'boolean',
+										default: false,
+										description: `Set to "true" to enable email notifications, "false" to disable. Defaults to "true".`,
+									},
+									{
+										displayName: 'First Name',
+										name: 'first_name',
+										type: 'boolean',
+										default: false,
+										description: `Set to "true" to enable mentions for first name. Defaults to "true" if a first name is set, "false" otherwise.`,
+									},
+									{
+										displayName: 'Mention Keys',
+										name: 'mention_keys',
+										type: 'string',
+										default: '',
+										description: `A comma-separated list of words to count as mentions. Defaults to username and @username.`,
+									},
+									{
+										displayName: 'Push',
+										name: 'push',
+										type: 'options',
+										options: [
+											{
+												name: 'All',
+												value: 'all',
+												description: 'Notifications for all activity',
+											},
+											{
+												name: 'Mention',
+												value: 'mention',
+												description: 'Mentions and direct messages only',
+											},
+											{
+												name: 'None',
+												value: 'none',
+												description: 'Mentions and direct messages only',
+											},
+										],
+										default: 'mention',
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+
 			// ----------------------------------
 			//         user:deactivate
 			// ----------------------------------
@@ -995,7 +1273,49 @@ export class Mattermost implements INodeType {
 					},
 				},
 				default: '',
-				description: 'User GUID'
+				description: 'User GUID',
+			},
+
+			// ----------------------------------
+			//         user:invite
+			// ----------------------------------
+			{
+				displayName: 'Team ID',
+				name: 'teamId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getTeams',
+				},
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'invite',
+						],
+					},
+				},
+				default: '',
+			},
+			{
+				displayName: 'Emails',
+				name: 'emails',
+				type: 'string',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'invite',
+						],
+					},
+				},
+				default: '',
+				description: `User's email. Multiple can be set separated by comma.`,
 			},
 
 			// ----------------------------------
@@ -1430,6 +1750,7 @@ export class Mattermost implements INodeType {
 								attachment.fields = attachment.fields.item;
 							} else {
 								// If it does not have any items set remove it
+								// @ts-ignore
 								delete attachment.fields;
 							}
 						}
@@ -1442,6 +1763,7 @@ export class Mattermost implements INodeType {
 								attachment.actions = attachment.actions.item;
 							} else {
 								// If it does not have any items set remove it
+								// @ts-ignore
 								delete attachment.actions;
 							}
 						}
@@ -1485,6 +1807,40 @@ export class Mattermost implements INodeType {
 					Object.assign(body, otherOptions);
 				}
 			} else if (resource === 'user') {
+
+				if (operation === 'create') {
+					// ----------------------------------
+					//          user:create
+					// ----------------------------------
+
+					const username = this.getNodeParameter('username', i) as string;
+
+					const authService = this.getNodeParameter('authService', i) as string;
+
+					body.auth_service = authService;
+
+					if (authService === 'email') {
+						body.email = this.getNodeParameter('email', i) as string;
+						body.password = this.getNodeParameter('password', i) as string;
+					} else {
+						body.auth_data = this.getNodeParameter('authData', i) as string;
+					}
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					body.username = username;
+
+					Object.assign(body, additionalFields);
+
+					if (body.notificationUi) {
+						body.notify_props = (body.notificationUi as IDataObject).notificationValues;
+					}
+
+					requestMethod = 'POST';
+
+					endpoint = 'users';
+				}
+
 				// TODO: Remove the "deactive" again in the future. In here temporary
 				//       to not break workflows for people which set the option before
 				//       typo got fixed. JO 2020-01-17
@@ -1533,27 +1889,27 @@ export class Mattermost implements INodeType {
 					};
 
 					if (additionalFields.sort) {
-						if (additionalFields.inTeam !== undefined || additionalFields.inChannel !== undefined)  {
+						if (additionalFields.inTeam !== undefined || additionalFields.inChannel !== undefined) {
 
 							if (additionalFields.inTeam !== undefined
-							&& !validRules.inTeam.includes(snakeCase(additionalFields.sort as string))) {
+								&& !validRules.inTeam.includes(snakeCase(additionalFields.sort as string))) {
 								throw new Error(`When In Team is set the only valid values for sorting are ${validRules.inTeam.join(',')}`);
 							}
 							if (additionalFields.inChannel !== undefined
-							&& !validRules.inChannel.includes(snakeCase(additionalFields.sort as string))) {
-									throw new Error(`When In Channel is set the only valid values for sorting are ${validRules.inChannel.join(',')}`);
+								&& !validRules.inChannel.includes(snakeCase(additionalFields.sort as string))) {
+								throw new Error(`When In Channel is set the only valid values for sorting are ${validRules.inChannel.join(',')}`);
 							}
 							if (additionalFields.inChannel !== undefined
-							&& additionalFields.inChannel === ''
-							&& additionalFields.sort !== 'username') {
+								&& additionalFields.inChannel === ''
+								&& additionalFields.sort !== 'username') {
 								throw new Error('When sort is different than username In Channel must be set');
 							}
 
 							if (additionalFields.inTeam !== undefined
 								&& additionalFields.inTeam === ''
 								&& additionalFields.sort !== 'username') {
-									throw new Error('When sort is different than username In Team must be set');
-								}
+								throw new Error('When sort is different than username In Team must be set');
+							}
 
 						} else {
 							throw new Error(`When sort is defined either 'in team' or 'in channel' must be defined`);
@@ -1599,6 +1955,22 @@ export class Mattermost implements INodeType {
 					body = userIds;
 
 				}
+
+				if (operation === 'invite') {
+					// ----------------------------------
+					//          user:invite
+					// ----------------------------------
+					const teamId = this.getNodeParameter('teamId', i) as string;
+
+					const emails = (this.getNodeParameter('emails', i) as string).split(',');
+
+					//@ts-ignore
+					body = emails;
+
+					requestMethod = 'POST';
+
+					endpoint = `teams/${teamId}/invite/email`;
+				}
 			}
 			else {
 				throw new Error(`The resource "${resource}" is not known!`);
@@ -1617,7 +1989,7 @@ export class Mattermost implements INodeType {
 							userIds.push(data.user_id);
 						}
 						if (userIds.length > 0) {
-							responseData = await apiRequest.call(this, 'POST', 'users/ids', userIds , qs);
+							responseData = await apiRequest.call(this, 'POST', 'users/ids', userIds, qs);
 						}
 					}
 				}
diff --git a/packages/nodes-base/nodes/Mautic/CompanyDescription.ts b/packages/nodes-base/nodes/Mautic/CompanyDescription.ts
new file mode 100644
index 000000000..4a8ed4944
--- /dev/null
+++ b/packages/nodes-base/nodes/Mautic/CompanyDescription.ts
@@ -0,0 +1,387 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const companyOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new company',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a company',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get data of a company',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get data of all companies',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a company',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform',
+	},
+] as INodeProperties[];
+
+export const companyFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                company:create                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company Name',
+		name: 'name',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: 'The name of the company to create.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Is Published',
+				name: 'isPublished',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Overwrite With Blank',
+				name: 'overwriteWithBlank',
+				type: 'boolean',
+				default: false,
+				description: 'If true, then empty values are set to fields. Otherwise empty values are skipped',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                               company:update                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company ID',
+		name: 'companyId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'company',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the company to update.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Company Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'Company name',
+			},
+			{
+				displayName: 'Is Published',
+				name: 'isPublished',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Overwrite With Blank',
+				name: 'overwriteWithBlank',
+				type: 'boolean',
+				default: false,
+				description: 'If true, then empty values are set to fields. Otherwise empty values are skipped',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 company:get                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company ID',
+		name: 'companyId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'company',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the company to return.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                company:getAll                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				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: [
+					'company',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 30,
+		},
+		default: 30,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Order Direction',
+				name: 'orderByDir',
+				type: 'options',
+				options: [
+					{
+						name: 'ASC',
+						value: 'asc',
+					},
+					{
+						name: 'DESC',
+						value: 'desc',
+					},
+				],
+				default: '',
+				description: 'Sort direction: asc or desc.',
+			},
+			{
+				displayName: 'Order By',
+				name: 'orderBy',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanyFields',
+				},
+				default: '',
+				description: 'Column to sort by. Can use any column listed in the response.',
+			},
+			{
+				displayName: 'Search',
+				name: 'isPublished',
+				type: 'boolean',
+				default: '',
+				description: 'String or search command to filter entities by.',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                               company:delete                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Company ID',
+		name: 'companyId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'company',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the company to delete.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Mautic/ContactCompanyDescription.ts b/packages/nodes-base/nodes/Mautic/ContactCompanyDescription.ts
new file mode 100644
index 000000000..6aabd5bc9
--- /dev/null
+++ b/packages/nodes-base/nodes/Mautic/ContactCompanyDescription.ts
@@ -0,0 +1,75 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const contactCompanyOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'contactCompany',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add contact to a company',
+			},
+			{
+				name: 'Remove',
+				value: 'remove',
+				description: 'Remove a contact from a company',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const contactCompanyFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                contactCompany:add                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'contactCompany',
+				],
+				operation: [
+					'add',
+					'remove',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the contact.',
+	},
+	{
+		displayName: 'Company ID',
+		name: 'companyId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'contactCompany',
+				],
+				operation: [
+					'add',
+					'remove',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the company.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Mautic/ContactDescription.ts b/packages/nodes-base/nodes/Mautic/ContactDescription.ts
index 1ea81acbc..94888e162 100644
--- a/packages/nodes-base/nodes/Mautic/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Mautic/ContactDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import {
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const contactOperations = [
 	{
@@ -19,9 +21,9 @@ export const contactOperations = [
 				description: 'Create a new contact',
 			},
 			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a contact',
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a contact',
 			},
 			{
 				name: 'Get',
@@ -34,9 +36,9 @@ export const contactOperations = [
 				description: 'Get data of all contacts',
 			},
 			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a contact',
+				name: 'Update',
+				value: 'update',
+				description: 'Update a contact',
 			},
 		],
 		default: 'create',
@@ -46,9 +48,9 @@ export const contactOperations = [
 
 export const contactFields = [
 
-/* -------------------------------------------------------------------------- */
-/*                                contact:create                              */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                                contact:create                              */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'JSON Parameters',
 		name: 'jsonParameters',
@@ -80,7 +82,7 @@ export const contactFields = [
 				],
 				jsonParameters: [
 					false,
-				]
+				],
 			},
 		},
 		default: '',
@@ -100,7 +102,7 @@ export const contactFields = [
 				],
 				jsonParameters: [
 					false,
-				]
+				],
 			},
 		},
 		default: '',
@@ -450,9 +452,9 @@ export const contactFields = [
 		],
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                               contact:update                               */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                               contact:update                               */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Contact ID',
 		name: 'contactId',
@@ -955,9 +957,9 @@ export const contactFields = [
 		],
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                 contact:get                                */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:get                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Contact ID',
 		name: 'contactId',
@@ -976,9 +978,9 @@ export const contactFields = [
 		description: 'Contact ID',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                contact:getAll                              */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                                contact:getAll                              */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Return All',
 		name: 'returnAll',
@@ -1021,9 +1023,9 @@ export const contactFields = [
 		description: 'How many results to return.',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                               contact:delete                               */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                               contact:delete                               */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Contact ID',
 		name: 'contactId',
@@ -1042,9 +1044,9 @@ export const contactFields = [
 		description: 'Contact ID',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                 contact:all                                */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                                 contact:all                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -1158,11 +1160,11 @@ export const contactFields = [
 				displayName: 'RAW Data',
 				name: 'rawData',
 				type: 'boolean',
-				default: false,
+				default: true,
 				description: `By default only the data of the fields get returned. If this<br />
 							  options gets set the RAW response with all data gets returned.`,
 			},
-		]
+		],
 	},
 
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
index 986169025..9ab48b8dd 100644
--- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
@@ -1,10 +1,12 @@
-import { OptionsWithUri } from 'request';
+import {
+	OptionsWithUri,
+} from 'request';
 
 import {
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions
 } from 'n8n-core';
 
 import {
@@ -38,7 +40,7 @@ export async function mauticApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs: query,
 		uri: uri || `/api${endpoint}`,
 		body,
-		json: true
+		json: true,
 	};
 
 	try {
@@ -48,11 +50,12 @@ export async function mauticApiRequest(this: IHookFunctions | IExecuteFunctions
 		if (authenticationMethod === 'credentials') {
 			const credentials = this.getCredentials('mauticApi') as IDataObject;
 
-			const base64Key =  Buffer.from(`${credentials.username}:${credentials.password}`).toString('base64');
+			const base64Key = Buffer.from(`${credentials.username}:${credentials.password}`).toString('base64');
 
 			options.headers!.Authorization = `Basic ${base64Key}`;
 
 			options.uri = `${credentials.url}${options.uri}`;
+
 			//@ts-ignore
 			returnData = await this.helpers.request(options);
 		} else {
@@ -102,7 +105,7 @@ export async function mauticApiRequestAllItems(this: IHookFunctions | IExecuteFu
 	} while (
 		responseData.total !== undefined &&
 		((query.limit * query.start) - parseInt(responseData.total, 10)) < 0
-		);
+	);
 
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index 7bdafe760..b024e73c7 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -1,19 +1,21 @@
 import {
 	IExecuteFunctions,
 } from 'n8n-core';
+
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
+
 import {
+	getErrors,
 	mauticApiRequest,
 	mauticApiRequestAllItems,
 	validateJSON,
-	getErrors,
 } from './GenericFunctions';
 
 import {
@@ -21,9 +23,19 @@ import {
 	contactOperations,
 } from './ContactDescription';
 
+import {
+	companyFields,
+	companyOperations,
+} from './CompanyDescription';
+
+import {
+	contactCompanyFields,
+	contactCompanyOperations,
+} from './ContactCompanyDescription';
+
 import {
 	snakeCase,
- } from 'change-case';
+} from 'change-case';
 
 export class Mautic implements INodeType {
 	description: INodeTypeDescription = {
@@ -86,17 +98,31 @@ export class Mautic implements INodeType {
 				name: 'resource',
 				type: 'options',
 				options: [
+					{
+						name: 'Company',
+						value: 'company',
+						description: 'Create or modify a company',
+					},
 					{
 						name: 'Contact',
 						value: 'contact',
-						description: 'Use this endpoint to manipulate and obtain details on Mautic’s contacts.',
+						description: 'Create & modify contacts',
+					},
+					{
+						name: 'Contact <> Company',
+						value: 'contactCompany',
+						description: 'Add/ remove contacts from a company',
 					},
 				],
 				default: 'contact',
 				description: 'Resource to consume.',
 			},
+			...companyOperations,
+			...companyFields,
 			...contactOperations,
 			...contactFields,
+			...contactCompanyOperations,
+			...contactCompanyFields,
 		],
 	};
 
@@ -110,7 +136,7 @@ export class Mautic implements INodeType {
 				for (const company of companies) {
 					returnData.push({
 						name: company.fields.all.companyname,
-						value: company.id,
+						value: company.fields.all.companyname,
 					});
 				}
 				return returnData;
@@ -141,6 +167,19 @@ export class Mautic implements INodeType {
 				}
 				return returnData;
 			},
+			// Get all the available company fields to display them to user so that he can
+			// select them easily
+			async getCompanyFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const fields = await mauticApiRequestAllItems.call(this, 'fields', 'GET', '/fields/company');
+				for (const field of fields) {
+					returnData.push({
+						name: field.label,
+						value: field.alias,
+					});
+				}
+				return returnData;
+			},
 		},
 	};
 
@@ -156,11 +195,89 @@ export class Mautic implements INodeType {
 
 		for (let i = 0; i < length; i++) {
 			qs = {};
-			const options = this.getNodeParameter('options', i) as IDataObject;
+
+			if (resource === 'company') {
+				//https://developer.mautic.org/#create-company
+				if (operation === 'create') {
+					const name = this.getNodeParameter('name', i) as string;
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					const body: IDataObject = {
+						companyname: name,
+					};
+					Object.assign(body, additionalFields);
+					responseData = await mauticApiRequest.call(this, 'POST', '/companies/new', body);
+					responseData = responseData.company;
+					if (simple === true) {
+						responseData = responseData.fields.all;
+					}
+				}
+				//https://developer.mautic.org/#edit-company
+				if (operation === 'update') {
+					const companyId = this.getNodeParameter('companyId', i) as string;
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const body: IDataObject = {};
+					Object.assign(body, updateFields);
+					if (body.name) {
+						body.companyname = body.name;
+						delete body.name;
+					}
+					responseData = await mauticApiRequest.call(this, 'PATCH', `/companies/${companyId}/edit`, body);
+					responseData = responseData.company;
+					if (simple === true) {
+						responseData = responseData.fields.all;
+					}
+				}
+				//https://developer.mautic.org/#get-company
+				if (operation === 'get') {
+					const companyId = this.getNodeParameter('companyId', i) as string;
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					responseData = await mauticApiRequest.call(this, 'GET', `/companies/${companyId}`);
+					responseData = responseData.company;
+					if (simple === true) {
+						responseData = responseData.fields.all;
+					}
+				}
+				//https://developer.mautic.org/#list-contact-companies
+				if (operation === 'getAll') {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					qs = Object.assign(qs, additionalFields);
+					if (returnAll === true) {
+						responseData = await mauticApiRequestAllItems.call(this, 'companies', 'GET', '/companies', {}, qs);
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+						qs.start = 0;
+						responseData = await mauticApiRequest.call(this, 'GET', '/companies', {}, qs);
+						if (responseData.errors) {
+							throw new Error(getErrors(responseData));
+						}
+						responseData = responseData.companies;
+						responseData = Object.values(responseData);
+					}
+					if (simple === true) {
+						//@ts-ignore
+						responseData = responseData.map(item => item.fields.all);
+					}
+				}
+				//https://developer.mautic.org/#delete-company
+				if (operation === 'delete') {
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					const companyId = this.getNodeParameter('companyId', i) as string;
+					responseData = await mauticApiRequest.call(this, 'DELETE', `/companies/${companyId}/delete`);
+					responseData = responseData.company;
+					if (simple === true) {
+						responseData = responseData.fields.all;
+					}
+				}
+			}
 
 			if (resource === 'contact') {
 				//https://developer.mautic.org/?php#create-contact
 				if (operation === 'create') {
+					const options = this.getNodeParameter('options', i) as IDataObject;
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					const jsonActive = this.getNodeParameter('jsonParameters', i) as boolean;
 					let body: IDataObject = {};
@@ -243,12 +360,15 @@ export class Mautic implements INodeType {
 					if (additionalFields.website) {
 						body.website = additionalFields.website as string;
 					}
-
 					responseData = await mauticApiRequest.call(this, 'POST', '/contacts/new', body);
-					responseData = responseData.contact;
+					responseData = [responseData.contact];
+					if (options.rawData === false) {
+						responseData = responseData.map(item => item.fields.all);
+					}
 				}
 				//https://developer.mautic.org/?php#edit-contact
 				if (operation === 'update') {
+					const options = this.getNodeParameter('options', i) as IDataObject;
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 					const contactId = this.getNodeParameter('contactId', i) as string;
 					let body: IDataObject = {};
@@ -343,17 +463,25 @@ export class Mautic implements INodeType {
 						body.website = updateFields.website as string;
 					}
 					responseData = await mauticApiRequest.call(this, 'PATCH', `/contacts/${contactId}/edit`, body);
-					responseData = responseData.contact;
+					responseData = [responseData.contact];
+					if (options.rawData === false) {
+						responseData = responseData.map(item => item.fields.all);
+					}
 				}
 				//https://developer.mautic.org/?php#get-contact
 				if (operation === 'get') {
+					const options = this.getNodeParameter('options', i) as IDataObject;
 					const contactId = this.getNodeParameter('contactId', i) as string;
 					responseData = await mauticApiRequest.call(this, 'GET', `/contacts/${contactId}`);
-					responseData = responseData.contact;
+					responseData = [responseData.contact];
+					if (options.rawData === false) {
+						responseData = responseData.map(item => item.fields.all);
+					}
 				}
 				//https://developer.mautic.org/?php#list-contacts
 				if (operation === 'getAll') {
 					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const options = this.getNodeParameter('options', i) as IDataObject;
 					qs = Object.assign(qs, options);
 					if (qs.orderBy) {
 						// For some reason does camelCase get used in the returned data
@@ -374,27 +502,49 @@ export class Mautic implements INodeType {
 						responseData = responseData.contacts;
 						responseData = Object.values(responseData);
 					}
-
+					if (options.rawData === false) {
+						//@ts-ignore
+						responseData = responseData.map(item => item.fields.all);
+					}
 				}
 				//https://developer.mautic.org/?php#delete-contact
 				if (operation === 'delete') {
+					const options = this.getNodeParameter('options', i) as IDataObject;
 					const contactId = this.getNodeParameter('contactId', i) as string;
 					responseData = await mauticApiRequest.call(this, 'DELETE', `/contacts/${contactId}/delete`);
-					responseData = responseData.contact;
+					responseData = [responseData.contact];
+					if (options.rawData === false) {
+						responseData = responseData.map(item => item.fields.all);
+					}
+				}
+			}
+
+			if (resource === 'contactCompany') {
+				//https://developer.mautic.org/#add-contact-to-a-company
+				if (operation === 'add') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+					const companyId = this.getNodeParameter('companyId', i) as string;
+					responseData = await mauticApiRequest.call(this, 'POST', `/companies/${companyId}/contact/${contactId}/add`, {});
+					// responseData = responseData.company;
+					// if (simple === true) {
+					// 	responseData = responseData.fields.all;
+					// }
+				}
+				//https://developer.mautic.org/#remove-contact-from-a-company
+				if (operation === 'remove') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+					const companyId = this.getNodeParameter('companyId', i) as string;
+					responseData = await mauticApiRequest.call(this, 'POST', `/companies/${companyId}/contact/${contactId}/remove`, {});
+					// responseData = responseData.company;
+					// if (simple === true) {
+					// 	responseData = responseData.fields.all;
+					// }
 				}
 			}
 
 			if (Array.isArray(responseData)) {
-				if (options.rawData !== true) {
-					// @ts-ignore
-					responseData = responseData.map(item => item.fields.all);
-				}
 				returnData.push.apply(returnData, responseData as IDataObject[]);
 			} else {
-				if (options.rawData !== true) {
-					// @ts-ignore
-					responseData = responseData.fields.all;
-				}
 				returnData.push(responseData as IDataObject);
 			}
 		}
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
index 4f844e118..b49d7f8bc 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
@@ -8,12 +8,12 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	IDataObject,
-	INodePropertyOptions,
 	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
@@ -92,7 +92,8 @@ export class MauticTrigger implements INodeType {
 					loadOptionsMethod: 'getEvents',
 				},
 				default: [],
-			},	{
+			},
+			{
 				displayName: 'Events Order',
 				name: 'eventsOrder',
 				type: 'options',
@@ -130,7 +131,7 @@ export class MauticTrigger implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 	// @ts-ignore
 	webhookMethods = {
@@ -170,7 +171,7 @@ export class MauticTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 				try {
 					await mauticApiRequest.call(this, 'DELETE', `/hooks/${webhookData.webhookId}/delete`);
-				} catch(error) {
+				} catch (error) {
 					return false;
 				}
 				delete webhookData.webhookId;
@@ -183,7 +184,7 @@ export class MauticTrigger implements INodeType {
 		const req = this.getRequestObject();
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Medium/Medium.node.ts b/packages/nodes-base/nodes/Medium/Medium.node.ts
index c44d256e3..d7fcf745a 100644
--- a/packages/nodes-base/nodes/Medium/Medium.node.ts
+++ b/packages/nodes-base/nodes/Medium/Medium.node.ts
@@ -6,8 +6,8 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
-	INodeType,
 	INodePropertyOptions,
+	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
@@ -129,7 +129,7 @@ export class Medium implements INodeType {
 					},
 				},
 				default: false,
-				description: 'Are you posting for a publication?'
+				description: 'Are you posting for a publication?',
 			},
 			{
 				displayName: 'Publication ID',
@@ -510,7 +510,7 @@ export class Medium implements INodeType {
 							'POST',
 							`/publications/${publicationId}/posts`,
 							bodyRequest,
-							qs
+							qs,
 						);
 					}
 					else {
@@ -519,7 +519,7 @@ export class Medium implements INodeType {
 							'GET',
 							'/me',
 							{},
-							qs
+							qs,
 						);
 
 						const authorId = responseAuthorId.data.id;
@@ -528,7 +528,7 @@ export class Medium implements INodeType {
 							'POST',
 							`/users/${authorId}/posts`,
 							bodyRequest,
-							qs
+							qs,
 						);
 
 						responseData = responseData.data;
diff --git a/packages/nodes-base/nodes/Medium/medium.png b/packages/nodes-base/nodes/Medium/medium.png
index 7b2e6216f..c3023b851 100644
Binary files a/packages/nodes-base/nodes/Medium/medium.png and b/packages/nodes-base/nodes/Medium/medium.png differ
diff --git a/packages/nodes-base/nodes/Merge.node.ts b/packages/nodes-base/nodes/Merge.node.ts
index 901c393c5..7a8a0a3ac 100644
--- a/packages/nodes-base/nodes/Merge.node.ts
+++ b/packages/nodes-base/nodes/Merge.node.ts
@@ -54,7 +54,7 @@ export class Merge implements INodeType {
 					{
 						name: 'Multiplex',
 						value: 'multiplex',
-						description: 'Merges each value of one input with each value of the other input. The output will contain (m * n) items where (m) and (n) are lengths of the inputs.'
+						description: 'Merges each value of one input with each value of the other input. The output will contain (m * n) items where (m) and (n) are lengths of the inputs.',
 					},
 					{
 						name: 'Pass-through',
@@ -82,7 +82,7 @@ export class Merge implements INodeType {
 				displayOptions: {
 					show: {
 						mode: [
-							'mergeByIndex'
+							'mergeByIndex',
 						],
 					},
 				},
@@ -147,7 +147,7 @@ export class Merge implements INodeType {
 				displayOptions: {
 					show: {
 						mode: [
-							'passThrough'
+							'passThrough',
 						],
 					},
 				},
@@ -194,8 +194,8 @@ export class Merge implements INodeType {
 				],
 				default: 'always',
 				description: 'Select when to overwrite the values from Input1 with values from Input 2.',
-			}
-		]
+			},
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
index 46f70c85d..b55ef27da 100644
--- a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
+++ b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
@@ -4,9 +4,9 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -295,11 +295,11 @@ export class MessageBird implements INodeType {
 					bodyRequest = {
 						recipients: [],
 						originator,
-						body
+						body,
 					};
 					const additionalFields = this.getNodeParameter(
 						'additionalFields',
-						i
+						i,
 					) as IDataObject;
 
 					if (additionalFields.groupIds) {
@@ -353,7 +353,7 @@ export class MessageBird implements INodeType {
 				requestMethod,
 				'/messages',
 				bodyRequest,
-				qs
+				qs,
 			);
 
 			returnData.push(responseData as IDataObject);
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
index 4180b4336..9119c4c00 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
@@ -17,7 +17,7 @@ export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSing
 		body,
 		qs,
 		uri: uri || `https://graph.microsoft.com/v1.0/me${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		if (Object.keys(headers).length !== 0) {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
index 26e58ef9a..4efade884 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
@@ -4,11 +4,11 @@ import {
 
 import {
 	IDataObject,
-	INodeExecutionData,
-	INodeTypeDescription,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -18,18 +18,18 @@ import {
 } from './GenericFunctions';
 
 import {
-	workbookOperations,
 	workbookFields,
+	workbookOperations,
 } from './WorkbookDescription';
 
 import {
-	worksheetOperations,
 	worksheetFields,
+	worksheetOperations,
 } from './WorksheetDescription';
 
 import {
-	tableOperations,
 	tableFields,
+	tableOperations,
 } from './TableDescription';
 
 export class MicrosoftExcel implements INodeType {
@@ -146,7 +146,7 @@ export class MicrosoftExcel implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts
index 8c399330d..6a057fee2 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts
@@ -16,7 +16,7 @@ export const tableOperations = [
 			{
 				name: 'Add Row',
 				value: 'addRow',
-				description: 'Adds rows to the end of the table'
+				description: 'Adds rows to the end of the table',
 			},
 			{
 				name: 'Get Columns',
@@ -31,7 +31,7 @@ export const tableOperations = [
 			{
 				name: 'Lookup',
 				value: 'lookup',
-				description: 'Looks for a specific column value and then returns the matching row'
+				description: 'Looks for a specific column value and then returns the matching row',
 			},
 		],
 		default: 'addRow',
@@ -273,7 +273,7 @@ export const tableFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'getRows'
+					'getRows',
 				],
 				resource: [
 					'table',
@@ -312,7 +312,7 @@ export const tableFields = [
 				default: '',
 				description: `Fields the response will containt. Multiple can be added separated by ,.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 table:getColumns                           */
@@ -448,7 +448,7 @@ export const tableFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'getColumns'
+					'getColumns',
 				],
 				resource: [
 					'table',
@@ -475,7 +475,7 @@ export const tableFields = [
 					'table',
 				],
 				rawData: [
-					true
+					true,
 				],
 			},
 		},
@@ -487,7 +487,7 @@ export const tableFields = [
 				default: '',
 				description: `Fields the response will containt. Multiple can be added separated by ,.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 table:lookup                               */
@@ -571,7 +571,7 @@ export const tableFields = [
 					'table',
 				],
 				operation: [
-					'lookup'
+					'lookup',
 				],
 			},
 		},
@@ -590,7 +590,7 @@ export const tableFields = [
 					'table',
 				],
 				operation: [
-					'lookup'
+					'lookup',
 				],
 			},
 		},
@@ -621,5 +621,5 @@ export const tableFields = [
 				description: 'By default only the first result gets returned. If options gets set all found matches get returned.',
 			},
 		],
-	}
+	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts
index 61f7b6f50..caffaec58 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts
@@ -79,7 +79,7 @@ export const workbookFields = [
 				description: `The name of the worksheet to be added. If specified, name should be unqiue. </BR>
 				If not specified, Excel determines the name of the new worksheet.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 workbook:getAll                            */
@@ -149,6 +149,6 @@ export const workbookFields = [
 				default: '',
 				description: `Fields the response will containt. Multiple can be added separated by ,.`,
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
index e5811e6c6..282016153 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
@@ -118,7 +118,7 @@ export const worksheetFields = [
 				default: '',
 				description: `Fields the response will containt. Multiple can be added separated by ,.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 worksheet:getContent                       */
@@ -209,7 +209,7 @@ export const worksheetFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'getContent'
+					'getContent',
 				],
 				resource: [
 					'worksheet',
@@ -240,7 +240,7 @@ export const worksheetFields = [
 			},
 			hide: {
 				rawData: [
-					true
+					true,
 				],
 			},
 		},
@@ -264,7 +264,7 @@ export const worksheetFields = [
 			},
 			hide: {
 				rawData: [
-					true
+					true,
 				],
 			},
 		},
@@ -298,6 +298,6 @@ export const worksheetFields = [
 				default: '',
 				description: `Fields the response will containt. Multiple can be added separated by ,.`,
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
index 0e9bc26cb..97d647027 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/FileDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import {
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const fileOperations = [
 	{
@@ -38,6 +40,11 @@ export const fileOperations = [
 				value: 'search',
 				description: 'Search a file',
 			},
+			{
+				name: 'Share',
+				value: 'share',
+				description: 'Share a file',
+			},
 			{
 				name: 'Upload',
 				value: 'upload',
@@ -222,7 +229,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'download'
+					'download',
 				],
 				resource: [
 					'file',
@@ -273,6 +280,84 @@ export const fileFields = [
 		across several fields including filename, metadata, and file content.`,
 	},
 /* -------------------------------------------------------------------------- */
+/*                                 file:share                                 */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'File ID',
+		name: 'fileId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: '',
+		description: 'File ID',
+	},
+	{
+		displayName: 'Type',
+		name: 'type',
+		type: 'options',
+		options: [
+			{
+				name: 'View',
+				value: 'view',
+			},
+			{
+				name: 'Edit',
+				value: 'edit',
+			},
+			{
+				name: 'Embed',
+				value: 'embed',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: '',
+		description: 'The type of sharing link to create',
+	},
+	{
+		displayName: 'Scope',
+		name: 'scope',
+		type: 'options',
+		options: [
+			{
+				name: 'Anonymous',
+				value: 'anonymous',
+			},
+			{
+				name: 'Organization',
+				value: 'organization',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: '',
+		description: 'The type of sharing link to create',
+	},
+/* -------------------------------------------------------------------------- */
 /*                                 file:upload                                */
 /* -------------------------------------------------------------------------- */
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/FolderDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/FolderDescription.ts
index 55401bee5..a33f1302d 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/FolderDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/FolderDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import {
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const folderOperations = [
 	{
@@ -28,6 +30,11 @@ export const folderOperations = [
 				value: 'search',
 				description: 'Search a folder',
 			},
+			{
+				name: 'Share',
+				value: 'share',
+				description: 'Share a folder',
+			},
 		],
 		default: 'getChildren',
 		description: 'The operation to perform.',
@@ -124,4 +131,82 @@ export const folderFields = [
 		description: `The query text used to search for items. Values may be matched
 		across several fields including filename, metadata, and file content.`,
 	},
+/* -------------------------------------------------------------------------- */
+/*                                 folder:share                               */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Folder ID',
+		name: 'folderId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: '',
+		description: 'File ID',
+	},
+	{
+		displayName: 'Type',
+		name: 'type',
+		type: 'options',
+		options: [
+			{
+				name: 'View',
+				value: 'view',
+			},
+			{
+				name: 'Edit',
+				value: 'edit',
+			},
+			{
+				name: 'Embed',
+				value: 'embed',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: '',
+		description: 'The type of sharing link to create',
+	},
+	{
+		displayName: 'Scope',
+		name: 'scope',
+		type: 'options',
+		options: [
+			{
+				name: 'Anonymous',
+				value: 'anonymous',
+			},
+			{
+				name: 'Organization',
+				value: 'organization',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: '',
+		description: 'The type of sharing link to create',
+	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
index 7040bb053..b8cdc89ca 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
@@ -33,7 +33,6 @@ export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSing
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
-
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftOneDriveOAuth2Api', options);
 	} catch (error) {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index 8b65b6b99..a7bacc29f 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -159,6 +159,18 @@ export class MicrosoftOneDrive implements INodeType {
 					responseData = responseData.filter((item: IDataObject) => item.file);
 					returnData.push.apply(returnData, responseData as IDataObject[]);
 				}
+				//https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_createlink?view=odsp-graph-online
+				if (operation === 'share') {
+					const fileId = this.getNodeParameter('fileId', i) as string;
+					const type = this.getNodeParameter('type', i) as string;
+					const scope = this.getNodeParameter('scope', i) as string;
+					const body: IDataObject = {
+						type,
+						scope,
+					};
+					responseData = await microsoftApiRequest.call(this, 'POST', `/drive/items/${fileId}/createLink`, body);
+					returnData.push(responseData);
+				}
 				//https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_put_content?view=odsp-graph-online#example-upload-a-new-file
 				if (operation === 'upload') {
 					const parentId = this.getNodeParameter('parentId', i) as string;
@@ -221,6 +233,18 @@ export class MicrosoftOneDrive implements INodeType {
 					responseData = responseData.filter((item: IDataObject) => item.folder);
 					returnData.push.apply(returnData, responseData as IDataObject[]);
 				}
+				//https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_createlink?view=odsp-graph-online
+				if (operation === 'share') {
+					const folderId = this.getNodeParameter('folderId', i) as string;
+					const type = this.getNodeParameter('type', i) as string;
+					const scope = this.getNodeParameter('scope', i) as string;
+					const body: IDataObject = {
+						type,
+						scope,
+					};
+					responseData = await microsoftApiRequest.call(this, 'POST', `/drive/items/${folderId}/createLink`, body);
+					returnData.push(responseData);
+				}
 			}
 		}
 		if (resource === 'file' && operation === 'download') {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/ChannelDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/ChannelDescription.ts
new file mode 100644
index 000000000..c771fba35
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/ChannelDescription.ts
@@ -0,0 +1,385 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const channelOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'channel',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a channel',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a channel',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a channel',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all channels',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a channel',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const channelFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:create                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'teamId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'Team ID',
+	},
+	{
+		displayName: 'Name',
+		name: 'name',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'Channel name as it will appear to the user in Microsoft Teams.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: `channel's description`,
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				options: [
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Standard',
+						value: 'standard',
+					},
+				],
+				default: 'standard',
+				description: 'The type of the channel',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:delete                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'teamId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'Team ID',
+	},
+	{
+		displayName: 'Channel ID',
+		name: 'channelId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+			loadOptionsDependsOn: [
+				'teamId',
+			],
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'channel ID',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:get                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'teamId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'Team ID',
+	},
+	{
+		displayName: 'Channel ID',
+		name: 'channelId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+			loadOptionsDependsOn: [
+				'teamId',
+			],
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'channel ID',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'teamId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'Team ID',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'channel',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:update                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'teamId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'Team ID',
+	},
+	{
+		displayName: 'Channel ID',
+		name: 'channelId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+			loadOptionsDependsOn: [
+				'teamId',
+			],
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: '',
+		description: 'Channel ID',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'channel',
+				],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'Channel name as it will appear to the user in Microsoft Teams.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: `channel's description`,
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/ChannelMessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/ChannelMessageDescription.ts
new file mode 100644
index 000000000..61879542a
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/ChannelMessageDescription.ts
@@ -0,0 +1,220 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const channelMessageOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'channelMessage',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a message',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all messages',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const channelMessageFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channelMessage:create                      */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'teamId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'channelMessage',
+				],
+			},
+		},
+		default: '',
+		description: 'Team ID',
+	},
+	{
+		displayName: 'Channel ID',
+		name: 'channelId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+			loadOptionsDependsOn: [
+				'teamId',
+			],
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'channelMessage',
+				],
+			},
+		},
+		default: '',
+		description: 'Channel ID',
+	},
+	{
+		displayName: 'Message Type',
+		name: 'messageType',
+		required: true,
+		type: 'options',
+		options: [
+			{
+				name: 'Text',
+				value: 'text',
+			},
+			{
+				name: 'HTML',
+				value: 'html',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'channelMessage',
+				],
+			},
+		},
+		default: '',
+		description: 'The type of the content',
+	},
+	{
+		displayName: 'Message',
+		name: 'message',
+		required: true,
+		type: 'string',
+		typeOptions: {
+			alwaysOpenEditWindow: true,
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'channelMessage',
+				],
+			},
+		},
+		default: '',
+		description: 'The content of the item.',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 channelMessage:getAll                      */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Team ID',
+		name: 'teamId',
+		required: true,
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'channelMessage',
+				],
+			},
+		},
+		default: '',
+		description: 'Team ID',
+	},
+	{
+		displayName: 'Channel ID',
+		name: 'channelId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChannels',
+			loadOptionsDependsOn: [
+				'teamId',
+			],
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'channelMessage',
+				],
+			},
+		},
+		default: '',
+		description: 'Channel ID',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'channelMessage',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'channelMessage',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
new file mode 100644
index 000000000..ff49f86ff
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
@@ -0,0 +1,79 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+	const options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://graph.microsoft.com${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+		//@ts-ignore
+		return await this.helpers.requestOAuth2.call(this, 'microsoftTeamsOAuth2Api', options);
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.error && error.response.body.error.message) {
+			// Try to return the error prettier
+			throw new Error(`Microsoft error response [${error.statusCode}]: ${error.response.body.error.message}`);
+		}
+		throw error;
+	}
+}
+
+export async function microsoftApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let uri: string | undefined;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
+		uri = responseData['@odata.nextLink'];
+		returnData.push.apply(returnData, responseData[propertyName]);
+		if (query.limit && query.limit <= returnData.length) {
+			return returnData;
+		}
+	} while (
+		responseData['@odata.nextLink'] !== undefined
+	);
+
+	return returnData;
+}
+
+export async function microsoftApiRequestAllItemsSkip(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query['$top'] = 100;
+	query['$skip'] = 0;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
+		query['$skip'] += query['$top'];
+		returnData.push.apply(returnData, responseData[propertyName]);
+	} while (
+		responseData['value'].length !== 0
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
new file mode 100644
index 000000000..9b1a1a18c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
@@ -0,0 +1,217 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	microsoftApiRequest,
+	microsoftApiRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	channelFields,
+	channelOperations,
+} from './ChannelDescription';
+
+import {
+	channelMessageFields,
+	channelMessageOperations,
+} from './ChannelMessageDescription';
+
+export class MicrosoftTeams implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Microsoft Teams',
+		name: 'microsoftTeams',
+		icon: 'file:teams.png',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Microsoft Teams API',
+		defaults: {
+			name: 'Microsoft Teams',
+			color: '#555cc7',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'microsoftTeamsOAuth2Api',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Channel',
+						value: 'channel',
+					},
+					{
+						name: 'Channel Message (Beta)',
+						value: 'channelMessage',
+					},
+				],
+				default: 'channel',
+				description: 'The resource to operate on.',
+			},
+			// CHANNEL
+			...channelOperations,
+			...channelFields,
+			/// MESSAGE
+			...channelMessageOperations,
+			...channelMessageFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			// Get all the team's channels to display them to user so that he can
+			// select them easily
+			async getChannels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const teamId = this.getCurrentNodeParameter('teamId') as string;
+				const { value } = await microsoftApiRequest.call(this, 'GET', `/v1.0/teams/${teamId}/channels`);
+				for (const channel of value) {
+					const channelName = channel.displayName;
+					const channelId = channel.id;
+					returnData.push({
+						name: channelName,
+						value: channelId,
+					});
+				}
+				return returnData;
+			},
+			// Get all the teams to display them to user so that he can
+			// select them easily
+			async getTeams(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { value } = await microsoftApiRequest.call(this, 'GET', '/v1.0/me/joinedTeams');
+				for (const team of value) {
+					const teamName = team.displayName;
+					const teamId = team.id;
+					returnData.push({
+						name: teamName,
+						value: teamId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = items.length as unknown as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+			if (resource === 'channel') {
+				//https://docs.microsoft.com/en-us/graph/api/channel-post?view=graph-rest-beta&tabs=http
+				if (operation === 'create') {
+					const teamId = this.getNodeParameter('teamId', i) as string;
+					const name = this.getNodeParameter('name', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					const body: IDataObject = {
+						displayName: name,
+					};
+					if (options.description) {
+						body.description = options.description as string;
+					}
+					if (options.type) {
+						body.membershipType = options.type as string;
+					}
+					responseData = await microsoftApiRequest.call(this, 'POST', `/v1.0/teams/${teamId}/channels`, body);
+				}
+				//https://docs.microsoft.com/en-us/graph/api/channel-delete?view=graph-rest-beta&tabs=http
+				if (operation === 'delete') {
+					const teamId = this.getNodeParameter('teamId', i) as string;
+					const channelId = this.getNodeParameter('channelId', i) as string;
+					responseData = await microsoftApiRequest.call(this, 'DELETE', `/v1.0/teams/${teamId}/channels/${channelId}`);
+					responseData = { success: true };
+				}
+				//https://docs.microsoft.com/en-us/graph/api/channel-get?view=graph-rest-beta&tabs=http
+				if (operation === 'get') {
+					const teamId = this.getNodeParameter('teamId', i) as string;
+					const channelId = this.getNodeParameter('channelId', i) as string;
+					responseData = await microsoftApiRequest.call(this, 'GET', `/v1.0/teams/${teamId}/channels/${channelId}`);
+				}
+				//https://docs.microsoft.com/en-us/graph/api/channel-list?view=graph-rest-beta&tabs=http
+				if (operation === 'getAll') {
+					const teamId = this.getNodeParameter('teamId', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					if (returnAll) {
+						responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/v1.0/teams/${teamId}/channels`);
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+						responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/v1.0/teams/${teamId}/channels`, {});
+						responseData = responseData.splice(0, qs.limit);
+					}
+				}
+				//https://docs.microsoft.com/en-us/graph/api/channel-patch?view=graph-rest-beta&tabs=http
+				if (operation === 'update') {
+					const teamId = this.getNodeParameter('teamId', i) as string;
+					const channelId = this.getNodeParameter('channelId', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const body: IDataObject = {};
+					if (updateFields.name) {
+						body.displayName = updateFields.name as string;
+					}
+					if (updateFields.description) {
+						body.description = updateFields.description as string;
+					}
+					responseData = await microsoftApiRequest.call(this, 'PATCH', `/v1.0/teams/${teamId}/channels/${channelId}`, body);
+					responseData = { success: true };
+				}
+			}
+			if (resource === 'channelMessage') {
+				//https://docs.microsoft.com/en-us/graph/api/channel-post-messages?view=graph-rest-beta&tabs=http
+				if (operation === 'create') {
+					const teamId = this.getNodeParameter('teamId', i) as string;
+					const channelId = this.getNodeParameter('channelId', i) as string;
+					const messageType = this.getNodeParameter('messageType', i) as string;
+					const message = this.getNodeParameter('message', i) as string;
+					const body: IDataObject = {
+						body: {
+							contentType: messageType,
+							content: message,
+						},
+					};
+					responseData = await microsoftApiRequest.call(this, 'POST', `/beta/teams/${teamId}/channels/${channelId}/messages`, body);
+				}
+				//https://docs.microsoft.com/en-us/graph/api/channel-list-messages?view=graph-rest-beta&tabs=http
+				if (operation === 'getAll') {
+					const teamId = this.getNodeParameter('teamId', i) as string;
+					const channelId = this.getNodeParameter('channelId', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					if (returnAll) {
+						responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/beta/teams/${teamId}/channels/${channelId}/messages`);
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+						responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/beta/teams/${teamId}/channels/${channelId}/messages`, {});
+						responseData = responseData.splice(0, qs.limit);
+					}
+				}
+			}
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+			} else {
+				returnData.push(responseData as IDataObject);
+			}
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/teams.png b/packages/nodes-base/nodes/Microsoft/Teams/teams.png
new file mode 100644
index 000000000..6ccb7ac5d
Binary files /dev/null and b/packages/nodes-base/nodes/Microsoft/Teams/teams.png differ
diff --git a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
new file mode 100644
index 000000000..d7ce39d3f
--- /dev/null
+++ b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
@@ -0,0 +1,89 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function mindeeApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const resource = this.getNodeParameter('resource', 0) as string;
+
+	let credentials;
+
+	if (resource === 'receipt') {
+		credentials = this.getCredentials('mindeeReceiptApi') as IDataObject;
+	} else {
+		credentials = this.getCredentials('mindeeInvoiceApi') as IDataObject;
+	}
+
+	const options: OptionsWithUri = {
+		headers: {
+			'X-Inferuser-Token': credentials.apiKey,
+		},
+		method,
+		body,
+		qs,
+		uri: `https://api.mindee.net/products${path}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		if (Object.keys(qs).length === 0) {
+			delete options.qs;
+		}
+		if (Object.keys(option).length !== 0) {
+			Object.assign(options, option);
+		}
+		//@ts-ignore
+		return await this.helpers.request.call(this, options);
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.error) {
+
+			let errors = error.response.body.error.errors;
+
+			errors = errors.map((e: IDataObject) => e.message);
+			// Try to return the error prettier
+			throw new Error(
+				`Mindee error response [${error.statusCode}]: ${errors.join('|')}`,
+			);
+		}
+		throw error;
+	}
+}
+
+export function cleanData(predictions: IDataObject[]) {
+
+	const newData: IDataObject = {};
+
+	for (const key of Object.keys(predictions[0])) {
+
+		const data = predictions[0][key] as IDataObject | IDataObject[];
+
+		if (key === 'taxes' && data.length) {
+			newData[key] = {
+				amount: (data as IDataObject[])[0].amount,
+				rate: (data as IDataObject[])[0].rate,
+			};
+		} else if (key === 'locale') {
+				//@ts-ignore
+				newData['currency'] = data.currency;
+				//@ts-ignore
+				newData['locale'] = data.value;
+		} else {
+			//@ts-ignore
+			newData[key] = data.value || data.name || data.raw || data.degrees || data.amount || data.iban;
+		}
+	}
+
+	return newData;
+}
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
new file mode 100644
index 000000000..56dbf9904
--- /dev/null
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -0,0 +1,220 @@
+import {
+	BINARY_ENCODING,
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IBinaryData,
+	IBinaryKeyData,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	cleanData,
+	mindeeApiRequest,
+} from './GenericFunctions';
+
+export class Mindee implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Mindee',
+		name: 'mindee',
+		icon: 'file:mindee.svg',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Mindee API.',
+		defaults: {
+			name: 'Mindee',
+			color: '#e94950',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'mindeeReceiptApi',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'receipt',
+						],
+					},
+				},
+			},
+			{
+				name: 'mindeeInvoiceApi',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'invoice',
+						],
+					},
+				},
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Invoice',
+						value: 'invoice',
+					},
+					{
+						name: 'Receipt',
+						value: 'receipt',
+					},
+				],
+				default: 'receipt',
+				description: 'The resource to operate on.',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [
+					{
+						name: 'Predict',
+						value: 'predict',
+					},
+				],
+				default: 'predict',
+				description: 'The resource to operate on.',
+			},
+			{
+				displayName: 'Binary Property',
+				name: 'binaryPropertyName',
+				type: 'string',
+				required: true,
+				default: 'data',
+				displayOptions: {
+					show: {
+						operation: [
+							'predict',
+						],
+						resource: [
+							'receipt',
+							'invoice',
+						],
+					},
+				},
+				description: 'Name of the binary property which containsthe data for the file to be uploaded.',
+			},
+			{
+				displayName: 'RAW Data',
+				name: 'rawData',
+				type: 'boolean',
+				default: false,
+				description: `Returns the data exactly in the way it got received from the API.`,
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+
+			if (resource === 'receipt') {
+				if (operation === 'predict') {
+					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
+
+					const rawData = this.getNodeParameter('rawData', i) as boolean;
+
+					if (items[i].binary === undefined) {
+						throw new Error('No binary data exists on item!');
+					}
+
+					const item = items[i].binary as IBinaryKeyData;
+
+					const binaryData = item[binaryPropertyName] as IBinaryData;
+
+					if (binaryData === undefined) {
+						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+					}
+
+					responseData = await mindeeApiRequest.call(
+						this,
+						'POST',
+						`/expense_receipts/v2/predict`,
+						{},
+						{},
+						{
+							formData: {
+								file: {
+									value: Buffer.from(binaryData.data, BINARY_ENCODING),
+									options: {
+										filename: binaryData.fileName,
+									},
+								},
+							},
+						},
+					);
+
+					if (rawData === false) {
+						responseData = cleanData(responseData.predictions);
+					}
+				}
+			}
+
+			if (resource === 'invoice') {
+				if (operation === 'predict') {
+					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
+
+					const rawData = this.getNodeParameter('rawData', i) as boolean;
+
+					if (items[i].binary === undefined) {
+						throw new Error('No binary data exists on item!');
+					}
+
+					const item = items[i].binary as IBinaryKeyData;
+
+					const binaryData = item[binaryPropertyName] as IBinaryData;
+
+					if (binaryData === undefined) {
+						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+					}
+
+					responseData = await mindeeApiRequest.call(
+						this,
+						'POST',
+						`/invoices/v1/predict`,
+						{},
+						{},
+						{
+							formData: {
+								file: {
+									value: Buffer.from(binaryData.data, BINARY_ENCODING),
+									options: {
+										filename: binaryData.fileName,
+									},
+								},
+							},
+						},
+					);
+
+					if (rawData === false) {
+						responseData = cleanData(responseData.predictions);
+					}
+				}
+			}
+		}
+		if (Array.isArray(responseData)) {
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+		} else if (responseData !== undefined) {
+			returnData.push(responseData as IDataObject);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Mindee/mindee.svg b/packages/nodes-base/nodes/Mindee/mindee.svg
new file mode 100644
index 000000000..6a28b1e1a
--- /dev/null
+++ b/packages/nodes-base/nodes/Mindee/mindee.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+    <g fill="none" fill-rule="evenodd"><path d="M18.329 0h13.746v32H18.33V27.43h9.164V4.572H18.33V0zM4.582 13.714V27.43h9.165V32H0V0h13.747v4.571H4.582v9.143zm4.582 0v-4.57h13.747v4.57H9.164zm0 9.143v-4.571h4.583v4.571H9.164z" fill="#FD3246"></path></g>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mocean/Mocean.node.ts b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
index 0776e6f75..f3b575a61 100644
--- a/packages/nodes-base/nodes/Mocean/Mocean.node.ts
+++ b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
@@ -27,7 +27,7 @@ export class Mocean implements INodeType {
 			{
 				name: 'moceanApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			// Node properties which the user gets displayed and
@@ -44,7 +44,7 @@ export class Mocean implements INodeType {
 					{
 						name: 'Voice',
 						value: 'voice',
-					}
+					},
 				],
 				default: 'sms',
 			},
@@ -119,23 +119,23 @@ export class Mocean implements INodeType {
 				options:[
 					{
 						name: 'Chinese Mandarin (China)',
-						value: 'cmn-CN'
+						value: 'cmn-CN',
 					},
 					{
 						name: 'English (United Kingdom)',
-						value: 'en-GB'
+						value: 'en-GB',
 					},
 					{
 						name: 'English (United States)',
-						value: 'en-US'
+						value: 'en-US',
 					},
 					{
 						name: 'Japanese (Japan)',
-						value: 'ja-JP'
+						value: 'ja-JP',
 					},
 					{
 						name: 'Korean (Korea)',
-						value: 'ko-KR'
+						value: 'ko-KR',
 					},
 				],
 				displayOptions: {
@@ -209,7 +209,7 @@ export class Mocean implements INodeType {
 						action: 'say',
 						language,
 						text,
-					}
+					},
 				];
 
 				dataKey = 'voice';
diff --git a/packages/nodes-base/nodes/MondayCom/BoardGroupDescription.ts b/packages/nodes-base/nodes/MondayCom/BoardGroupDescription.ts
index d98ec6791..3650ff837 100644
--- a/packages/nodes-base/nodes/MondayCom/BoardGroupDescription.ts
+++ b/packages/nodes-base/nodes/MondayCom/BoardGroupDescription.ts
@@ -28,7 +28,7 @@ export const boardGroupOperations = [
 			{
 				name: 'Get All',
 				value: 'getAll',
-				description: `Get board's groups`,
+				description: `Get list of groups in a board`,
 			},
 		],
 		default: 'create',
diff --git a/packages/nodes-base/nodes/MondayCom/BoardItemDescription.ts b/packages/nodes-base/nodes/MondayCom/BoardItemDescription.ts
index 9537c3252..6bccd6dc3 100644
--- a/packages/nodes-base/nodes/MondayCom/BoardItemDescription.ts
+++ b/packages/nodes-base/nodes/MondayCom/BoardItemDescription.ts
@@ -48,7 +48,7 @@ export const boardItemOperations = [
 			{
 				name: 'Get All',
 				value: 'getAll',
-				description: 'Get all item',
+				description: 'Get all items',
 			},
 			{
 				name: 'Get By Column Value',
@@ -151,7 +151,7 @@ export const boardItemFields = [
 		typeOptions: {
 			loadOptionsMethod: 'getColumns',
 			loadOptionsDependsOn: [
-				'boardId'
+				'boardId',
 			],
 		},
 		default: '',
@@ -226,7 +226,7 @@ export const boardItemFields = [
 				],
 			},
 		},
-		description: `Item's ID`
+		description: `Item's ID`,
 	},
 	{
 		displayName: 'Column Values',
@@ -280,7 +280,7 @@ export const boardItemFields = [
 		typeOptions: {
 			loadOptionsMethod: 'getGroups',
 			loadOptionsDependsOn: [
-				'boardId'
+				'boardId',
 			],
 		},
 		required: true,
@@ -361,7 +361,7 @@ export const boardItemFields = [
 				],
 			},
 		},
-		description: `Item's ID`
+		description: `Item's ID`,
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 boardItem:get                              */
@@ -382,7 +382,7 @@ export const boardItemFields = [
 				],
 			},
 		},
-		description: `Item's ID (Multiple can be added separated by comma)`
+		description: `Item's ID (Multiple can be added separated by comma)`,
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 boardItem:getAll                           */
@@ -502,7 +502,7 @@ export const boardItemFields = [
 		typeOptions: {
 			loadOptionsMethod: 'getColumns',
 			loadOptionsDependsOn: [
-				'boardId'
+				'boardId',
 			],
 		},
 		default: '',
@@ -535,7 +535,7 @@ export const boardItemFields = [
 				],
 			},
 		},
-		description: 'The column value to search items by.'
+		description: 'The column value to search items by.',
 	},
 	{
 		displayName: 'Return All',
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index f05ae3938..477f7e07a 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -35,7 +35,7 @@ export async function mondayComApiRequest(this: IExecuteFunctions | IWebhookFunc
 		method: 'POST',
 		body,
 		uri: endpoint,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	try {
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index d91a287b8..e9abdc2bd 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -17,12 +17,12 @@ export class MongoDb implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const { database, connectionString } = validateAndResolveMongoCredentials(
-			this.getCredentials('mongoDb')
+			this.getCredentials('mongoDb'),
 		);
 
 		const client: MongoClient = await MongoClient.connect(connectionString, {
 			useNewUrlParser: true,
-			useUnifiedTopology: true
+			useUnifiedTopology: true,
 		});
 
 		const mdb = client.db(database as string);
@@ -76,8 +76,8 @@ export class MongoDb implements INodeType {
 				returnItems.push({
 					json: {
 						...insertItems[parseInt(i, 10)],
-						id: insertedIds[parseInt(i, 10)] as string
-					}
+						id: insertedIds[parseInt(i, 10)] as string,
+					},
 				});
 			}
 		} else if (operation === 'update') {
diff --git a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
index 953a45a62..d4bd0a37b 100644
--- a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
+++ b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
@@ -12,15 +12,15 @@ export const nodeDescription: INodeTypeDescription = {
 	description: 'Find, insert and update documents in MongoDB.',
 	defaults: {
 		name: 'MongoDB',
-		color: '#13AA52'
+		color: '#13AA52',
 	},
 	inputs: ['main'],
 	outputs: ['main'],
 	credentials: [
 		{
 			name: 'mongoDb',
-			required: true
-		}
+			required: true,
+		},
 	],
 	properties: [
 		{
@@ -31,26 +31,26 @@ export const nodeDescription: INodeTypeDescription = {
 				{
 					name: 'Delete',
 					value: 'delete',
-					description: 'Delete documents.'
+					description: 'Delete documents.',
 				},
 				{
 					name: 'Find',
 					value: 'find',
-					description: 'Find documents.'
+					description: 'Find documents.',
 				},
 				{
 					name: 'Insert',
 					value: 'insert',
-					description: 'Insert documents.'
+					description: 'Insert documents.',
 				},
 				{
 					name: 'Update',
 					value: 'update',
-					description: 'Updates documents.'
-				}
+					description: 'Updates documents.',
+				},
 			],
 			default: 'find',
-			description: 'The operation to perform.'
+			description: 'The operation to perform.',
 		},
 
 		{
@@ -59,7 +59,7 @@ export const nodeDescription: INodeTypeDescription = {
 			type: 'string',
 			required: true,
 			default: '',
-			description: 'MongoDB Collection'
+			description: 'MongoDB Collection',
 		},
 
 		// ----------------------------------
@@ -70,19 +70,19 @@ export const nodeDescription: INodeTypeDescription = {
 			name: 'query',
 			type: 'json',
 			typeOptions: {
-				rows: 5
+				rows: 5,
 			},
 			displayOptions: {
 				show: {
 					operation: [
-						'delete'
+						'delete',
 					],
 				},
 			},
 			default: '{}',
 			placeholder: `{ "birth": { "$gt": "1950-01-01" } }`,
 			required: true,
-			description: 'MongoDB Delete query.'
+			description: 'MongoDB Delete query.',
 		},
 
 		// ----------------------------------
@@ -93,17 +93,17 @@ export const nodeDescription: INodeTypeDescription = {
 			name: 'query',
 			type: 'json',
 			typeOptions: {
-				rows: 5
+				rows: 5,
 			},
 			displayOptions: {
 				show: {
-					operation: ['find']
-				}
+					operation: ['find'],
+				},
 			},
 			default: '{}',
 			placeholder: `{ "birth": { "$gt": "1950-01-01" } }`,
 			required: true,
-			description: 'MongoDB Find query.'
+			description: 'MongoDB Find query.',
 		},
 
 		// ----------------------------------
@@ -115,13 +115,13 @@ export const nodeDescription: INodeTypeDescription = {
 			type: 'string',
 			displayOptions: {
 				show: {
-					operation: ['insert']
-				}
+					operation: ['insert'],
+				},
 			},
 			default: '',
 			placeholder: 'name,description',
 			description:
-				'Comma separated list of the fields to be included into the new document.'
+				'Comma separated list of the fields to be included into the new document.',
 		},
 
 		// ----------------------------------
@@ -133,13 +133,13 @@ export const nodeDescription: INodeTypeDescription = {
 			type: 'string',
 			displayOptions: {
 				show: {
-					operation: ['update']
-				}
+					operation: ['update'],
+				},
 			},
 			default: 'id',
 			required: true,
 			description:
-				'Name of the property which decides which rows in the database should be updated. Normally that would be "id".'
+				'Name of the property which decides which rows in the database should be updated. Normally that would be "id".',
 		},
 		{
 			displayName: 'Fields',
@@ -147,13 +147,13 @@ export const nodeDescription: INodeTypeDescription = {
 			type: 'string',
 			displayOptions: {
 				show: {
-					operation: ['update']
-				}
+					operation: ['update'],
+				},
 			},
 			default: '',
 			placeholder: 'name,description',
 			description:
-				'Comma separated list of the fields to be included into the new document.'
-		}
-	]
+				'Comma separated list of the fields to be included into the new document.',
+		},
+	],
 };
diff --git a/packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts b/packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts
index 17ccc0dc4..bc2d308a7 100644
--- a/packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts
+++ b/packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts
@@ -1,12 +1,12 @@
 import {
+	ICredentialDataDecryptedObject,
 	IDataObject,
 	INodeExecutionData,
-	ICredentialDataDecryptedObject
 } from 'n8n-workflow';
 import {
+	IMongoCredentials,
 	IMongoCredentialsType,
 	IMongoParametricCredentials,
-	IMongoCredentials
 } from './mongo.node.types';
 
 /**
@@ -15,7 +15,7 @@ import {
  * @param {ICredentialDataDecryptedObject} credentials MongoDB credentials to use, unless conn string is overridden
  */
 function buildParameterizedConnString(
-	credentials: IMongoParametricCredentials
+	credentials: IMongoParametricCredentials,
 ): string {
 	if (credentials.port) {
 		return `mongodb://${credentials.user}:${credentials.password}@${credentials.host}:${credentials.port}`;
@@ -31,7 +31,7 @@ function buildParameterizedConnString(
  * @param {ICredentialDataDecryptedObject} credentials raw/input MongoDB credentials to use
  */
 function buildMongoConnectionParams(
-	credentials: IMongoCredentialsType
+	credentials: IMongoCredentialsType,
 ): IMongoCredentials {
 	const sanitizedDbName =
 		credentials.database && credentials.database.trim().length > 0
@@ -44,17 +44,17 @@ function buildMongoConnectionParams(
 		) {
 			return {
 				connectionString: credentials.connectionString.trim(),
-				database: sanitizedDbName
+				database: sanitizedDbName,
 			};
 		} else {
 			throw new Error(
-				'Cannot override credentials: valid MongoDB connection string not provided '
+				'Cannot override credentials: valid MongoDB connection string not provided ',
 			);
 		}
 	} else {
 		return {
 			connectionString: buildParameterizedConnString(credentials),
-			database: sanitizedDbName
+			database: sanitizedDbName,
 		};
 	}
 }
@@ -65,7 +65,7 @@ function buildMongoConnectionParams(
  * @param {ICredentialDataDecryptedObject} credentials raw/input MongoDB credentials to use
  */
 export function validateAndResolveMongoCredentials(
-	credentials?: ICredentialDataDecryptedObject
+	credentials?: ICredentialDataDecryptedObject,
 ): IMongoCredentials {
 	if (credentials === undefined) {
 		throw new Error('No credentials got returned!');
@@ -86,7 +86,7 @@ export function validateAndResolveMongoCredentials(
  */
 export function getItemCopy(
 	items: INodeExecutionData[],
-	properties: string[]
+	properties: string[],
 ): IDataObject[] {
 	// Prepare the data to insert and copy it to be returned
 	let newItem: IDataObject;
diff --git a/packages/nodes-base/nodes/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData.node.ts
index d574dc5d4..b715bf397 100644
--- a/packages/nodes-base/nodes/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData.node.ts
@@ -230,7 +230,7 @@ export class MoveBinaryData implements INodeType {
 									'binaryToJson',
 								],
 								'/setAllData': [
-									false
+									false,
 								],
 							},
 						},
@@ -301,7 +301,7 @@ export class MoveBinaryData implements INodeType {
 						description: 'Use data as is and do not JSON.stringify it.',
 					},
 				],
-			}
+			},
 		],
 	};
 
diff --git a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
index 893996fc8..3514916b0 100644
--- a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
@@ -33,7 +33,7 @@ export async function msg91ApiRequest(this: IHookFunctions | IExecuteFunctions,
 		form: body,
 		qs: query,
 		uri: `https://api.msg91.com/api${endpoint}`,
-		json: true
+		json: true,
 	};
 
 	try {
diff --git a/packages/nodes-base/nodes/Msg91/Msg91.node.ts b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
index 0430884a1..016d511fc 100644
--- a/packages/nodes-base/nodes/Msg91/Msg91.node.ts
+++ b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
@@ -30,7 +30,7 @@ export class Msg91 implements INodeType {
 			{
 				name: 'msg91Api',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -123,7 +123,7 @@ export class Msg91 implements INodeType {
 				},
 				description: 'The message to send',
 			},
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 335b42fcc..43974e766 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -28,7 +28,7 @@ export class MySql implements INodeType {
 			{
 				name: 'mySql',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -69,7 +69,7 @@ export class MySql implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'executeQuery'
+							'executeQuery',
 						],
 					},
 				},
@@ -90,7 +90,7 @@ export class MySql implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'insert'
+							'insert',
 						],
 					},
 				},
@@ -105,7 +105,7 @@ export class MySql implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'insert'
+							'insert',
 						],
 					},
 				},
@@ -125,7 +125,7 @@ export class MySql implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 					},
 				},
@@ -140,7 +140,7 @@ export class MySql implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 					},
 				},
@@ -155,7 +155,7 @@ export class MySql implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 					},
 				},
@@ -164,7 +164,7 @@ export class MySql implements INodeType {
 				description: 'Comma separated list of the properties which should used as columns for rows to update.',
 			},
 
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index a5b3109c6..e35b0b559 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -5,9 +5,9 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -20,15 +20,15 @@ import {
 
 export class NextCloud implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'NextCloud',
+		displayName: 'Nextcloud',
 		name: 'nextCloud',
 		icon: 'file:nextcloud.png',
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Access data on NextCloud',
+		description: 'Access data on Nextcloud',
 		defaults: {
-			name: 'NextCloud',
+			name: 'Nextcloud',
 			color: '#1cafff',
 		},
 		inputs: ['main'],
@@ -170,7 +170,7 @@ export class NextCloud implements INodeType {
 					{
 						name: 'List',
 						value: 'list',
-						description: 'Return the files and folders in a given folder',
+						description: 'Return the contents of a given folder',
 					},
 					{
 						name: 'Move',
@@ -200,7 +200,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'copy'
+							'copy',
 						],
 						resource: [
 							'file',
@@ -220,7 +220,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'copy'
+							'copy',
 						],
 						resource: [
 							'file',
@@ -244,7 +244,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'delete'
+							'delete',
 						],
 						resource: [
 							'file',
@@ -268,7 +268,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'move'
+							'move',
 						],
 						resource: [
 							'file',
@@ -288,7 +288,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'move'
+							'move',
 						],
 						resource: [
 							'file',
@@ -312,7 +312,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'download'
+							'download',
 						],
 						resource: [
 							'file',
@@ -331,7 +331,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'download'
+							'download',
 						],
 						resource: [
 							'file',
@@ -353,7 +353,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
@@ -372,7 +372,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
@@ -389,10 +389,10 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						binaryDataUpload: [
-							false
+							false,
 						],
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
@@ -412,10 +412,10 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						binaryDataUpload: [
-							true
+							true,
 						],
 						operation: [
-							'upload'
+							'upload',
 						],
 						resource: [
 							'file',
@@ -445,7 +445,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'folder',
@@ -467,7 +467,7 @@ export class NextCloud implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'list'
+							'list',
 						],
 						resource: [
 							'folder',
diff --git a/packages/nodes-base/nodes/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap.node.ts
index 38e883e53..7ad14ee88 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap.node.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap.node.ts
@@ -3,9 +3,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import { OptionsWithUri } from 'request';
@@ -28,7 +28,7 @@ export class OpenWeatherMap implements INodeType {
 			{
 				name: 'openWeatherMapApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -188,6 +188,16 @@ export class OpenWeatherMap implements INodeType {
 				description: 'The id of city to return the weather of. List can be downloaded here: http://bulk.openweathermap.org/sample/',
 			},
 
+			{
+				displayName: 'Language',
+				name: 'language',
+				type: 'string',
+				default: '',
+				placeholder: 'en',
+				required: false,
+				description: 'The two letter language code to get your output in (eg. en, de, ...).',
+			},
+
 		],
 	};
 
@@ -206,6 +216,7 @@ export class OpenWeatherMap implements INodeType {
 
 		let endpoint = '';
 		let locationSelection;
+		let language;
 
 		let qs: IDataObject;
 
@@ -213,7 +224,7 @@ export class OpenWeatherMap implements INodeType {
 			// Set base data
 			qs = {
 				APPID: credentials.accessToken,
-				units: this.getNodeParameter('format', i) as string
+				units: this.getNodeParameter('format', i) as string,
 			};
 
 			// Get the location
@@ -231,6 +242,11 @@ export class OpenWeatherMap implements INodeType {
 				throw new Error(`The locationSelection "${locationSelection}" is not known!`);
 			}
 
+			// Get the language
+			language = this.getNodeParameter('language', i) as string;
+			if (language) {
+				qs.lang = language;
+			}
 
 			if (operation === 'currentWeather') {
 				// ----------------------------------
diff --git a/packages/nodes-base/nodes/Paddle/CouponDescription.ts b/packages/nodes-base/nodes/Paddle/CouponDescription.ts
index 179ec825b..2f1f7612d 100644
--- a/packages/nodes-base/nodes/Paddle/CouponDescription.ts
+++ b/packages/nodes-base/nodes/Paddle/CouponDescription.ts
@@ -50,11 +50,11 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					`create`
+					`create`,
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		default: 'checkout',
@@ -62,13 +62,13 @@ export const couponFields = [
 		options: [
 			{
 				name: 'Checkout',
-				value: 'checkout'
+				value: 'checkout',
 			},
 			{
 				name: 'Product',
-				value: 'product'
+				value: 'product',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Product IDs',
@@ -83,14 +83,14 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					`create`
+					`create`,
 				],
 				couponType: [
 					'product',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		default: '',
@@ -107,11 +107,11 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					`create`
+					`create`,
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		default: 'flat',
@@ -119,22 +119,22 @@ export const couponFields = [
 		options: [
 			{
 				name: 'Flat',
-				value: 'flat'
+				value: 'flat',
 			},
 			{
 				name: 'Percentage',
-				value: 'percentage'
+				value: 'percentage',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Discount Amount Currency',
 		name: 'discountAmount',
 		type: 'number',
-		default: '',
+		default: 1,
 		description: 'Discount amount in currency.',
 		typeOptions: {
-			minValue: 1
+			minValue: 1,
 		},
 		displayOptions: {
 			show: {
@@ -142,14 +142,14 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					`create`
+					`create`,
 				],
 				discountType: [
 					'flat',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 	},
@@ -157,11 +157,11 @@ export const couponFields = [
 		displayName: 'Discount Amount %',
 		name: 'discountAmount',
 		type: 'number',
-		default: '',
+		default: 1,
 		description: 'Discount amount in percentage.',
 		typeOptions: {
 			minValue: 1,
-			maxValue: 100
+			maxValue: 100,
 		},
 		displayOptions: {
 			show: {
@@ -169,14 +169,14 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					`create`
+					`create`,
 				],
 				discountType: [
 					'percentage',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 	},
@@ -189,107 +189,107 @@ export const couponFields = [
 		options: [
 			{
 				name: 'ARS',
-				value: 'ARS'
+				value: 'ARS',
 			},
 			{
 				name: 'AUD',
-				value: 'AUD'
+				value: 'AUD',
 			},
 			{
 				name: 'BRL',
-				value: 'BRL'
+				value: 'BRL',
 			},
 			{
 				name: 'CAD',
-				value: 'CAD'
+				value: 'CAD',
 			},
 			{
 				name: 'CHF',
-				value: 'CHF'
+				value: 'CHF',
 			},
 			{
 				name: 'CNY',
-				value: 'CNY'
+				value: 'CNY',
 			},
 			{
 				name: 'CZK',
-				value: 'CZK'
+				value: 'CZK',
 			},
 			{
 				name: 'DKK',
-				value: 'DKK'
+				value: 'DKK',
 			},
 			{
 				name: 'EUR',
-				value: 'EUR'
+				value: 'EUR',
 			},
 			{
 				name: 'GBP',
-				value: 'GBP'
+				value: 'GBP',
 			},
 			{
 				name: 'HKD',
-				value: 'HKD'
+				value: 'HKD',
 			},
 			{
 				name: 'HUF',
-				value: 'HUF'
+				value: 'HUF',
 			},
 			{
 				name: 'INR',
-				value: 'INR'
+				value: 'INR',
 			},
 			{
 				name: 'JPY',
-				value: 'JPY'
+				value: 'JPY',
 			},
 			{
 				name: 'KRW',
-				value: 'KRW'
+				value: 'KRW',
 			},
 			{
 				name: 'MXN',
-				value: 'MXN'
+				value: 'MXN',
 			},
 			{
 				name: 'NOK',
-				value: 'NOK'
+				value: 'NOK',
 			},
 			{
 				name: 'NZD',
-				value: 'NZD'
+				value: 'NZD',
 			},
 			{
 				name: 'PLN',
-				value: 'PLN'
+				value: 'PLN',
 			},
 			{
 				name: 'RUB',
-				value: 'RUB'
+				value: 'RUB',
 			},
 			{
 				name: 'SEK',
-				value: 'SEK'
+				value: 'SEK',
 			},
 			{
 				name: 'SGD',
-				value: 'SGD'
+				value: 'SGD',
 			},
 			{
 				name: 'THB',
-				value: 'THB'
+				value: 'THB',
 			},
 			{
 				name: 'TWD',
-				value: 'TWD'
+				value: 'TWD',
 			},
 			{
 				name: 'USD',
-				value: 'USD'
+				value: 'USD',
 			},
 			{
 				name: 'ZAR',
-				value: 'ZAR'
+				value: 'ZAR',
 			},
 		],
 		displayOptions: {
@@ -298,14 +298,14 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					`create`
+					`create`,
 				],
 				discountType: [
 					'flat',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 	},
@@ -363,8 +363,8 @@ export const couponFields = [
 					'create',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		default: {},
@@ -410,7 +410,7 @@ export const couponFields = [
 				type: 'string',
 				typeOptions: {
 					minValue: 1,
-					maxValue: 50
+					maxValue: 50,
 				},
 				default: '',
 				description: 'The name of the coupon group this coupon should be assigned to.',
@@ -444,8 +444,8 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					`getAll`
-				]
+					`getAll`,
+				],
 			},
 		},
 		default: '',
@@ -506,7 +506,7 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					`update`
+					`update`,
 				],
 				jsonParameters: [
 					false,
@@ -518,13 +518,13 @@ export const couponFields = [
 		options: [
 			{
 				name: 'Coupon Code',
-				value: 'couponCode'
+				value: 'couponCode',
 			},
 			{
 				name: 'Group',
-				value: 'group'
+				value: 'group',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Coupon Code',
@@ -536,10 +536,10 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					'update'
+					'update',
 				],
 				updateBy: [
-					'couponCode'
+					'couponCode',
 				],
 				jsonParameters: [
 					false,
@@ -559,10 +559,10 @@ export const couponFields = [
 					'coupon',
 				],
 				operation: [
-					'update'
+					'update',
 				],
 				updateBy: [
-					'group'
+					'group',
 				],
 				jsonParameters: [
 					false,
@@ -626,8 +626,8 @@ export const couponFields = [
 					'update',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		default: {},
@@ -665,107 +665,107 @@ export const couponFields = [
 								options: [
 									{
 										name: 'ARS',
-										value: 'ARS'
+										value: 'ARS',
 									},
 									{
 										name: 'AUD',
-										value: 'AUD'
+										value: 'AUD',
 									},
 									{
 										name: 'BRL',
-										value: 'BRL'
+										value: 'BRL',
 									},
 									{
 										name: 'CAD',
-										value: 'CAD'
+										value: 'CAD',
 									},
 									{
 										name: 'CHF',
-										value: 'CHF'
+										value: 'CHF',
 									},
 									{
 										name: 'CNY',
-										value: 'CNY'
+										value: 'CNY',
 									},
 									{
 										name: 'CZK',
-										value: 'CZK'
+										value: 'CZK',
 									},
 									{
 										name: 'DKK',
-										value: 'DKK'
+										value: 'DKK',
 									},
 									{
 										name: 'EUR',
-										value: 'EUR'
+										value: 'EUR',
 									},
 									{
 										name: 'GBP',
-										value: 'GBP'
+										value: 'GBP',
 									},
 									{
 										name: 'HKD',
-										value: 'HKD'
+										value: 'HKD',
 									},
 									{
 										name: 'HUF',
-										value: 'HUF'
+										value: 'HUF',
 									},
 									{
 										name: 'INR',
-										value: 'INR'
+										value: 'INR',
 									},
 									{
 										name: 'JPY',
-										value: 'JPY'
+										value: 'JPY',
 									},
 									{
 										name: 'KRW',
-										value: 'KRW'
+										value: 'KRW',
 									},
 									{
 										name: 'MXN',
-										value: 'MXN'
+										value: 'MXN',
 									},
 									{
 										name: 'NOK',
-										value: 'NOK'
+										value: 'NOK',
 									},
 									{
 										name: 'NZD',
-										value: 'NZD'
+										value: 'NZD',
 									},
 									{
 										name: 'PLN',
-										value: 'PLN'
+										value: 'PLN',
 									},
 									{
 										name: 'RUB',
-										value: 'RUB'
+										value: 'RUB',
 									},
 									{
 										name: 'SEK',
-										value: 'SEK'
+										value: 'SEK',
 									},
 									{
 										name: 'SGD',
-										value: 'SGD'
+										value: 'SGD',
 									},
 									{
 										name: 'THB',
-										value: 'THB'
+										value: 'THB',
 									},
 									{
 										name: 'TWD',
-										value: 'TWD'
+										value: 'TWD',
 									},
 									{
 										name: 'USD',
-										value: 'USD'
+										value: 'USD',
 									},
 									{
 										name: 'ZAR',
-										value: 'ZAR'
+										value: 'ZAR',
 									},
 								],
 							},
@@ -783,7 +783,7 @@ export const couponFields = [
 									},
 								},
 								typeOptions: {
-									minValue: 0
+									minValue: 0,
 								},
 							},
 							{
@@ -801,7 +801,7 @@ export const couponFields = [
 								},
 								typeOptions: {
 									minValue: 0,
-									maxValue: 100
+									maxValue: 100,
 								},
 							},
 							{
@@ -813,13 +813,13 @@ export const couponFields = [
 								options: [
 									{
 										name: 'Flat',
-										value: 'flat'
+										value: 'flat',
 									},
 									{
 										name: 'Percentage',
-										value: 'percentage'
+										value: 'percentage',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -845,7 +845,7 @@ export const couponFields = [
 				type: 'string',
 				typeOptions: {
 					minValue: 1,
-					maxValue: 50
+					maxValue: 50,
 				},
 				default: '',
 				description: 'New group name to move coupon to.',
diff --git a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
index 243dc56ff..72ae1d6a2 100644
--- a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
@@ -4,9 +4,9 @@ import {
 
 import {
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
 
@@ -24,11 +24,11 @@ export async function paddleApiRequest(this: IHookFunctions | IExecuteFunctions
 	const options: OptionsWithUri = {
 		method,
 		headers: {
-			'content-type': 'application/json'
+			'content-type': 'application/json',
 		},
 		uri: `https://vendors.paddle.com/api${endpoint}`,
 		body,
-		json: true
+		json: true,
 	};
 
 	body['vendor_id'] = credentials.vendorId;
@@ -58,8 +58,9 @@ export async function paddleApiRequestAllItems(this: IHookFunctions | IExecuteFu
 	do {
 		responseData = await paddleApiRequest.call(this, endpoint, method, body, query);
 		returnData.push.apply(returnData, responseData[propertyName]);
+		body.page++;
 	} while (
-		responseData[propertyName].length !== 0
+		responseData[propertyName].length !== 0 && responseData[propertyName].length === body.results_per_page
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Paddle/OrderDescription.ts b/packages/nodes-base/nodes/Paddle/OrderDescription.ts
index d4afd8f7c..f9d6c9859 100644
--- a/packages/nodes-base/nodes/Paddle/OrderDescription.ts
+++ b/packages/nodes-base/nodes/Paddle/OrderDescription.ts
@@ -19,7 +19,7 @@ export const orderOperations = [
 				name: 'Get',
 				value: 'get',
 				description: 'Get an order',
-			}
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform.',
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index 94e1246f4..a72526fe5 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
@@ -121,7 +121,7 @@ export class Paddle implements INodeType {
 			// ...orderFields,
 			// USER
 			...userOperations,
-			...userFields
+			...userFields,
 		],
 	};
 
@@ -177,7 +177,7 @@ export class Paddle implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -210,7 +210,7 @@ export class Paddle implements INodeType {
 						const discountAmount = this.getNodeParameter('discountAmount', i) as number;
 
 						if (couponType === 'product') {
-							body.product_ids = (this.getNodeParameter('productIds', i) as string[]).join();
+							body.product_ids = this.getNodeParameter('productIds', i) as string;
 						}
 
 						if (discountType === 'flat') {
@@ -253,7 +253,7 @@ export class Paddle implements INodeType {
 						const endpoint = '/2.1/product/create_coupon';
 
 						responseData = await paddleApiRequest.call(this, endpoint, 'POST', body);
-						responseData = responseData.response.coupon_codes;
+						responseData = responseData.response.coupon_codes.map((coupon : string) => ({coupon}));
 					}
 				}
 
diff --git a/packages/nodes-base/nodes/Paddle/PaymentDescription.ts b/packages/nodes-base/nodes/Paddle/PaymentDescription.ts
index b2020d4f5..3a4c5a44a 100644
--- a/packages/nodes-base/nodes/Paddle/PaymentDescription.ts
+++ b/packages/nodes-base/nodes/Paddle/PaymentDescription.ts
@@ -24,7 +24,7 @@ export const paymentOperations = [
 				name: 'Reschedule',
 				value: 'reschedule',
 				description: 'Reschedule payment.',
-			}
+			},
 		],
 		default: 'getAll',
 		description: 'The operation to perform.',
@@ -130,8 +130,8 @@ export const paymentFields = [
 					'getAll',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		default: {},
@@ -180,21 +180,21 @@ export const paymentFields = [
 				options: [
 					{
 						name: 'Active',
-						value: 'active'
+						value: 'active',
 					},
 					{
 						name: 'Past Due',
-						value: 'past_due'
+						value: 'past_due',
 					},
 					{
 						name: 'Paused',
-						value: 'paused'
+						value: 'paused',
 					},
 					{
 						name: 'Trialing',
-						value: 'trialing'
+						value: 'trialing',
 					},
-				]
+				],
 			},
 			{
 				displayName: 'One off charge',
diff --git a/packages/nodes-base/nodes/Paddle/PlanDescription.ts b/packages/nodes-base/nodes/Paddle/PlanDescription.ts
index 152db9a7f..8df2edda3 100644
--- a/packages/nodes-base/nodes/Paddle/PlanDescription.ts
+++ b/packages/nodes-base/nodes/Paddle/PlanDescription.ts
@@ -24,7 +24,7 @@ export const planOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all plans.',
-			}
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform.',
diff --git a/packages/nodes-base/nodes/Paddle/ProductDescription.ts b/packages/nodes-base/nodes/Paddle/ProductDescription.ts
index 9a627a86e..2db617ec8 100644
--- a/packages/nodes-base/nodes/Paddle/ProductDescription.ts
+++ b/packages/nodes-base/nodes/Paddle/ProductDescription.ts
@@ -19,7 +19,7 @@ export const productOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all products.',
-			}
+			},
 		],
 		default: 'getAll',
 		description: 'The operation to perform.',
diff --git a/packages/nodes-base/nodes/Paddle/UserDescription.ts b/packages/nodes-base/nodes/Paddle/UserDescription.ts
index 50b1a9295..b135ac693 100644
--- a/packages/nodes-base/nodes/Paddle/UserDescription.ts
+++ b/packages/nodes-base/nodes/Paddle/UserDescription.ts
@@ -19,7 +19,7 @@ export const userOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all users',
-			}
+			},
 		],
 		default: 'getAll',
 		description: 'The operation to perform.',
@@ -55,7 +55,7 @@ export const userFields = [
 		required: true,
 		typeOptions: {
 			minValue: 1,
-			maxValue: 200
+			maxValue: 200,
 		},
 		displayOptions: {
 			show: {
@@ -66,8 +66,8 @@ export const userFields = [
 					'getAll',
 				],
 				returnAll: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		description: 'Number of subscription records to return per page.',
@@ -126,8 +126,8 @@ export const userFields = [
 					'getAll',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		default: {},
@@ -155,21 +155,21 @@ export const userFields = [
 				options: [
 					{
 						name: 'Active',
-						value: 'active'
+						value: 'active',
 					},
 					{
 						name: 'Past Due',
-						value: 'past_due'
+						value: 'past_due',
 					},
 					{
 						name: 'Paused',
-						value: 'paused'
+						value: 'paused',
 					},
 					{
 						name: 'Trialing',
-						value: 'trialing'
+						value: 'trialing',
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Paddle/paddle.png b/packages/nodes-base/nodes/Paddle/paddle.png
index 80426ca92..91576d20d 100644
Binary files a/packages/nodes-base/nodes/Paddle/paddle.png and b/packages/nodes-base/nodes/Paddle/paddle.png differ
diff --git a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
index f4832b923..2ca0ce625 100644
--- a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
@@ -23,7 +23,7 @@ export async function pagerDutyApiRequest(this: IExecuteFunctions | IWebhookFunc
 
 	const options: OptionsWithUri = {
 		headers: {
-			Accept: 'application/vnd.pagerduty+json;version=2'
+			Accept: 'application/vnd.pagerduty+json;version=2',
 		},
 		method,
 		body,
diff --git a/packages/nodes-base/nodes/PagerDuty/IncidentDescription.ts b/packages/nodes-base/nodes/PagerDuty/IncidentDescription.ts
index 10c4e4b13..200fdf87b 100644
--- a/packages/nodes-base/nodes/PagerDuty/IncidentDescription.ts
+++ b/packages/nodes-base/nodes/PagerDuty/IncidentDescription.ts
@@ -205,7 +205,7 @@ export const incidentFields = [
 						type: 'string',
 						default: '',
 						description: 'An URL for the conference bridge. This could be a link to a web conference or Slack channel.',
-					}
+					},
 				],
 			},
 		],
@@ -226,7 +226,7 @@ export const incidentFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the incident.',
@@ -634,7 +634,7 @@ export const incidentFields = [
 						type: 'string',
 						default: '',
 						description: 'An URL for the conference bridge. This could be a link to a web conference or Slack channel.',
-					}
+					},
 				],
 			},
 		],
diff --git a/packages/nodes-base/nodes/PagerDuty/LogEntryDescription.ts b/packages/nodes-base/nodes/PagerDuty/LogEntryDescription.ts
index 7164d3121..8967cfa8d 100644
--- a/packages/nodes-base/nodes/PagerDuty/LogEntryDescription.ts
+++ b/packages/nodes-base/nodes/PagerDuty/LogEntryDescription.ts
@@ -48,7 +48,7 @@ export const logEntryFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the log entry.',
diff --git a/packages/nodes-base/nodes/PagerDuty/UserDescription.ts b/packages/nodes-base/nodes/PagerDuty/UserDescription.ts
index c5e93c7ca..b651a1bd9 100644
--- a/packages/nodes-base/nodes/PagerDuty/UserDescription.ts
+++ b/packages/nodes-base/nodes/PagerDuty/UserDescription.ts
@@ -43,7 +43,7 @@ export const userFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the user.',
diff --git a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
index b1b5a2091..82d3ebd34 100644
--- a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
@@ -1,12 +1,12 @@
 import { OptionsWithUri } from 'request';
 
 import {
+	BINARY_ENCODING,
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions,
 	IWebhookFunctions,
-	BINARY_ENCODING
 } from 'n8n-core';
 
 import {
@@ -25,7 +25,7 @@ export async function payPalApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs: query || {},
 		uri: uri || `${env}/v1${endpoint}`,
 		body,
-		json: true
+		json: true,
 	};
 	try {
 		return await this.helpers.request!(options);
@@ -67,7 +67,7 @@ async function getAccessToken(this: IHookFunctions | IExecuteFunctions | IExecut
 				grant_type: 'client_credentials',
 			},
 			uri: `${env}/v1/oauth2/token`,
-			json: true
+			json: true,
 		};
 	try {
 		return await this.helpers.request!(options);
diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.ts b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
index 2f1f00147..0fbc56d80 100644
--- a/packages/nodes-base/nodes/PayPal/PayPal.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
@@ -3,20 +3,21 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
-	payoutOperations,
-	payoutItemOperations,
 	payoutFields,
 	payoutItemFields,
+	payoutItemOperations,
+	payoutOperations,
 } from './PaymentDescription';
 import {
+	IAmount,
+	IItem,
 	IPaymentBatch,
 	ISenderBatchHeader,
-	IItem, IAmount,
 	RecipientType,
 	RecipientWallet,
  } from './PaymentInteface';
@@ -45,7 +46,7 @@ export class PayPal implements INodeType {
 			{
 				name: 'payPalApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
index 979af52e7..2962d9260 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
@@ -1,63 +1,63 @@
 import {
 	IHookFunctions,
 	IWebhookFunctions,
-  } from 'n8n-core';
+} from 'n8n-core';
 
-  import {
+import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
-  } from 'n8n-workflow';
-  import {
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+import {
 	payPalApiRequest,
 	upperFist
- } from './GenericFunctions';
+} from './GenericFunctions';
 
-  export class PayPalTrigger implements INodeType {
+export class PayPalTrigger implements INodeType {
 	description: INodeTypeDescription = {
-	  displayName: 'PayPal Trigger',
-	  name: 'payPalTrigger',
-	  icon: 'file:paypal.png',
-	  group: ['trigger'],
-	  version: 1,
-	  description: 'Handle PayPal events via webhooks',
-	  defaults: {
-		name: 'PayPal Trigger',
-		color: '#32325d',
-	  },
-	  inputs: [],
-	  outputs: ['main'],
-	  credentials: [
-			  {
-				  name: 'payPalApi',
-				  required: true,
-			  }
-		  ],
-	  webhooks: [
-		{
-		  name: 'default',
-		  httpMethod: 'POST',
-		  reponseMode: 'onReceived',
-		  path: 'webhook',
+		displayName: 'PayPal Trigger',
+		name: 'payPalTrigger',
+		icon: 'file:paypal.png',
+		group: ['trigger'],
+		version: 1,
+		description: 'Handle PayPal events via webhooks',
+		defaults: {
+			name: 'PayPal Trigger',
+			color: '#32325d',
 		},
-	  ],
-	  properties: [
-		{
-			displayName: 'Events',
-			name: 'events',
-			type: 'multiOptions',
-			required: true,
-			default: [],
-			description: 'The event to listen to.',
-			typeOptions: {
-				loadOptionsMethod: 'getEvents'
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'payPalApi',
+				required: true,
 			},
-			options: [],
-		},
-	  ],
+		],
+		webhooks: [
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				reponseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Events',
+				name: 'events',
+				type: 'multiOptions',
+				required: true,
+				default: [],
+				description: 'The event to listen to.',
+				typeOptions: {
+					loadOptionsMethod: 'getEvents',
+				},
+				options: [],
+			},
+		],
 	};
 
 	methods = {
@@ -70,7 +70,7 @@ import {
 						name: '*',
 						value: '*',
 						description: 'Any time any event is triggered (Wildcard Event).',
-					}
+					},
 				];
 				let events;
 				try {
@@ -126,7 +126,7 @@ import {
 					url: webhookUrl,
 					event_types: events.map(event => {
 						return { name: event };
-					 }),
+					}),
 				};
 				const endpoint = '/notifications/webhooks';
 				try {
@@ -157,7 +157,7 @@ import {
 				return true;
 			},
 		},
-	  };
+	};
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		let webhook;
@@ -168,10 +168,10 @@ import {
 		const endpoint = '/notifications/verify-webhook-signature';
 
 		if (headerData['PAYPAL-AUTH-ALGO'] !== undefined
-		&& headerData['PAYPAL-CERT-URL'] !== undefined
-		&& headerData['PAYPAL-TRANSMISSION-ID'] !== undefined
-		&& headerData['PAYPAL-TRANSMISSION-SIG'] !== undefined
-		&& headerData['PAYPAL-TRANSMISSION-TIME'] !== undefined) {
+			&& headerData['PAYPAL-CERT-URL'] !== undefined
+			&& headerData['PAYPAL-TRANSMISSION-ID'] !== undefined
+			&& headerData['PAYPAL-TRANSMISSION-SIG'] !== undefined
+			&& headerData['PAYPAL-TRANSMISSION-TIME'] !== undefined) {
 			const body = {
 				auth_algo: headerData['PAYPAL-AUTH-ALGO'],
 				cert_url: headerData['PAYPAL-CERT-URL'],
@@ -194,8 +194,8 @@ import {
 		}
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
-  }
+}
diff --git a/packages/nodes-base/nodes/PayPal/PaymentDescription.ts b/packages/nodes-base/nodes/PayPal/PaymentDescription.ts
index 13a74cea6..af9d12faa 100644
--- a/packages/nodes-base/nodes/PayPal/PaymentDescription.ts
+++ b/packages/nodes-base/nodes/PayPal/PaymentDescription.ts
@@ -62,11 +62,11 @@ export const payoutFields = [
 		displayOptions: {
 			show: {
 				resource: [
-					'payout'
+					'payout',
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 	},
@@ -84,8 +84,8 @@ export const payoutFields = [
 					'create',
 				],
 				jsonParameters: [
-					false
-				]
+					false,
+				],
 			},
 		},
 		typeOptions: {
@@ -136,32 +136,32 @@ export const payoutFields = [
 						options: [
 							{
 								name: 'Australian dollar',
-								value: 'AUD'
+								value: 'AUD',
 							},
 							{
 								name: 'Brazilian real',
-								value: 'BRL'
+								value: 'BRL',
 							},
 							{
 								name: 'Canadian dollar',
-								value: 'CAD'
+								value: 'CAD',
 							},
 							{
 								name: 'Czech koruna',
-								value: 'CZK'
+								value: 'CZK',
 							},
 							{
 								name: 'Danish krone',
-								value: 'DKK'
+								value: 'DKK',
 							},
 							{
 								name: 'Euro',
-								value: 'EUR'
+								value: 'EUR',
 							},
 							{
 								name: 'United States dollar',
-								value: 'USD'
-							}
+								value: 'USD',
+							},
 						],
 						default: 'USD',
 						description: 'Currency',
@@ -208,7 +208,7 @@ export const payoutFields = [
 						default: 'paypal',
 						description: 'The recipient wallet',
 					},
-				]
+				],
 			},
 		],
 	},
@@ -223,14 +223,14 @@ export const payoutFields = [
 		displayOptions: {
 			show: {
 				resource: [
-					'payout'
+					'payout',
 				],
 				operation: [
 					'create',
 				],
 				jsonParameters: [
 					true,
-				]
+				],
 			},
 		},
 	},
@@ -319,7 +319,7 @@ export const payoutFields = [
 		type: 'number',
 		typeOptions: {
 			maxValue: 1000,
-			minValue: 1
+			minValue: 1,
 		},
 		default: 100,
 		displayOptions: {
diff --git a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
index 73b1e1b7a..352777632 100644
--- a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
@@ -20,7 +20,7 @@ export async function philipsHueApiRequest(this: IExecuteFunctions | ILoadOption
 		body,
 		qs,
 		uri: uri || `https://api.meethue.com${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		if (Object.keys(headers).length !== 0) {
@@ -44,7 +44,7 @@ export async function philipsHueApiRequest(this: IExecuteFunctions | ILoadOption
 
 			// Try to return the error prettier
 			throw new Error(
-				`Philip Hue error response [${error.statusCode}]: ${errorMessage}`
+				`Philip Hue error response [${error.statusCode}]: ${errorMessage}`,
 			);
 		}
 		throw error;
diff --git a/packages/nodes-base/nodes/PhilipsHue/LightDescription.ts b/packages/nodes-base/nodes/PhilipsHue/LightDescription.ts
index 0dc4ab892..cdf511851 100644
--- a/packages/nodes-base/nodes/PhilipsHue/LightDescription.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/LightDescription.ts
@@ -34,11 +34,11 @@ export const lightOperations = [
 				name: 'Update',
 				value: 'update',
 				description: 'Update an light',
-			}
+			},
 		],
 		default: 'update',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const lightFields = [
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index 27189d4b3..cbd832158 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -4,21 +4,21 @@ import {
 
 import {
 	IDataObject,
-	INodeExecutionData,
-	INodeTypeDescription,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
-	philipsHueApiRequest,
 	getUser,
+	philipsHueApiRequest,
 } from './GenericFunctions';
 
 import {
-	lightOperations,
 	lightFields,
+	lightOperations,
 } from './LightDescription';
 
 export class PhilipsHue implements INodeType {
@@ -66,7 +66,7 @@ export class PhilipsHue implements INodeType {
 			// Get all the lights to display them to user so that he can
 			// select them easily
 			async getLights(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 
@@ -82,12 +82,12 @@ export class PhilipsHue implements INodeType {
 					const lightId = light;
 					returnData.push({
 						name: lightName,
-						value: lightId
+						value: lightId,
 					});
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/PhilipsHue/philipshue.png b/packages/nodes-base/nodes/PhilipsHue/philipshue.png
index a59b33ef8..980638a92 100644
Binary files a/packages/nodes-base/nodes/PhilipsHue/philipshue.png and b/packages/nodes-base/nodes/PhilipsHue/philipshue.png differ
diff --git a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
index 17033eaf7..9122baf01 100644
--- a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
@@ -34,7 +34,7 @@ export interface ICustomProperties {
  * @param {object} body
  * @returns {Promise<any>}
  */
-export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject, formData?: IDataObject, downloadFile?: boolean): Promise<any> { // tslint:disable-line:no-any
+export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: IDataObject, query: IDataObject = {}, formData?: IDataObject, downloadFile?: boolean): Promise<any> { // tslint:disable-line:no-any
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
 	const options: OptionsWithUri = {
@@ -67,7 +67,7 @@ export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctio
 	let responseData;
 
 	try {
-		if (authenticationMethod === 'basicAuth' || authenticationMethod === 'apiToken') {
+		if (authenticationMethod === 'basicAuth' || authenticationMethod === 'apiToken' || authenticationMethod === 'none') {
 
 			const credentials = this.getCredentials('pipedriveApi');
 			if (credentials === undefined) {
@@ -158,7 +158,7 @@ export async function pipedriveApiRequestAllItems(this: IHookFunctions | IExecut
 	);
 
 	return {
-		data: returnData
+		data: returnData,
 	};
 }
 
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index 919558e70..e18f0448c 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -5,10 +5,10 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
-	INodeType,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -90,7 +90,7 @@ export class Pipedrive implements INodeType {
 				options: [
 					{
 						name: 'API Token',
-						value: 'apiToken'
+						value: 'apiToken',
 					},
 					{
 						name: 'OAuth2',
@@ -591,7 +591,7 @@ export class Pipedrive implements INodeType {
 										default: '',
 										description: 'Value of the property to set.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -631,7 +631,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'get'
+							'get',
 						],
 						resource: [
 							'activity',
@@ -653,7 +653,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 						resource: [
 							'activity',
@@ -672,7 +672,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 						resource: [
 							'activity',
@@ -782,7 +782,7 @@ export class Pipedrive implements INodeType {
 										default: '',
 										description: 'Value of the property to set.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -964,7 +964,7 @@ export class Pipedrive implements INodeType {
 										default: '',
 										description: 'Value of the property to set.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -1025,7 +1025,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'get'
+							'get',
 						],
 						resource: [
 							'deal',
@@ -1047,7 +1047,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 						resource: [
 							'deal',
@@ -1066,7 +1066,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 						resource: [
 							'deal',
@@ -1206,7 +1206,7 @@ export class Pipedrive implements INodeType {
 										default: '',
 										description: 'Value of the property to set.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -1231,7 +1231,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'create'
+							'create',
 						],
 						resource: [
 							'file',
@@ -1349,7 +1349,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'download'
+							'download',
 						],
 						resource: [
 							'file',
@@ -1369,7 +1369,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'get'
+							'get',
 						],
 						resource: [
 							'file',
@@ -1420,6 +1420,7 @@ export class Pipedrive implements INodeType {
 					show: {
 						operation: [
 							'create',
+							'getAll',
 						],
 						resource: [
 							'note',
@@ -1484,7 +1485,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'get'
+							'get',
 						],
 						resource: [
 							'note',
@@ -1506,7 +1507,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 						resource: [
 							'note',
@@ -1525,7 +1526,7 @@ export class Pipedrive implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'update'
+							'update',
 						],
 						resource: [
 							'note',
@@ -1658,7 +1659,7 @@ export class Pipedrive implements INodeType {
 										default: '',
 										description: 'Value of the property to set.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -1826,7 +1827,7 @@ export class Pipedrive implements INodeType {
 										default: '',
 										description: 'Value of the property to set.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -1996,7 +1997,7 @@ export class Pipedrive implements INodeType {
 										default: '',
 										description: 'Value of the property to set.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -2205,6 +2206,51 @@ export class Pipedrive implements INodeType {
 					},
 				],
 			},
+
+			// ----------------------------------
+			//         note:create/getAll
+			// ----------------------------------
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				displayOptions: {
+					show: {
+						operation: [
+							'create',
+							'getAll',
+						],
+						resource: [
+							'note',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Deal ID',
+						name: 'deal_id',
+						type: 'number',
+						default: 0,
+						description: 'ID of the deal this note will be associated with',
+					},
+					{
+						displayName: 'Organization ID',
+						name: 'org_id',
+						type: 'number',
+						default: 0,
+						description: 'ID of the organization this note will be associated with.',
+					},
+					{
+						displayName: 'Person ID',
+						name: 'person_id',
+						type: 'number',
+						default: 0,
+						description: 'ID of the person this note will be associated with.',
+					},
+				],
+			},
 		],
 	};
 
@@ -2225,7 +2271,7 @@ export class Pipedrive implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 
@@ -2439,7 +2485,7 @@ export class Pipedrive implements INodeType {
 						options: {
 							contentType: item.binary[binaryPropertyName].mimeType,
 							filename: item.binary[binaryPropertyName].fileName,
-						}
+						},
 					};
 
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
@@ -2516,13 +2562,14 @@ export class Pipedrive implements INodeType {
 					// ----------------------------------
 
 					requestMethod = 'GET';
+					endpoint = `/notes`;
 
 					returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					if (returnAll === false) {
 						qs.limit = this.getNodeParameter('limit', i) as number;
 					}
-
-					endpoint = `/notes`;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					addAdditionalFields(qs, additionalFields);
 
 				} else if (operation === 'update') {
 					// ----------------------------------
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index 06aa9c923..e212fb0fe 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -4,8 +4,8 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -83,11 +83,11 @@ export class PipedriveTrigger implements INodeType {
 				options: [
 					{
 						name: 'Basic Auth',
-						value: 'basicAuth'
+						value: 'basicAuth',
 					},
 					{
 						name: 'None',
-						value: 'none'
+						value: 'none',
 					},
 				],
 				default: 'none',
@@ -106,22 +106,22 @@ export class PipedriveTrigger implements INodeType {
 					{
 						name: 'Added',
 						value: 'added',
-						description: 'Data got added'
+						description: 'Data got added',
 					},
 					{
 						name: 'Deleted',
 						value: 'deleted',
-						description: 'Data got deleted'
+						description: 'Data got deleted',
 					},
 					{
 						name: 'Merged',
 						value: 'merged',
-						description: 'Data got merged'
+						description: 'Data got merged',
 					},
 					{
 						name: 'Updated',
 						value: 'updated',
-						description: 'Data got updated'
+						description: 'Data got updated',
 					},
 				],
 				default: '*',
@@ -187,12 +187,13 @@ export class PipedriveTrigger implements INodeType {
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+
 				const webhookData = this.getWorkflowStaticData('node');
 
-				if (webhookData.webhookId === undefined) {
-					// No webhook id is set so no webhook can exist
-					return false;
-				}
+				const eventAction = this.getNodeParameter('action') as string;
+
+				const eventObject = this.getNodeParameter('object') as string;
 
 				// Webhook got created before so check if it still exists
 				const endpoint = `/webhooks`;
@@ -204,8 +205,11 @@ export class PipedriveTrigger implements INodeType {
 				}
 
 				for (const existingData of responseData.data) {
-					if (existingData.id === webhookData.webhookId) {
+					if (existingData.subscription_url === webhookUrl
+						&& existingData.event_action === eventAction
+						&& existingData.event_object === eventObject) {
 						// The webhook exists already
+						webhookData.webhookId = existingData.id;
 						return true;
 					}
 				}
@@ -215,7 +219,6 @@ export class PipedriveTrigger implements INodeType {
 			async create(this: IHookFunctions): Promise<boolean> {
 				const webhookUrl = this.getNodeWebhookUrl('default');
 				const authentication = this.getNodeParameter('authentication', 0) as string;
-
 				const eventAction = this.getNodeParameter('action') as string;
 				const eventObject = this.getNodeParameter('object') as string;
 
@@ -308,7 +311,7 @@ export class PipedriveTrigger implements INodeType {
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
index 0e7f73827..eaeebe313 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
@@ -105,11 +105,14 @@ export async function pgUpdate(
 	items: INodeExecutionData[],
 ): Promise<IDataObject[]> {
 	const table = getNodeParam('table', 0) as string;
+	const schema = getNodeParam('schema', 0) as string;
 	const updateKey = getNodeParam('updateKey', 0) as string;
 	const columnString = getNodeParam('columns', 0) as string;
 
 	const columns = columnString.split(',').map(column => column.trim());
 
+	const te = new pgp.helpers.TableName({ table, schema });
+
 	// Make sure that the updateKey does also get queried
 	if (!columns.includes(updateKey)) {
 		columns.unshift(updateKey);
@@ -120,7 +123,7 @@ export async function pgUpdate(
 
 	// Generate the multi-row update query
 	const query =
-		pgp.helpers.update(updateItems, columns, table) + ' WHERE v.' + updateKey + ' = t.' + updateKey;
+		pgp.helpers.update(updateItems, columns, te) + ' WHERE v.' + updateKey + ' = t.' + updateKey;
 
 	// Executing the query to update the data
 	await db.none(query);
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 7c706a0fc..162851084 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -136,6 +136,19 @@ export class Postgres implements INodeType {
 			// ----------------------------------
 			//         update
 			// ----------------------------------
+			{
+				displayName: 'Schema',
+				name: 'schema',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['update'],
+					},
+				},
+				default: 'public',
+				required: true,
+				description: 'Name of the schema the table belongs to',
+			},
 			{
 				displayName: 'Table',
 				name: 'table',
diff --git a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
index df1e3a1f0..5b03ebf26 100644
--- a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
@@ -25,12 +25,12 @@ export async function postmarkApiRequest(this: IExecuteFunctions | IWebhookFunct
 		headers: {
 			'Content-Type': 'application/json',
 			'Accept': 'application/json',
-			'X-Postmark-Server-Token' : credentials.serverToken
+			'X-Postmark-Server-Token' : credentials.serverToken,
 		},
 		method,
 		body,
 		uri: 'https://api.postmarkapp.com' + endpoint,
-		json: true
+		json: true,
 	};
 	if (body === {}) {
 		delete options.body;
diff --git a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
index 4956d647b..e6d86b515 100644
--- a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
@@ -4,8 +4,8 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -124,11 +124,17 @@ export class PostmarkTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 				const webhookUrl = this.getNodeWebhookUrl('default');
 				const events = this.getNodeParameter('events') as string[];
-				if (this.getNodeParameter('includeContent') as boolean) {
-					events.push('includeContent');
+
+				if (events.includes('bounce') || events.includes('spamComplaint')) {
+					if (this.getNodeParameter('includeContent') as boolean) {
+						events.push('includeContent');
+					}
 				}
-				if (this.getNodeParameter('firstOpen') as boolean) {
-					events.push('firstOpen');
+
+				if (events.includes('open')) {
+					if (this.getNodeParameter('firstOpen') as boolean) {
+						events.push('firstOpen');
+					}
 				}
 
 				// Get all webhooks
@@ -163,26 +169,26 @@ export class PostmarkTrigger implements INodeType {
 					Triggers: {
 						Open:{
 							Enabled: false,
-							PostFirstOpenOnly: false
+							PostFirstOpenOnly: false,
 						},
 						Click:{
-							Enabled: false
+							Enabled: false,
 						},
 						Delivery:{
-							Enabled: false
+							Enabled: false,
 						},
 						Bounce:{
 							Enabled: false,
-							IncludeContent: false
+							IncludeContent: false,
 						},
 						SpamComplaint:{
 							Enabled: false,
-							IncludeContent: false
+							IncludeContent: false,
 						},
 						SubscriptionChange: {
-							Enabled: false
-						}
-					}
+							Enabled: false,
+						},
+					},
 				};
 
 				const events = this.getNodeParameter('events') as string[];
@@ -249,7 +255,7 @@ export class PostmarkTrigger implements INodeType {
 		const req = this.getRequestObject();
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
new file mode 100644
index 000000000..1708288a3
--- /dev/null
+++ b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
@@ -0,0 +1,51 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function pushoverApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const credentials = this.getCredentials('pushoverApi') as IDataObject;
+
+	if (method === 'GET') {
+		qs.token = credentials.apiKey;
+	} else {
+		body.token = credentials.apiKey as string;
+	}
+
+	const options: OptionsWithUri = {
+		method,
+		formData: body,
+		qs,
+		uri: `https://api.pushover.net/1${path}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		//@ts-ignore
+		return await this.helpers.request.call(this, options);
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.errors) {
+
+			let errors = error.response.body.errors;
+
+			errors = errors.map((e: IDataObject) => e);
+			// Try to return the error prettier
+			throw new Error(
+				`PushOver error response [${error.statusCode}]: ${errors.join('|')}`,
+			);
+		}
+		throw error;
+	}
+}
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
new file mode 100644
index 000000000..3d290ecf0
--- /dev/null
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -0,0 +1,395 @@
+import {
+	BINARY_ENCODING,
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IBinaryData,
+	IBinaryKeyData,
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	pushoverApiRequest,
+} from './GenericFunctions';
+
+export class Pushover implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Pushover',
+		name: 'pushover',
+		icon: 'file:pushover.png',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Pushover API.',
+		defaults: {
+			name: 'Pushover',
+			color: '#4b9cea',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'pushoverApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Message',
+						value: 'message',
+					},
+				],
+				default: 'message',
+				description: 'The resource to operate on.',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'message',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Push',
+						value: 'push',
+					},
+				],
+				default: 'push',
+				description: 'The resource to operate on.',
+			},
+			{
+				displayName: 'User Key',
+				name: 'userKey',
+				type: 'string',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'message',
+						],
+						operation: [
+							'push',
+						],
+					},
+				},
+				default: '',
+				description: `The user/group key (not e-mail address) of your user (or you),<br>
+				viewable when logged into our <a href="https://pushover.net/" target="_blank">dashboard</a> (often referred to as USER_KEY in our <a href="https://support.pushover.net/i44-example-code-and-pushover-libraries" target="_blank"></a> and code examples)`,
+			},
+			{
+				displayName: 'Message',
+				name: 'message',
+				type: 'string',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'message',
+						],
+						operation: [
+							'push',
+						],
+					},
+				},
+				default: '',
+				description: `Your message`,
+			},
+			{
+				displayName: 'Priority',
+				name: 'priority',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'message',
+						],
+						operation: [
+							'push',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Lowest Priority',
+						value: -2,
+					},
+					{
+						name: 'Low Priority',
+						value: -1,
+					},
+					{
+						name: 'Normal Priority',
+						value: 0,
+					},
+					{
+						name: 'High Priority',
+						value: 1,
+					},
+					{
+						name: 'Emergency Priority',
+						value: 2,
+					},
+				],
+				default: -2,
+				description: `send as -2 to generate no notification/alert,<br>
+				-1 to always send as a quiet notification,<br>
+				1 to display as high-priority and bypass the user's quiet hours, or<br>
+				2 to also require confirmation from the user`,
+			},
+			{
+				displayName: 'Retry (seconds)',
+				name: 'retry',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'message',
+						],
+						operation: [
+							'push',
+						],
+						priority: [
+							2,
+						],
+					},
+				},
+				default: 30,
+				description: `Specifies how often (in seconds) the Pushover servers will send the same notification to the user.<br>
+				This parameter must have a value of at least 30 seconds between retries.`,
+			},
+			{
+				displayName: 'Expire (seconds)',
+				name: 'expire',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+					maxValue: 10800,
+				},
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'message',
+						],
+						operation: [
+							'push',
+						],
+						priority: [
+							2,
+						],
+					},
+				},
+				default: 30,
+				description: `Specifies how many seconds your notification will continue to be retried for (every retry seconds)`,
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				displayOptions: {
+					show: {
+						resource: [
+							'message',
+						],
+						operation: [
+							'push',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Attachment',
+						name: 'attachmentsUi',
+						placeholder: 'Add Attachments',
+						type: 'fixedCollection',
+						typeOptions: {
+							multipleValues: false,
+						},
+						options: [
+							{
+								name: 'attachmentsValues',
+								displayName: 'Attachment Property',
+								values: [
+									{
+										displayName: 'Binary Property',
+										name: 'binaryPropertyName',
+										type: 'string',
+										default: '',
+										placeholder: 'data',
+										description: 'Name of the binary properties which contain data which should be added to email as attachment',
+									},
+								],
+							},
+						],
+						default: '',
+					},
+					{
+						displayName: 'Device',
+						name: 'device',
+						type: 'string',
+						default: '',
+						description: `Your user's device name to send the message directly to that device,<br>
+						rather than all of the user's devices (multiple devices may be separated by a comma)`,
+					},
+					{
+						displayName: 'Sound',
+						name: 'sound',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getSounds',
+						},
+						default: '',
+						description: `The name of one of the sounds supported by device clients to override the user's default sound choice`,
+					},
+					{
+						displayName: 'Title',
+						name: 'title',
+						type: 'string',
+						default: '',
+						description: `Your message's title, otherwise your app's name is used`,
+					},
+					{
+						displayName: 'Timestamp',
+						name: 'timestamp',
+						type: 'dateTime',
+						default: '',
+						description: `A Unix timestamp of your message's date and time to display to the user, rather than the time your message is received by our API`,
+					},
+					{
+						displayName: 'URL',
+						name: 'url',
+						type: 'string',
+						default: '',
+						description: `a supplementary URL to show with your message`,
+					},
+					{
+						displayName: 'URL Title',
+						name: 'url_title',
+						type: 'string',
+						default: '',
+						description: `A title for your supplementary URL, otherwise just the URL is shown`,
+					},
+				],
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getSounds(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const { sounds } = await pushoverApiRequest.call(this, 'GET', '/sounds.json', {});
+				const returnData: INodePropertyOptions[] = [];
+				for (const key of Object.keys(sounds)) {
+					returnData.push({
+						name: sounds[key],
+						value: key,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+
+			if (resource === 'message') {
+				if (operation === 'push') {
+					const userKey = this.getNodeParameter('userKey', i) as string;
+
+					const message = this.getNodeParameter('message', i) as string;
+
+					const priority = this.getNodeParameter('priority', i) as number;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						user: userKey,
+						message,
+						priority,
+					};
+
+					if (priority === 2) {
+						body.retry = this.getNodeParameter('retry', i) as number;
+
+						body.expire = this.getNodeParameter('expire', i) as number;
+					}
+
+					Object.assign(body, additionalFields);
+
+					if (body.attachmentsUi) {
+						const attachment = (body.attachmentsUi as IDataObject).attachmentsValues as IDataObject;
+
+						if (attachment) {
+
+							const binaryPropertyName = attachment.binaryPropertyName as string;
+
+							if (items[i].binary === undefined) {
+								throw new Error('No binary data exists on item!');
+							}
+
+							const item = items[i].binary as IBinaryKeyData;
+
+							const binaryData = item[binaryPropertyName] as IBinaryData;
+
+							if (binaryData === undefined) {
+								throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							}
+
+							body.attachment = {
+								value: Buffer.from(binaryData.data, BINARY_ENCODING),
+								options: {
+									filename: binaryData.fileName,
+								},
+							};
+
+							delete body.attachmentsUi;
+						}
+					}
+
+					responseData = await pushoverApiRequest.call(
+						this,
+						'POST',
+						`/messages.json`,
+						body,
+					);
+				}
+			}
+		}
+		if (Array.isArray(responseData)) {
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+		} else if (responseData !== undefined) {
+			returnData.push(responseData as IDataObject);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Pushover/pushover.png b/packages/nodes-base/nodes/Pushover/pushover.png
new file mode 100644
index 000000000..6eb277a25
Binary files /dev/null and b/packages/nodes-base/nodes/Pushover/pushover.png differ
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index dbdfd6445..15e7bcb2a 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -45,7 +45,7 @@ export class QuestDb implements INodeType {
 						name: 'Insert',
 						value: 'insert',
 						description: 'Insert rows in database.',
-					}
+					},
 				],
 				default: 'insert',
 				description: 'The operation to perform.',
diff --git a/packages/nodes-base/nodes/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile.node.ts
index 8bf1a8a84..ee38fc0cd 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile.node.ts
@@ -1,8 +1,8 @@
 import { IExecuteSingleFunctions } from 'n8n-core';
 import {
 	INodeExecutionData,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -45,7 +45,7 @@ export class ReadBinaryFile implements INodeType {
 				required: true,
 				description: 'Name of the binary property to which to<br />write the data of the read file.',
 			},
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
index 1533286f7..4e8d9f2ac 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
@@ -47,7 +47,7 @@ export class ReadBinaryFiles implements INodeType {
 				required: true,
 				description: 'Name of the binary property to which to<br />write the data of the read files.',
 			},
-		]
+		],
 	};
 
 
@@ -67,7 +67,7 @@ export class ReadBinaryFiles implements INodeType {
 			fileName = path.parse(filePath).base;
 			item = {
 				binary: {
-					[dataPropertyName]: await this.helpers.prepareBinaryData(data, fileName)
+					[dataPropertyName]: await this.helpers.prepareBinaryData(data, fileName),
 				},
 				json: {},
 			};
diff --git a/packages/nodes-base/nodes/ReadPdf.node.ts b/packages/nodes-base/nodes/ReadPdf.node.ts
index 2d41583c8..785683b8a 100644
--- a/packages/nodes-base/nodes/ReadPdf.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf.node.ts
@@ -34,7 +34,7 @@ export class ReadPdf implements INodeType {
 				required: true,
 				description: 'Name of the binary property from which to<br />read the PDF file.',
 			},
-		]
+		],
 	};
 
 
@@ -52,7 +52,7 @@ export class ReadPdf implements INodeType {
 
 		return {
 			binary: item.binary,
-			json: await pdf(binaryData)
+			json: await pdf(binaryData),
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index 12263b1d6..f7b1bd0bd 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -19,7 +19,7 @@ export class Redis implements INodeType {
 		icon: 'file:redis.png',
 		group: ['input'],
 		version: 1,
-		description: 'Gets, sends data to Redis and receives generic information.',
+		description: 'Get, send and update data in Redis.',
 		defaults: {
 			name: 'Redis',
 			color: '#0033AA',
@@ -30,7 +30,7 @@ export class Redis implements INodeType {
 			{
 				name: 'redis',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -41,12 +41,12 @@ export class Redis implements INodeType {
 					{
 						name: 'Delete',
 						value: 'delete',
-						description: 'Deletes a key from Redis.',
+						description: 'Delete a key from Redis.',
 					},
 					{
 						name: 'Get',
 						value: 'get',
-						description: 'Returns the value of a key from Redis.',
+						description: 'Get the value of a key from Redis.',
 					},
 					{
 						name: 'Info',
@@ -61,7 +61,7 @@ export class Redis implements INodeType {
 					{
 						name: 'Set',
 						value: 'set',
-						description: 'Sets the value of a key in redis.',
+						description: 'Set the value of a key in redis.',
 					},
 				],
 				default: 'info',
@@ -78,7 +78,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'get'
+							'get',
 						],
 					},
 				},
@@ -93,7 +93,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'delete'
+							'delete',
 						],
 					},
 				},
@@ -108,7 +108,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'get'
+							'get',
 						],
 					},
 				},
@@ -123,7 +123,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'get'
+							'get',
 						],
 					},
 				},
@@ -165,7 +165,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'get'
+							'get',
 						],
 					},
 				},
@@ -195,7 +195,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'keys'
+							'keys',
 						],
 					},
 				},
@@ -214,7 +214,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'set'
+							'set',
 						],
 					},
 				},
@@ -229,7 +229,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'set'
+							'set',
 						],
 					},
 				},
@@ -243,7 +243,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'set'
+							'set',
 						],
 					},
 				},
@@ -285,7 +285,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'set'
+							'set',
 						],
 					},
 				},
@@ -303,7 +303,7 @@ export class Redis implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'set'
+							'set',
 						],
 						expire: [
 							true,
@@ -312,8 +312,8 @@ export class Redis implements INodeType {
 				},
 				default: 60,
 				description: 'Number of seconds before key expiration.',
-			}
-		]
+			},
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys.node.ts
index 6e151f8c9..033d907c3 100644
--- a/packages/nodes-base/nodes/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys.node.ts
@@ -62,11 +62,11 @@ export class RenameKeys implements INodeType {
 								placeholder: 'newKey',
 								description: 'the name the key should be renamed to. It is also possible to define deep keys by using dot-notation like for example: "level1.level2.newKey"',
 							},
-						]
+						],
 					},
 				],
-			}
-		]
+			},
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
index 0c0e8fb63..51e145b38 100644
--- a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
@@ -1,9 +1,9 @@
 import { OptionsWithUri } from 'request';
 import {
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions,
 } from 'n8n-core';
 
 export async function rocketchatApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, resource: string, method: string, operation: string, body: any = {}, headers?: object): Promise<any> { // tslint:disable-line:no-any
@@ -21,7 +21,7 @@ export async function rocketchatApiRequest(this: IHookFunctions | IExecuteFuncti
 		method,
 		body,
 		uri: `${credentials.domain}/api/v1${resource}.${operation}`,
-		json: true
+		json: true,
 	};
 	if (Object.keys(options.body).length === 0) {
 		delete options.body;
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
index 65dd1a682..d9bc0cf49 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
@@ -3,9 +3,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
-	INodeType
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 	import {
 	rocketchatApiRequest,
@@ -65,7 +65,7 @@ export class Rocketchat implements INodeType {
 			{
 				name: 'rocketchatApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 				{
@@ -113,8 +113,8 @@ export class Rocketchat implements INodeType {
 							'chat',
 						],
 						operation: [
-							'postMessage'
-						]
+							'postMessage',
+						],
 					},
 				},
 				default: '',
@@ -130,8 +130,8 @@ export class Rocketchat implements INodeType {
 							'chat',
 						],
 						operation: [
-							'postMessage'
-						]
+							'postMessage',
+						],
 					},
 				},
 				default: '',
@@ -146,11 +146,11 @@ export class Rocketchat implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'chat'
+							'chat',
 						],
 						operation: [
 							'postMessage',
-						]
+						],
 					},
 				},
 			},
@@ -191,8 +191,8 @@ export class Rocketchat implements INodeType {
 						type: 'string',
 						default: '',
 						description: 'This will cause the message’s name to appear as the given alias, but your username will still display.',
-					}
-				]
+					},
+				],
 			},
 			{
 				displayName: 'Attachments',
@@ -214,7 +214,7 @@ export class Rocketchat implements INodeType {
 							'postMessage',
 						],
 						jsonParameters: [
-							false
+							false,
 						],
 					},
 				},
@@ -346,27 +346,27 @@ export class Rocketchat implements INodeType {
 										name: 'short',
 										type: 'boolean',
 										default: false,
-										description: 'Whether this field should be a short field.'
+										description: 'Whether this field should be a short field.',
 									},
 									{
 										displayName: 'Title',
 										name: 'title',
 										type: 'string',
 										default: '',
-										description: 'The title of this field.'
+										description: 'The title of this field.',
 									},
 									{
 										displayName: 'Value',
 										name: 'value',
 										type: 'string',
 										default: '',
-										description: 'The value of this field, displayed underneath the title value.'
+										description: 'The value of this field, displayed underneath the title value.',
 									},
 								],
 							},
 						],
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Attachments',
@@ -378,21 +378,21 @@ export class Rocketchat implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'chat'
+							'chat',
 						],
 						operation: [
-							'postMessage'
+							'postMessage',
 						],
 						jsonParameters: [
-							true
+							true,
 						],
 					},
 				},
 				default: '',
 				required: false,
 				description: '',
-			}
-		]
+			},
+		],
 	};
 
 	async executeSingle(this: IExecuteSingleFunctions): Promise<INodeExecutionData> {
@@ -494,7 +494,7 @@ export class Rocketchat implements INodeType {
 		}
 
 		return {
-			json: response
+			json: response,
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead.node.ts
index b96f3d6e0..96bcb4550 100644
--- a/packages/nodes-base/nodes/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead.node.ts
@@ -1,9 +1,9 @@
 import { IExecuteFunctions } from 'n8n-core';
 import {
 	IDataObject,
+	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	INodeExecutionData,
 } from 'n8n-workflow';
 
 import * as Parser from 'rss-parser';
diff --git a/packages/nodes-base/nodes/RunAt.node.ts b/packages/nodes-base/nodes/RunAt.node.ts
new file mode 100644
index 000000000..b96d9b22e
--- /dev/null
+++ b/packages/nodes-base/nodes/RunAt.node.ts
@@ -0,0 +1,346 @@
+import { ITriggerFunctions } from 'n8n-core';
+import {
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
+
+
+export class RunAt implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'RunAt',
+		name: 'runAt',
+		icon: 'fa:calendar',
+		group: ['trigger'],
+		version: 1,
+		description: 'Triggers the workflow at a specific time',
+		defaults: {
+			name: 'RunAt',
+			color: '#00FF00',
+		},
+		inputs: [],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Trigger Times',
+				name: 'triggerTimes',
+				type: 'dateTime',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add Time',
+				},
+				default: '',
+				// default: [],
+				description: 'Triggers for the workflow',
+				placeholder: 'Add Time',
+			},
+			// {
+			// 	displayName: 'Trigger Times',
+			// 	name: 'triggerTimes',
+			// 	type: 'fixedCollection',
+			// 	typeOptions: {
+			// 		multipleValues: true,
+			// 		multipleValueButtonText: 'Add Time',
+			// 	},
+			// 	default: {},
+			// 	description: 'Triggers for the workflow',
+			// 	placeholder: 'Add Cron Time',
+			// 	options: [
+			// 		{
+			// 			name: 'item',
+			// 			displayName: 'Item',
+			// 			values: [
+			// 				{
+			// 					displayName: 'Mode',
+			// 					name: 'mode',
+			// 					type: 'options',
+			// 					options: [
+			// 						{
+			// 							name: 'Every Minute',
+			// 							value: 'everyMinute',
+			// 						},
+			// 						{
+			// 							name: 'Every Hour',
+			// 							value: 'everyHour',
+			// 						},
+			// 						{
+			// 							name: 'Every Day',
+			// 							value: 'everyDay',
+			// 						},
+			// 						{
+			// 							name: 'Every Week',
+			// 							value: 'everyWeek',
+			// 						},
+			// 						{
+			// 							name: 'Every Month',
+			// 							value: 'everyMonth',
+			// 						},
+			// 						{
+			// 							name: 'Every X',
+			// 							value: 'everyX',
+			// 						},
+			// 						{
+			// 							name: 'Custom',
+			// 							value: 'custom',
+			// 						},
+			// 					],
+			// 					default: 'everyDay',
+			// 					description: 'How often to trigger.',
+			// 				},
+			// 				{
+			// 					displayName: 'Hour',
+			// 					name: 'hour',
+			// 					type: 'number',
+			// 					typeOptions: {
+			// 						minValue: 0,
+			// 						maxValue: 23,
+			// 					},
+			// 					displayOptions: {
+			// 						hide: {
+			// 							mode: [
+			// 								'custom',
+			// 								'everyHour',
+			// 								'everyMinute',
+			// 								'everyX',
+			// 							],
+			// 						},
+			// 					},
+			// 					default: 14,
+			// 					description: 'The hour of the day to trigger (24h format).',
+			// 				},
+			// 				{
+			// 					displayName: 'Minute',
+			// 					name: 'minute',
+			// 					type: 'number',
+			// 					typeOptions: {
+			// 						minValue: 0,
+			// 						maxValue: 59,
+			// 					},
+			// 					displayOptions: {
+			// 						hide: {
+			// 							mode: [
+			// 								'custom',
+			// 								'everyMinute',
+			// 								'everyX',
+			// 							],
+			// 						},
+			// 					},
+			// 					default: 0,
+			// 					description: 'The minute of the day to trigger.',
+			// 				},
+			// 				{
+			// 					displayName: 'Day of Month',
+			// 					name: 'dayOfMonth',
+			// 					type: 'number',
+			// 					displayOptions: {
+			// 						show: {
+			// 							mode: [
+			// 								'everyMonth',
+			// 							],
+			// 						},
+			// 					},
+			// 					typeOptions: {
+			// 						minValue: 1,
+			// 						maxValue: 31,
+			// 					},
+			// 					default: 1,
+			// 					description: 'The day of the month to trigger.',
+			// 				},
+			// 				{
+			// 					displayName: 'Weekday',
+			// 					name: 'weekday',
+			// 					type: 'options',
+			// 					displayOptions: {
+			// 						show: {
+			// 							mode: [
+			// 								'everyWeek',
+			// 							],
+			// 						},
+			// 					},
+			// 					options: [
+			// 						{
+			// 							name: 'Monday',
+			// 							value: '1',
+			// 						},
+			// 						{
+			// 							name: 'Tuesday',
+			// 							value: '2',
+			// 						},
+			// 						{
+			// 							name: 'Wednesday',
+			// 							value: '3',
+			// 						},
+			// 						{
+			// 							name: 'Thursday',
+			// 							value: '4',
+			// 						},
+			// 						{
+			// 							name: 'Friday',
+			// 							value: '5',
+			// 						},
+			// 						{
+			// 							name: 'Saturday',
+			// 							value: '6',
+			// 						},
+			// 						{
+			// 							name: 'Sunday',
+			// 							value: '0',
+			// 						},
+			// 					],
+			// 					default: '1',
+			// 					description: 'The weekday to trigger.',
+			// 				},
+			// 				{
+			// 					displayName: 'Cron Expression',
+			// 					name: 'cronExpression',
+			// 					type: 'string',
+			// 					displayOptions: {
+			// 						show: {
+			// 							mode: [
+			// 								'custom',
+			// 							],
+			// 						},
+			// 					},
+			// 					default: '* * * * * *',
+			// 					description: 'Use custom cron expression. Values and ranges as follows:<ul><li>Seconds: 0-59</li><li>Minutes: 0 - 59</li><li>Hours: 0 - 23</li><li>Day of Month: 1 - 31</li><li>Months: 0 - 11 (Jan - Dec)</li><li>Day of Week: 0 - 6 (Sun - Sat)</li></ul>',
+			// 				},
+			// 				{
+			// 					displayName: 'Value',
+			// 					name: 'value',
+			// 					type: 'number',
+			// 					typeOptions: {
+			// 						minValue: 0,
+			// 						maxValue: 1000,
+			// 					},
+			// 					displayOptions: {
+			// 						show: {
+			// 							mode: [
+			// 								'everyX',
+			// 							],
+			// 						},
+			// 					},
+			// 					default: 2,
+			// 					description: 'All how many X minutes/hours it should trigger.',
+			// 				},
+			// 				{
+			// 					displayName: 'Unit',
+			// 					name: 'unit',
+			// 					type: 'options',
+			// 					displayOptions: {
+			// 						show: {
+			// 							mode: [
+			// 								'everyX',
+			// 							],
+			// 						},
+			// 					},
+			// 					options: [
+			// 						{
+			// 							name: 'Minutes',
+			// 							value: 'minutes'
+			// 						},
+			// 						{
+			// 							name: 'Hours',
+			// 							value: 'hours'
+			// 						},
+			// 					],
+			// 					default: 'hours',
+			// 					description: 'If it should trigger all X minutes or hours.',
+			// 				},
+			// 			]
+			// 		},
+			// 	],
+			// }
+		],
+	};
+
+
+
+	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
+
+		// const triggerTimes = this.getNodeParameter('triggerTimes') as unknown as {
+		// 	item: TriggerTime[];
+		// };
+
+		// // Define the order the cron-time-parameter appear
+		// const parameterOrder = [
+		// 	'second',     // 0 - 59
+		// 	'minute',     // 0 - 59
+		// 	'hour',       // 0 - 23
+		// 	'dayOfMonth', // 1 - 31
+		// 	'month',      // 0 - 11(Jan - Dec)
+		// 	'weekday',    // 0 - 6(Sun - Sat)
+		// ];
+
+		// // Get all the trigger times
+		// const cronTimes: string[] = [];
+		// let cronTime: string[];
+		// let parameterName: string;
+		// if (triggerTimes.item !== undefined) {
+		// 	for (const item of triggerTimes.item) {
+		// 		cronTime = [];
+		// 		if (item.mode === 'custom') {
+		// 			cronTimes.push(item.cronExpression as string);
+		// 			continue;
+		// 		}
+		// 		if (item.mode === 'everyMinute') {
+		// 			cronTimes.push(`${Math.floor(Math.random() * 60).toString()} * * * * *`);
+		// 			continue;
+		// 		}
+		// 		if (item.mode === 'everyX') {
+		// 			if (item.unit === 'minutes') {
+		// 				cronTimes.push(`${Math.floor(Math.random() * 60).toString()} */${item.value} * * * *`);
+		// 			} else if (item.unit === 'hours') {
+		// 				cronTimes.push(`${Math.floor(Math.random() * 60).toString()} 0 */${item.value} * * *`);
+		// 			}
+		// 			continue;
+		// 		}
+
+		// 		for (parameterName of parameterOrder) {
+		// 			if (item[parameterName] !== undefined) {
+		// 				// Value is set so use it
+		// 				cronTime.push(item[parameterName] as string);
+		// 			} else if (parameterName === 'second') {
+		// 				// For seconds we use by default a random one to make sure to
+		// 				// balance the load a little bit over time
+		// 				cronTime.push(Math.floor(Math.random() * 60).toString());
+		// 			} else {
+		// 				// For all others set "any"
+		// 				cronTime.push('*');
+		// 			}
+		// 		}
+
+		// 		cronTimes.push(cronTime.join(' '));
+		// 	}
+		// }
+
+		// // The trigger function to execute when the cron-time got reached
+		// // or when manually triggered
+		// const executeTrigger = () => {
+		// 	this.emit([this.helpers.returnJsonArray([{}])]);
+		// };
+
+		// const timezone = this.getTimezone();
+
+		// // Start the cron-jobs
+		// const cronJobs: CronJob[] = [];
+		// for (const cronTime of cronTimes) {
+		// 	cronJobs.push(new CronJob(cronTime, executeTrigger, undefined, true, timezone));
+		// }
+
+		// // Stop the cron-jobs
+		// async function closeFunction() {
+		// 	for (const cronJob of cronJobs) {
+		// 		cronJob.stop();
+		// 	}
+		// }
+
+		// async function manualTriggerFunction() {
+		// 	executeTrigger();
+		// }
+
+		return {
+			// closeFunction,
+			// manualTriggerFunction,
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index 19b867535..342c3c4bc 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -26,7 +26,7 @@ export class Rundeck implements INodeType {
 			{
 				name: 'rundeckApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -120,7 +120,7 @@ export class Rundeck implements INodeType {
 								type: 'string',
 								default: '',
 							},
-						]
+						],
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
index 6b5fdfb20..3d99de188 100644
--- a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
+++ b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
@@ -37,7 +37,7 @@ export class RundeckApi {
 			qs: query,
 			uri: this.credentials.url + endpoint,
 			body,
-			json: true
+			json: true,
 		};
 
 		try {
@@ -64,7 +64,7 @@ export class RundeckApi {
 		}
 
 		const body = {
-			argString: params
+			argString: params,
 		};
 
 		return this.request('POST', `/api/14/job/${jobId}/run`, body, {});
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index 19dbfa6df..111da29b8 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -61,7 +61,7 @@ export async function s3ApiRequest(this: IHookFunctions | IExecuteFunctions | IL
 		method,
 		path: `${path}?${queryToString(query).replace(/\+/g, '%2B')}`,
 		service: 's3',
-		body
+		body,
 	};
 
 	sign(signOpts, { accessKeyId: `${credentials.accessKeyId}`.trim(), secretAccessKey: `${credentials.secretAccessKey}`.trim() });
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index accb8494f..83100fb81 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -1,7 +1,7 @@
 
 import {
-	snakeCase,
 	paramCase,
+	snakeCase,
 } from 'change-case';
 
 import {
@@ -156,7 +156,7 @@ export class S3 implements INodeType {
 							'$': {
 								xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/',
 							},
-						}
+						},
 					};
 					let data = '';
 					// if credentials has the S3 defaul region (us-east-1) the body (XML) does not have to be sent.
@@ -290,7 +290,7 @@ export class S3 implements INodeType {
 						for (const childObject of responseData) {
 							//@ts-ignore
 							(body.Delete.Object as IDataObject[]).push({
-								Key: childObject.Key as string
+								Key: childObject.Key as string,
 							});
 						}
 
diff --git a/packages/nodes-base/nodes/Salesforce/AccountDescription.ts b/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
index 0944711f4..1a181c2b2 100644
--- a/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import {
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const accountOperations = [
 	{
@@ -72,7 +74,7 @@ export const accountFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Name of the account. Maximum size is 255 characters.',
@@ -149,6 +151,42 @@ export const accountFields = [
 				default: '',
 				description: 'Street address for the billing address of this account.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -290,7 +328,7 @@ export const accountFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Id of account that needs to be fetched',
@@ -367,6 +405,42 @@ export const accountFields = [
 				default: '',
 				description: 'Street address for the billing address of this account.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -516,7 +590,7 @@ export const accountFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Id of account that needs to be fetched',
@@ -537,7 +611,7 @@ export const accountFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Id of account that needs to be fetched',
@@ -610,7 +684,7 @@ export const accountFields = [
 				default: '',
 				description: 'Fields to include separated by ,',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                             account:addNote                                */
@@ -628,7 +702,7 @@ export const accountFields = [
 				],
 				operation: [
 					'addNote',
-				]
+				],
 			},
 		},
 		description: 'Id of account that needs to be fetched',
@@ -646,7 +720,7 @@ export const accountFields = [
 				],
 				operation: [
 					'addNote',
-				]
+				],
 			},
 		},
 		description: 'Title of the note.',
@@ -695,6 +769,6 @@ export const accountFields = [
 				default: '',
 				description: 'ID of the user who owns the note.',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
index ec61acd43..741d8dd91 100644
--- a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
@@ -66,7 +66,7 @@ export const attachmentFields = [
 					'attachment',
 				],
 				operation: [
-					'create'
+					'create',
 				],
 			},
 		},
@@ -84,7 +84,7 @@ export const attachmentFields = [
 					'attachment',
 				],
 				operation: [
-					'create'
+					'create',
 				],
 			},
 		},
@@ -102,7 +102,7 @@ export const attachmentFields = [
 					'attachment',
 				],
 				operation: [
-					'create'
+					'create',
 				],
 			},
 		},
@@ -168,7 +168,7 @@ export const attachmentFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Id of attachment that needs to be fetched',
@@ -248,7 +248,7 @@ export const attachmentFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Id of attachment that needs to be fetched',
@@ -269,7 +269,7 @@ export const attachmentFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Id of attachment that needs to be fetched',
@@ -342,6 +342,6 @@ export const attachmentFields = [
 				default: '',
 				description: 'Fields to include separated by ,',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/CaseDescription.ts b/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
index 439d9d92e..f703414a1 100644
--- a/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
@@ -235,7 +235,7 @@ export const caseFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Id of case that needs to be fetched',
@@ -406,7 +406,7 @@ export const caseFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Id of case that needs to be fetched',
@@ -427,7 +427,7 @@ export const caseFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Id of case that needs to be fetched',
@@ -500,7 +500,7 @@ export const caseFields = [
 				default: '',
 				description: 'Fields to include separated by ,',
 			},
-		]
+		],
 	},
 
 /* -------------------------------------------------------------------------- */
@@ -519,7 +519,7 @@ export const caseFields = [
 				],
 				operation: [
 					'addComment',
-				]
+				],
 			},
 		},
 		description: 'Id of case that needs to be fetched',
@@ -558,6 +558,6 @@ export const caseFields = [
 				default: false,
 				description: 'Indicates whether the CaseComment is visible to customers in the Self-Service portal (true) or not (false). ',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
index 741e9c384..39d437209 100644
--- a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import {
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const contactOperations = [
 	{
@@ -62,7 +64,7 @@ export const contactOperations = [
 export const contactFields = [
 
 /* -------------------------------------------------------------------------- */
-/*                                contact:create                                 */
+/*                                contact:create                              */
 /* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Last Name',
@@ -77,7 +79,7 @@ export const contactFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Required. Last name of the contact. Limited to 80 characters.',
@@ -130,6 +132,42 @@ export const contactFields = [
 				default: '',
 				description: 'The birth date of the contact.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Department',
 				name: 'department',
@@ -314,7 +352,7 @@ export const contactFields = [
 		],
 	},
 /* -------------------------------------------------------------------------- */
-/*                                 contact:update                                */
+/*                                 contact:update                             */
 /* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Contact ID',
@@ -329,7 +367,7 @@ export const contactFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Id of contact that needs to be fetched',
@@ -382,6 +420,42 @@ export const contactFields = [
 				default: '',
 				description: 'The birth date of the contact.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Department',
 				name: 'department',
@@ -582,7 +656,7 @@ export const contactFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Id of contact that needs to be fetched',
@@ -603,7 +677,7 @@ export const contactFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Id of contact that needs to be fetched',
@@ -676,7 +750,7 @@ export const contactFields = [
 				default: '',
 				description: 'Fields to include separated by ,',
 			},
-		]
+		],
 	},
 
 /* -------------------------------------------------------------------------- */
@@ -695,7 +769,7 @@ export const contactFields = [
 				],
 				operation: [
 					'addToCampaign',
-				]
+				],
 			},
 		},
 		description: 'Id of contact that needs to be fetched',
@@ -716,7 +790,7 @@ export const contactFields = [
 				],
 				operation: [
 					'addToCampaign',
-				]
+				],
 			},
 		},
 		description: 'Id of the campaign that needs to be fetched',
@@ -745,7 +819,7 @@ export const contactFields = [
 				default: '',
 				description: 'Controls the HasResponded flag on this object',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                             contact:addNote                                */
@@ -763,7 +837,7 @@ export const contactFields = [
 				],
 				operation: [
 					'addNote',
-				]
+				],
 			},
 		},
 		description: 'Id of contact that needs to be fetched',
@@ -781,7 +855,7 @@ export const contactFields = [
 				],
 				operation: [
 					'addNote',
-				]
+				],
 			},
 		},
 		description: 'Title of the note.',
@@ -830,6 +904,6 @@ export const contactFields = [
 				default: '',
 				description: 'ID of the user who owns the note.',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/CustomObjectDescription.ts b/packages/nodes-base/nodes/Salesforce/CustomObjectDescription.ts
new file mode 100644
index 000000000..921b6c5aa
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/CustomObjectDescription.ts
@@ -0,0 +1,396 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const customObjectOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a custom object record',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a custom object record',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all custom object records',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a custom object record',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a custom object record',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const customObjectFields = [
+
+/* -------------------------------------------------------------------------- */
+/*                                customObject:create                         */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Custom Object',
+		name: 'customObject',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCustomObjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'Name of the custom object',
+	},
+	{
+		displayName: 'Fields',
+		name: 'customFieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'Filter by custom fields ',
+		default: {},
+		options: [
+			{
+				name: 'customFieldsValues',
+				displayName: 'Custom Field',
+				values: [
+					{
+						displayName: 'Field ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getCustomObjectFields',
+							loadOptionsDependsOn: [
+								'customObject',
+							],
+						},
+						default: '',
+						description: 'The ID of the field.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'The value to set on custom field.',
+					},
+				],
+			},
+		],
+	},
+/* -------------------------------------------------------------------------- */
+/*                                 customObject:update                        */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Custom Object',
+		name: 'customObject',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCustomObjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		description: 'Name of the custom object',
+	},
+	{
+		displayName: 'Record ID',
+		name: 'recordId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		description: 'Record id to be updated',
+	},
+	{
+		displayName: 'Fields',
+		name: 'customFieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		description: 'Filter by custom fields ',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'customFieldsValues',
+				displayName: 'Custom Field',
+				values: [
+					{
+						displayName: 'Field ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getCustomObjectFields',
+							loadOptionsDependsOn: [
+								'customObject',
+							],
+						},
+						default: '',
+						description: 'The ID of the field.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'The value to set on custom field.',
+					},
+				],
+			},
+		],
+	},
+/* -------------------------------------------------------------------------- */
+/*                                  customObject:get                          */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Custom Object',
+		name: 'customObject',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCustomObjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		description: 'Name of the custom object',
+	},
+	{
+		displayName: 'Record ID',
+		name: 'recordId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		description: 'Record id to be retrieved',
+	},
+/* -------------------------------------------------------------------------- */
+/*                                  customObject:delete                       */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Custom Object',
+		name: 'customObject',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCustomObjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		description: 'Name of the custom object',
+	},
+	{
+		displayName: 'Record ID',
+		name: 'recordId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		description: 'Record id to be deleted',
+	},
+/* -------------------------------------------------------------------------- */
+/*                                 customObject:getAll                        */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Custom Object',
+		name: 'customObject',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCustomObjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		description: 'Name of the custom object',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				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: [
+					'customObject',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getCustomObjectFields',
+					loadOptionsDependsOn: [
+						'customObject',
+					],
+				},
+				default: '',
+				description: 'Fields to include separated by ,',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/FlowDescription.ts b/packages/nodes-base/nodes/Salesforce/FlowDescription.ts
new file mode 100644
index 000000000..ae81f900f
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/FlowDescription.ts
@@ -0,0 +1,184 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const flowOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'flow',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all flows',
+			},
+			{
+				name: 'Invoke',
+				value: 'invoke',
+				description: 'Invoke a flow',
+			},
+		],
+		default: 'invoke',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const flowFields = [
+
+/* -------------------------------------------------------------------------- */
+/*                                flow:getAll                                 */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'flow',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'flow',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+/* -------------------------------------------------------------------------- */
+/*                                flow:invoke                                 */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'API Name',
+		name: 'apiName',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'flow',
+				],
+				operation: [
+					'invoke',
+				],
+			},
+		},
+		description: 'Required. API name of the flow.',
+	},
+	{
+		displayName: 'JSON Parameters',
+		name: 'jsonParameters',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				resource: [
+					'flow',
+				],
+				operation: [
+					'invoke',
+				],
+			},
+		},
+		description: 'If the input variables should be set via the value-key pair UI or JSON/RAW.',
+	},
+	{
+		displayName: 'Variables',
+		name: 'variablesJson',
+		type: 'json',
+		displayOptions: {
+			show: {
+				resource: [
+					'flow',
+				],
+				operation: [
+					'invoke',
+				],
+				jsonParameters: [
+					true,
+				],
+			},
+		},
+		default: '',
+		description: 'Input variables as JSON object',
+	},
+	{
+		displayName: 'Variables',
+		name: 'variablesUi',
+		placeholder: 'Add Variable',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'flow',
+				],
+				operation: [
+					'invoke',
+				],
+				jsonParameters: [
+					false,
+				],
+			},
+		},
+		description: 'The input variable to send.',
+		default: {},
+		options: [
+			{
+				displayName: 'Variable',
+				name: 'variablesValues',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description: 'Name of the input variable.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the input variable.',
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index 3c76dfc03..5f8139c7d 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import {
 	OptionsWithUri,
- } from 'request';
+} from 'request';
 
 import {
 	IExecuteFunctions,
@@ -9,7 +9,8 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject
+	IDataObject,
+	INodePropertyOptions,
 } from 'n8n-workflow';
 
 export async function salesforceApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -17,10 +18,10 @@ export async function salesforceApiRequest(this: IExecuteFunctions | IExecuteSin
 	const subdomain = ((credentials!.accessTokenUrl as string).match(/https:\/\/(.+).salesforce\.com/) || [])[1];
 	const options: OptionsWithUri = {
 		method,
-		body: method === "GET" ? undefined : body,
+		body: method === 'GET' ? undefined : body,
 		qs,
 		uri: `https://${subdomain}.salesforce.com/services/data/v39.0${uri || endpoint}`,
-		json: true
+		json: true,
 	};
 	try {
 		//@ts-ignore
@@ -52,3 +53,20 @@ export async function salesforceApiRequestAllItems(this: IExecuteFunctions | ILo
 
 	return returnData;
 }
+
+
+
+/**
+ * Sorts the given options alphabetically
+ *
+ * @export
+ * @param {INodePropertyOptions[]} options
+ * @returns {INodePropertyOptions[]}
+ */
+export function sortOptions(options: INodePropertyOptions[]): void {
+	options.sort((a, b) => {
+		if (a.name < b.name) { return -1; }
+		if (a.name > b.name) { return 1; }
+		return 0;
+	});
+}
diff --git a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
index 6c3c22c39..c40b25752 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import {
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const leadOperations = [
 	{
@@ -77,7 +79,7 @@ export const leadFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Company of the lead. If person account record types have been enabled, and if the value of Company is null, the lead converts to a person account.',
@@ -95,7 +97,7 @@ export const leadFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Required. Last name of the lead. Limited to 80 characters.',
@@ -135,6 +137,42 @@ export const leadFields = [
 				default: '',
 				description: 'City for the address of the lead.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -277,7 +315,7 @@ export const leadFields = [
 				default: '',
 				description: 'Website for the lead.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 lead:update                                */
@@ -295,7 +333,7 @@ export const leadFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Id of Lead that needs to be fetched',
@@ -342,6 +380,42 @@ export const leadFields = [
 				default: '',
 				description: 'Company of the lead. If person account record types have been enabled, and if the value of Company is null, the lead converts to a person account.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -491,7 +565,7 @@ export const leadFields = [
 				default: '',
 				description: 'Website for the lead.',
 			},
-		]
+		],
 	},
 
 /* -------------------------------------------------------------------------- */
@@ -510,7 +584,7 @@ export const leadFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Id of Lead that needs to be fetched',
@@ -531,7 +605,7 @@ export const leadFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Id of Lead that needs to be fetched',
@@ -604,7 +678,7 @@ export const leadFields = [
 				default: '',
 				description: 'Fields to include separated by ,',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                            contact:addToCampaign                           */
@@ -622,7 +696,7 @@ export const leadFields = [
 				],
 				operation: [
 					'addToCampaign',
-				]
+				],
 			},
 		},
 		description: 'Id of contact that needs to be fetched',
@@ -643,7 +717,7 @@ export const leadFields = [
 				],
 				operation: [
 					'addToCampaign',
-				]
+				],
 			},
 		},
 		description: 'Id of the campaign that needs to be fetched',
@@ -672,7 +746,7 @@ export const leadFields = [
 				default: '',
 				description: 'Controls the HasResponded flag on this object',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                             lead:addNote                                   */
@@ -690,7 +764,7 @@ export const leadFields = [
 				],
 				operation: [
 					'addNote',
-				]
+				],
 			},
 		},
 		description: 'Id of lead that needs to be fetched',
@@ -708,7 +782,7 @@ export const leadFields = [
 				],
 				operation: [
 					'addNote',
-				]
+				],
 			},
 		},
 		description: 'Title of the note.',
@@ -757,6 +831,6 @@ export const leadFields = [
 				default: '',
 				description: 'ID of the user who owns the note.',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts b/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
index 2d0f3b1d2..cd9ac0642 100644
--- a/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import {
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const opportunityOperations = [
 	{
@@ -72,7 +74,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Required. Last name of the opportunity. Limited to 80 characters.',
@@ -90,7 +92,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Required. Date when the opportunity is expected to close.',
@@ -100,7 +102,7 @@ export const opportunityFields = [
 		name: 'stageName',
 		type: 'options',
 		typeOptions: {
-			loadOptionsMethod: 'getStages'
+			loadOptionsMethod: 'getStages',
 		},
 		required: true,
 		default: '',
@@ -111,7 +113,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Required. Date when the opportunity is expected to close.',
@@ -163,6 +165,42 @@ export const opportunityFields = [
 				default: '',
 				description: 'Id of the campaign that needs to be fetched',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -263,7 +301,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Id of opportunity that needs to be fetched',
@@ -322,6 +360,42 @@ export const opportunityFields = [
 				default: '',
 				description: 'Required. Date when the opportunity is expected to close.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -399,7 +473,7 @@ export const opportunityFields = [
 				name: 'stageName',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getStages'
+					loadOptionsMethod: 'getStages',
 				},
 				default: '',
 				description: 'Required. Date when the opportunity is expected to close.',
@@ -440,7 +514,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Id of opportunity that needs to be fetched',
@@ -461,7 +535,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Id of opportunity that needs to be fetched',
@@ -534,7 +608,7 @@ export const opportunityFields = [
 				default: '',
 				description: 'Fields to include separated by ,',
 			},
-		]
+		],
 	},
 
 /* -------------------------------------------------------------------------- */
@@ -553,7 +627,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'addNote',
-				]
+				],
 			},
 		},
 		description: 'Id of opportunity that needs to be fetched',
@@ -571,7 +645,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'addNote',
-				]
+				],
 			},
 		},
 		description: 'Title of the note.',
@@ -620,6 +694,6 @@ export const opportunityFields = [
 				default: '',
 				description: 'ID of the user who owns the note.',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 4f6ddecc8..e3146bc8a 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -6,9 +6,9 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	INodePropertyOptions,
 } from 'n8n-workflow';
 
 import {
@@ -52,9 +52,20 @@ import {
 	IContact,
 } from './ContactInterface';
 
+import {
+	customObjectFields,
+	customObjectOperations,
+} from './CustomObjectDescription';
+
+import {
+	flowFields,
+	flowOperations,
+} from './FlowDescription';
+
 import {
 	salesforceApiRequest,
 	salesforceApiRequestAllItems,
+	sortOptions,
 } from './GenericFunctions';
 
 import {
@@ -144,10 +155,20 @@ export class Salesforce implements INodeType {
 						value: 'contact',
 						description: 'Represents a contact, which is an individual associated with an account.',
 					},
+					{
+						name: 'Custom Object',
+						value: 'customObject',
+						description: 'Represents a custom object.',
+					},
+					{
+						name: 'Flow',
+						value: 'flow',
+						description: 'Represents an autolaunched flow.',
+					},
 					{
 						name: 'Lead',
 						value: 'lead',
-						description: 'Represents a prospect or potential .',
+						description: 'Represents a prospect or potential.',
 					},
 					{
 						name: 'Opportunity',
@@ -172,6 +193,8 @@ export class Salesforce implements INodeType {
 			...leadFields,
 			...contactOperations,
 			...contactFields,
+			...customObjectOperations,
+			...customObjectFields,
 			...opportunityOperations,
 			...opportunityFields,
 			...accountOperations,
@@ -184,6 +207,8 @@ export class Salesforce implements INodeType {
 			...attachmentFields,
 			...userOperations,
 			...userFields,
+			...flowOperations,
+			...flowFields,
 		],
 	};
 
@@ -205,6 +230,7 @@ export class Salesforce implements INodeType {
 						value: statusId,
 					});
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the users to display them to user so that he can
@@ -223,6 +249,7 @@ export class Salesforce implements INodeType {
 						value: userId,
 					});
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the lead sources to display them to user so that he can
@@ -231,6 +258,7 @@ export class Salesforce implements INodeType {
 				const returnData: INodePropertyOptions[] = [];
 				// TODO: find a way to filter this object to get just the lead sources instead of the whole object
 				const { fields } = await salesforceApiRequest.call(this, 'GET', '/sobjects/lead/describe');
+
 				for (const field of fields) {
 					if (field.name === 'LeadSource') {
 						for (const pickValue of field.picklistValues) {
@@ -243,6 +271,27 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
+				return returnData;
+			},
+			// Get all the lead custom fields to display them to user so that he can
+			// select them easily
+			async getLeadCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				// TODO: find a way to filter this object to get just the lead sources instead of the whole object
+				const { fields } = await salesforceApiRequest.call(this, 'GET', '/sobjects/lead/describe');
+
+				for (const field of fields) {
+					if (field.custom === true) {
+						const fieldName = field.label;
+						const fieldId = field.name;
+						returnData.push({
+							name: fieldName,
+							value: fieldId,
+						});
+					}
+				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the accounts to display them to user so that he can
@@ -261,6 +310,7 @@ export class Salesforce implements INodeType {
 						value: accountId,
 					});
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the campaigns to display them to user so that he can
@@ -279,6 +329,7 @@ export class Salesforce implements INodeType {
 						value: campaignId,
 					});
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the stages to display them to user so that he can
@@ -299,6 +350,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the stages to display them to user so that he can
@@ -319,6 +371,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the account sources to display them to user so that he can
@@ -339,6 +392,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the case types to display them to user so that he can
@@ -359,6 +413,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the case statuses to display them to user so that he can
@@ -379,6 +434,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the case reasons to display them to user so that he can
@@ -399,6 +455,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the case origins to display them to user so that he can
@@ -419,6 +476,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the case priorities to display them to user so that he can
@@ -439,6 +497,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the task statuses to display them to user so that he can
@@ -459,6 +518,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the task subjects to display them to user so that he can
@@ -479,6 +539,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the task call types to display them to user so that he can
@@ -499,6 +560,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the task call priorities to display them to user so that he can
@@ -519,6 +581,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the task recurrence types to display them to user so that he can
@@ -539,6 +602,7 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
 				return returnData;
 			},
 			// Get all the task recurrence instances to display them to user so that he can
@@ -559,6 +623,46 @@ export class Salesforce implements INodeType {
 						}
 					}
 				}
+				sortOptions(returnData);
+				return returnData;
+			},
+
+			// Get all the custom objects recurrence instances to display them to user so that he can
+			// select them easily
+			async getCustomObjects(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				// TODO: find a way to filter this object to get just the lead sources instead of the whole object
+				const { sobjects: objects } = await salesforceApiRequest.call(this, 'GET', '/sobjects');
+				for (const object of objects) {
+					if (object.custom === true) {
+						const objectName = object.label;
+						const objectId = object.name;
+						returnData.push({
+							name: objectName,
+							value: objectId,
+						});
+					}
+				}
+				sortOptions(returnData);
+				return returnData;
+			},
+
+			// Get all the custom objects fields recurrence instances to display them to user so that he can
+			// select them easily
+			async getCustomObjectFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				// TODO: find a way to filter this object to get just the lead sources instead of the whole object
+				const customObject = this.getCurrentNodeParameter('customObject') as string;
+				const { fields } = await salesforceApiRequest.call(this, 'GET', `/sobjects/${customObject}/describe`);
+				for (const field of fields) {
+					const fieldName = field.label;
+					const fieldId = field.name;
+					returnData.push({
+						name: fieldName,
+						value: fieldId,
+					});
+				}
+				sortOptions(returnData);
 				return returnData;
 			},
 		},
@@ -646,6 +750,16 @@ export class Salesforce implements INodeType {
 					if (additionalFields.numberOfEmployees !== undefined) {
 						body.NumberOfEmployees = additionalFields.numberOfEmployees as number;
 					}
+					if (additionalFields.customFieldsUi) {
+						const customFields = (additionalFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
+
 					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/lead', body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/patch-lead-id
@@ -725,6 +839,15 @@ export class Salesforce implements INodeType {
 					if (updateFields.numberOfEmployees !== undefined) {
 						body.NumberOfEmployees = updateFields.numberOfEmployees as number;
 					}
+					if (updateFields.customFieldsUi) {
+						const customFields = (updateFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'PATCH', `/sobjects/lead/${leadId}`, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/get-lead-id
@@ -900,6 +1023,15 @@ export class Salesforce implements INodeType {
 					if (additionalFields.emailBouncedReason !== undefined) {
 						body.EmailBouncedReason = additionalFields.emailBouncedReason as string;
 					}
+					if (additionalFields.customFieldsUi) {
+						const customFields = (additionalFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/contact', body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Contact/patch-contact-id
@@ -1000,6 +1132,15 @@ export class Salesforce implements INodeType {
 					if (updateFields.emailBouncedReason !== undefined) {
 						body.EmailBouncedReason = updateFields.emailBouncedReason as string;
 					}
+					if (updateFields.customFieldsUi) {
+						const customFields = (updateFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'PATCH', `/sobjects/contact/${contactId}`, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Contact/get-contact-id
@@ -1077,6 +1218,74 @@ export class Salesforce implements INodeType {
 					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/note', body);
 				}
 			}
+			if (resource === 'customObject') {
+				if (operation === 'create') {
+					const customObject = this.getNodeParameter('customObject', i) as string;
+					const customFieldsUi = this.getNodeParameter('customFieldsUi', i) as IDataObject;
+					const body: IDataObject = {};
+					if (customFieldsUi) {
+						const customFields = (customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
+					responseData = await salesforceApiRequest.call(this, 'POST', `/sobjects/${customObject}`, body);
+				}
+				if (operation === 'update') {
+					const recordId = this.getNodeParameter('recordId', i) as string;
+					const customObject = this.getNodeParameter('customObject', i) as string;
+					const customFieldsUi = this.getNodeParameter('customFieldsUi', i) as IDataObject;
+					const body: IDataObject = {};
+					if (customFieldsUi) {
+						const customFields = (customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
+					responseData = await salesforceApiRequest.call(this, 'PATCH', `/sobjects/${customObject}/${recordId}`, body);
+				}
+				if (operation === 'get') {
+					const customObject = this.getNodeParameter('customObject', i) as string;
+					const recordId = this.getNodeParameter('recordId', i) as string;
+					responseData = await salesforceApiRequest.call(this, 'GET', `/sobjects/${customObject}/${recordId}`);
+				}
+				if (operation === 'getAll') {
+					const customObject = this.getNodeParameter('customObject', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					let fields = ['id'];
+					if (options.fields) {
+						fields = options.fields as string[];
+					}
+					try {
+						if (returnAll) {
+							qs.q = `SELECT ${fields.join(',')} FROM ${customObject}`;
+							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
+						} else {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.q = `SELECT ${fields.join(',')} FROM ${customObject} Limit ${limit}`;
+							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
+						}
+					} catch(err) {
+						throw new Error(`Salesforce Error: ${err}`);
+					}
+				}
+				if (operation === 'delete') {
+					const customObject = this.getNodeParameter('customObject', i) as string;
+					const recordId = this.getNodeParameter('recordId', i) as string;
+					try {
+						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/${customObject}/${recordId}`);
+					} catch(err) {
+						throw new Error(`Salesforce Error: ${err}`);
+					}
+				}
+			}
 			if (resource === 'opportunity') {
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/post-opportunity
 				if (operation === 'create') {
@@ -1122,6 +1331,15 @@ export class Salesforce implements INodeType {
 					if (additionalFields.forecastCategoryName !== undefined) {
 						body.ForecastCategoryName = additionalFields.forecastCategoryName as string;
 					}
+					if (additionalFields.customFieldsUi) {
+						const customFields = (additionalFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/opportunity', body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/post-opportunity
@@ -1171,6 +1389,15 @@ export class Salesforce implements INodeType {
 					if (updateFields.forecastCategoryName !== undefined) {
 						body.ForecastCategoryName = updateFields.forecastCategoryName as string;
 					}
+					if (updateFields.customFieldsUi) {
+						const customFields = (updateFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'PATCH', `/sobjects/opportunity/${opportunityId}`, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/get-opportunity-id
@@ -1314,6 +1541,15 @@ export class Salesforce implements INodeType {
 					if (additionalFields.shippingPostalCode !== undefined) {
 						body.ShippingPostalCode = additionalFields.shippingPostalCode as string;
 					}
+					if (additionalFields.customFieldsUi) {
+						const customFields = (additionalFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/account', body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Account/patch-account-id
@@ -1396,6 +1632,15 @@ export class Salesforce implements INodeType {
 					if (updateFields.shippingPostalCode !== undefined) {
 						body.ShippingPostalCode = updateFields.shippingPostalCode as string;
 					}
+					if (updateFields.customFieldsUi) {
+						const customFields = (updateFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'PATCH', `/sobjects/account/${accountId}`, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Account/get-account-id
@@ -1696,6 +1941,15 @@ export class Salesforce implements INodeType {
 					if (additionalFields.recurrenceRegeneratedType !== undefined) {
 						body.RecurrenceRegeneratedType = additionalFields.recurrenceRegeneratedType as string;
 					}
+					if (additionalFields.customFieldsUi) {
+						const customFields = (additionalFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/task', body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Task/patch-task-id
@@ -1775,6 +2029,15 @@ export class Salesforce implements INodeType {
 					if (updateFields.recurrenceRegeneratedType !== undefined) {
 						body.RecurrenceRegeneratedType = updateFields.recurrenceRegeneratedType as string;
 					}
+					if (updateFields.customFieldsUi) {
+						const customFields = (updateFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'PATCH', `/sobjects/task/${taskId}`, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Task/get-task-id
@@ -1944,6 +2207,42 @@ export class Salesforce implements INodeType {
 					}
 				}
 			}
+			if (resource === 'flow') {
+				//https://developer.salesforce.com/docs/atlas.en-us.api_action.meta/api_action/actions_obj_flow.htm
+				if (operation === 'invoke') {
+					const apiName = this.getNodeParameter('apiName', i) as string;
+					const jsonParameters = this.getNodeParameter('jsonParameters', i) as boolean;
+					let variables = {};
+					if (jsonParameters) {
+						variables = this.getNodeParameter('variablesJson', i);
+					} else {
+						// Input variables are defined in UI
+						const setInputVariable = this.getNodeParameter('variablesUi', i, {}) as IDataObject;
+						if (setInputVariable!.variablesValues !== undefined) {
+							for (const inputVariableData of setInputVariable!.variablesValues as IDataObject[]) {
+								// @ts-ignore
+								variables[inputVariableData!.name as string] = inputVariableData!.value;
+							}
+						}
+					}
+					const body = {
+						inputs: [
+							variables,
+						],
+					};
+					responseData = await salesforceApiRequest.call(this, 'POST', `/actions/custom/flow/${apiName}`, body);
+				}
+				//https://developer.salesforce.com/docs/atlas.en-us.api_action.meta/api_action/actions_obj_flow.htm
+				if (operation === 'getAll') {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					responseData = await salesforceApiRequest.call(this, 'GET', '/actions/custom/flow');
+					responseData = responseData.actions;
+					if (returnAll === false) {
+						const limit = this.getNodeParameter('limit', i) as number;
+						responseData = responseData.splice(0, limit);
+					}
+				}
+			}
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
 			} else {
diff --git a/packages/nodes-base/nodes/Salesforce/TaskDescription.ts b/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
index 6bde264ca..a91c81740 100644
--- a/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import {
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const taskOperations = [
 	{
@@ -143,6 +145,42 @@ export const taskFields = [
 				},
 				description: 'The type of call being answered: Inbound, Internal, or Outbound.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -186,7 +224,7 @@ export const taskFields = [
 				type: 'options',
 				default: '',
 				typeOptions: {
-					loadOptionsMethod: 'getTaskRecurrenceTypes'
+					loadOptionsMethod: 'getTaskRecurrenceTypes',
 				},
 				description: 'Recurrence Type of the task.',
 			},
@@ -240,52 +278,52 @@ export const taskFields = [
 				options: [
 					{
 						name: 'January',
-						value: 'January'
+						value: 'January',
 					},
 					{
 						name: 'February',
-						value: 'February'
+						value: 'February',
 					},
 					{
 						name: 'March',
-						value: 'March'
+						value: 'March',
 					},
 					{
 						name: 'April',
-						value: 'April'
+						value: 'April',
 					},
 					{
 						name: 'May',
-						value: 'May'
+						value: 'May',
 					},
 					{
 						name: 'June',
-						value: 'June'
+						value: 'June',
 					},
 					{
 						name: 'July',
-						value: 'July'
+						value: 'July',
 					},
 					{
 						name: 'August',
-						value: 'August'
+						value: 'August',
 					},
 					{
 						name: 'September',
-						value: 'September'
+						value: 'September',
 					},
 					{
 						name: 'October',
-						value: 'October'
+						value: 'October',
 					},
 					{
 						name: 'November',
-						value: 'November'
+						value: 'November',
 					},
 					{
 						name: 'December',
-						value: 'December'
-					}
+						value: 'December',
+					},
 				],
 				default: '',
 				description: 'The month of the year in which the task repeats.',
@@ -298,16 +336,16 @@ export const taskFields = [
 				options: [
 					{
 						name: 'After due date',
-						value: 'RecurrenceRegenerateAfterDueDate'
+						value: 'RecurrenceRegenerateAfterDueDate',
 					},
 					{
 						name: 'After date completed',
-						value: 'RecurrenceRegenerateAfterToday'
+						value: 'RecurrenceRegenerateAfterToday',
 					},
 					{
 						name: '(Task Closed)',
-						value: 'RecurrenceRegenerated'
-					}
+						value: 'RecurrenceRegenerated',
+					},
 				],
 				description: `Represents what triggers a repeating task to repeat.<br/>
 				 Add this field to a page layout together with the RecurrenceInterval field,<br/>
@@ -367,7 +405,7 @@ export const taskFields = [
 				description: `The WhoId represents a human such as a lead or a contact.<br/>
 				WhoIds are polymorphic. Polymorphic means a WhoId is equivalent to a contact’s ID or a lead’s ID.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 task:update                                */
@@ -385,7 +423,7 @@ export const taskFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Id of task that needs to be fetched',
@@ -458,6 +496,42 @@ export const taskFields = [
 				},
 				description: 'The type of call being answered: Inbound, Internal, or Outbound.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getLeadCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -565,52 +639,52 @@ export const taskFields = [
 				options: [
 					{
 						name: 'January',
-						value: 'January'
+						value: 'January',
 					},
 					{
 						name: 'February',
-						value: 'February'
+						value: 'February',
 					},
 					{
 						name: 'March',
-						value: 'March'
+						value: 'March',
 					},
 					{
 						name: 'April',
-						value: 'April'
+						value: 'April',
 					},
 					{
 						name: 'May',
-						value: 'May'
+						value: 'May',
 					},
 					{
 						name: 'June',
-						value: 'June'
+						value: 'June',
 					},
 					{
 						name: 'July',
-						value: 'July'
+						value: 'July',
 					},
 					{
 						name: 'August',
-						value: 'August'
+						value: 'August',
 					},
 					{
 						name: 'September',
-						value: 'September'
+						value: 'September',
 					},
 					{
 						name: 'October',
-						value: 'October'
+						value: 'October',
 					},
 					{
 						name: 'November',
-						value: 'November'
+						value: 'November',
 					},
 					{
 						name: 'December',
-						value: 'December'
-					}
+						value: 'December',
+					},
 				],
 				default: '',
 				description: 'The month of the year in which the task repeats.',
@@ -631,16 +705,16 @@ export const taskFields = [
 				options: [
 					{
 						name: 'After due date',
-						value: 'RecurrenceRegenerateAfterDueDate'
+						value: 'RecurrenceRegenerateAfterDueDate',
 					},
 					{
 						name: 'After date completed',
-						value: 'RecurrenceRegenerateAfterToday'
+						value: 'RecurrenceRegenerateAfterToday',
 					},
 					{
 						name: '(Task Closed)',
-						value: 'RecurrenceRegenerated'
-					}
+						value: 'RecurrenceRegenerated',
+					},
 				],
 				description: `Represents what triggers a repeating task to repeat.<br/>
 				 Add this field to a page layout together with the RecurrenceInterval field,<br/>
@@ -653,7 +727,7 @@ export const taskFields = [
 				type: 'options',
 				default: '',
 				typeOptions: {
-					loadOptionsMethod: 'getTaskRecurrenceTypes'
+					loadOptionsMethod: 'getTaskRecurrenceTypes',
 				},
 				description: 'Website for the task.',
 			},
@@ -692,7 +766,7 @@ export const taskFields = [
 				description: `The WhoId represents a human such as a lead or a contact.<br/>
 				WhoIds are polymorphic. Polymorphic means a WhoId is equivalent to a contact’s ID or a lead’s ID.`,
 			},
-		]
+		],
 	},
 
 /* -------------------------------------------------------------------------- */
@@ -711,7 +785,7 @@ export const taskFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Id of task that needs to be fetched',
@@ -732,7 +806,7 @@ export const taskFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Id of task that needs to be fetched',
@@ -805,6 +879,6 @@ export const taskFields = [
 				default: '',
 				description: 'Fields to include separated by ,',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Salesforce/UserDescription.ts b/packages/nodes-base/nodes/Salesforce/UserDescription.ts
index 2bc9089f9..b58175a14 100644
--- a/packages/nodes-base/nodes/Salesforce/UserDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/UserDescription.ts
@@ -27,8 +27,8 @@ export const userOperations = [
 			},
 		],
 		default: 'get',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const userFields = [
@@ -51,7 +51,7 @@ export const userFields = [
 				],
 			},
 		},
-		description: 'Id of user that needs to be fetched'
+		description: 'Id of user that needs to be fetched',
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 user:getAll                                */
@@ -68,10 +68,10 @@ export const userFields = [
 				operation: [
 					'getAll',
 				],
-			}
+			},
 		},
 		default: false,
-		description: 'If all results should be returned or only up to a given limit.'
+		description: 'If all results should be returned or only up to a given limit.',
 	},
 	{
 		displayName: 'Limit',
@@ -92,10 +92,10 @@ export const userFields = [
 		},
 		typeOptions: {
 			minValue: 1,
-			maxValue: 100
+			maxValue: 100,
 		},
 		default: 50,
-		description: 'How many results to return.'
+		description: 'How many results to return.',
 	},
 	{
 		displayName: 'Options',
@@ -119,7 +119,7 @@ export const userFields = [
 				name: 'fields',
 				type: 'string',
 				default: '',
-				description: 'Fields to include separated by ,'
+				description: 'Fields to include separated by ,',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Salesforce/UserInterface.ts b/packages/nodes-base/nodes/Salesforce/UserInterface.ts
index 035a1b6c9..985607008 100644
--- a/packages/nodes-base/nodes/Salesforce/UserInterface.ts
+++ b/packages/nodes-base/nodes/Salesforce/UserInterface.ts
@@ -1,10 +1,10 @@
 export interface IUser {
-  Alias?: string;
-  Department?: string;
-  Division?: string;
-  Email?: string;
-  IsActive?: boolean;
-  MobilePhone?: string;
-  Title?: string;
-  Username?: string;
+	Alias?: string;
+	Department?: string;
+	Division?: string;
+	Email?: string;
+	IsActive?: boolean;
+	MobilePhone?: string;
+	Title?: string;
+	Username?: string;
 }
diff --git a/packages/nodes-base/nodes/Salesforce/salesforce.png b/packages/nodes-base/nodes/Salesforce/salesforce.png
index 17876e8de..aca78c51a 100644
Binary files a/packages/nodes-base/nodes/Salesforce/salesforce.png and b/packages/nodes-base/nodes/Salesforce/salesforce.png differ
diff --git a/packages/nodes-base/nodes/Salesmate/ActivityDescription.ts b/packages/nodes-base/nodes/Salesmate/ActivityDescription.ts
index 3718052ee..47174e2a0 100644
--- a/packages/nodes-base/nodes/Salesmate/ActivityDescription.ts
+++ b/packages/nodes-base/nodes/Salesmate/ActivityDescription.ts
@@ -452,7 +452,7 @@ export const activityFields = [
 				],
 				default: 'desc',
 				description: 'Sort order',
-			}
+			},
 		],
 	},
 	{
@@ -596,12 +596,12 @@ export const activityFields = [
 										name: 'value',
 										type: 'string',
 										default: '',
-									}
-								]
+									},
+								],
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Salesmate/CompanyDescription.ts b/packages/nodes-base/nodes/Salesmate/CompanyDescription.ts
index dbf20eb1b..8b689c73d 100644
--- a/packages/nodes-base/nodes/Salesmate/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Salesmate/CompanyDescription.ts
@@ -545,7 +545,7 @@ export const companyFields = [
 				],
 				default: 'desc',
 				description: 'Sort order',
-			}
+			},
 		],
 	},
 	{
@@ -693,12 +693,12 @@ export const companyFields = [
 										name: 'value',
 										type: 'string',
 										default: '',
-									}
-								]
+									},
+								],
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Salesmate/DealDescription.ts b/packages/nodes-base/nodes/Salesmate/DealDescription.ts
index 787b6d74b..97c91421c 100644
--- a/packages/nodes-base/nodes/Salesmate/DealDescription.ts
+++ b/packages/nodes-base/nodes/Salesmate/DealDescription.ts
@@ -716,7 +716,7 @@ export const dealFields = [
 				],
 				default: 'desc',
 				description: 'Sort order',
-			}
+			},
 		],
 	},
 	{
@@ -864,12 +864,12 @@ export const dealFields = [
 										name: 'value',
 										type: 'string',
 										default: '',
-									}
-								]
+									},
+								],
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
index 1471ae4a6..a56cce6ac 100644
--- a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
@@ -24,7 +24,7 @@ export async function salesmateApiRequest(this: IHookFunctions | IExecuteFunctio
 		qs,
 		body,
 		uri: uri ||`https://apis.salesmate.io${resource}`,
-		json: true
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.body;
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
index e8f5a4952..634fe4751 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
@@ -56,7 +56,7 @@ export class Salesmate implements INodeType {
 			{
 				name: 'salesmateApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -112,7 +112,7 @@ export class Salesmate implements INodeType {
 				const returnData: INodePropertyOptions[] = [];
 				const qs: IDataObject = {
 					fields: ['name', 'id'],
-					query: {}
+					query: {},
 				};
 				const contacts = await salesmateApiRequest.call(this, 'POST', '/v2/contacts/search', qs);
 				for (const contact of contacts.Data.data) {
@@ -131,7 +131,7 @@ export class Salesmate implements INodeType {
 				const returnData: INodePropertyOptions[] = [];
 				const qs: IDataObject = {
 					fields: ['name', 'id'],
-					query: {}
+					query: {},
 				};
 				const companies = await salesmateApiRequest.call(this, 'POST', '/v2/companies/search', qs);
 				for (const company of companies.Data.data) {
diff --git a/packages/nodes-base/nodes/Segment/GenericFunctions.ts b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
index bd3ba6b87..d80bf5cf5 100644
--- a/packages/nodes-base/nodes/Segment/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
@@ -23,7 +23,7 @@ export async function segmentApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs,
 		body,
 		uri: uri ||`https://api.segment.io/v1${resource}`,
-		json: true
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.body;
diff --git a/packages/nodes-base/nodes/Segment/GroupDescription.ts b/packages/nodes-base/nodes/Segment/GroupDescription.ts
index 89907526b..e63de7ff4 100644
--- a/packages/nodes-base/nodes/Segment/GroupDescription.ts
+++ b/packages/nodes-base/nodes/Segment/GroupDescription.ts
@@ -228,7 +228,7 @@ export const groupFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -276,11 +276,11 @@ export const groupFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
@@ -375,7 +375,7 @@ export const groupFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -423,7 +423,7 @@ export const groupFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -481,7 +481,7 @@ export const groupFields = [
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Segment/IdentifyDescription.ts b/packages/nodes-base/nodes/Segment/IdentifyDescription.ts
index c80ffeeb6..44b2c60b4 100644
--- a/packages/nodes-base/nodes/Segment/IdentifyDescription.ts
+++ b/packages/nodes-base/nodes/Segment/IdentifyDescription.ts
@@ -210,7 +210,7 @@ export const identifyFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -258,11 +258,11 @@ export const identifyFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
@@ -357,7 +357,7 @@ export const identifyFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -405,7 +405,7 @@ export const identifyFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -463,7 +463,7 @@ export const identifyFields = [
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Segment/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts
index e8c11613a..b4ad23e9c 100644
--- a/packages/nodes-base/nodes/Segment/Segment.node.ts
+++ b/packages/nodes-base/nodes/Segment/Segment.node.ts
@@ -14,8 +14,8 @@ import {
 } from './GenericFunctions';
 
 import {
-	groupOperations,
 	groupFields,
+	groupOperations,
 } from './GroupDescription';
 
 import {
@@ -28,12 +28,13 @@ import {
 } from './IdentifyInterface';
 
 import {
-	trackOperations,
 	trackFields,
+	trackOperations,
 } from './TrackDescription';
 
 import {
-	ITrack, IGroup,
+	IGroup,
+	ITrack,
 } from './TrackInterface';
 
 import * as uuid from 'uuid/v4';
@@ -73,7 +74,7 @@ export class Segment implements INodeType {
 					{
 						name: 'Identify',
 						value: 'identify',
-						description: 'Identify lets you tie a user to their actions'
+						description: 'Identify lets you tie a user to their actions',
 					},
 					{
 						name: 'Track',
diff --git a/packages/nodes-base/nodes/Segment/TrackDescription.ts b/packages/nodes-base/nodes/Segment/TrackDescription.ts
index ec67c25fc..f32b03278 100644
--- a/packages/nodes-base/nodes/Segment/TrackDescription.ts
+++ b/packages/nodes-base/nodes/Segment/TrackDescription.ts
@@ -233,7 +233,7 @@ export const trackFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -281,11 +281,11 @@ export const trackFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
@@ -380,7 +380,7 @@ export const trackFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -428,7 +428,7 @@ export const trackFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -486,7 +486,7 @@ export const trackFields = [
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
@@ -562,21 +562,21 @@ export const trackFields = [
 							numberPrecision: 2,
 						},
 						default: 1,
-						description: 'Amount of revenue an event resulted in. This should be a decimal value, so a shirt worth $19.99 would result in a revenue of 19.99.'
+						description: 'Amount of revenue an event resulted in. This should be a decimal value, so a shirt worth $19.99 would result in a revenue of 19.99.',
 					},
 					{
 						displayName: 'Currency',
 						name: 'currency',
 						type: 'string',
 						default: '',
-						description: 'Currency of the revenue an event resulted in <p>This should be sent in the ISO 4127 format. If this is not set, we assume the revenue to be in US dollars.</p>'
+						description: 'Currency of the revenue an event resulted in <p>This should be sent in the ISO 4127 format. If this is not set, we assume the revenue to be in US dollars.</p>',
 					},
 					{
 						displayName: 'Value',
 						name: 'value',
 						type: 'number',
 						default: '',
-						description: 'An abstract “value” to associate with an event. This is typically used in situations where the event doesn’t generate real-dollar revenue, but has an intrinsic value to a marketing team, like newsletter signups.'
+						description: 'An abstract “value” to associate with an event. This is typically used in situations where the event doesn’t generate real-dollar revenue, but has an intrinsic value to a marketing team, like newsletter signups.',
 					},
 				],
 			},
@@ -780,7 +780,7 @@ export const trackFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -828,11 +828,11 @@ export const trackFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
@@ -927,7 +927,7 @@ export const trackFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -975,7 +975,7 @@ export const trackFields = [
 										type: 'string',
 										default: '',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -1033,7 +1033,7 @@ export const trackFields = [
 							},
 						],
 					},
-				]
+				],
 			},
 		],
 	},
@@ -1106,49 +1106,49 @@ export const trackFields = [
 						name: 'name',
 						type: 'string',
 						default: '',
-						description: 'Name of the page. This is reserved for future use.'
+						description: 'Name of the page. This is reserved for future use.',
 					},
 					{
 						displayName: 'Path',
 						name: 'path',
 						type: 'string',
 						default: '',
-						description: 'Path portion of the URL of the page. Equivalent to canonical path which defaults to location.pathname from the DOM API.'
+						description: 'Path portion of the URL of the page. Equivalent to canonical path which defaults to location.pathname from the DOM API.',
 					},
 					{
 						displayName: 'Referrer',
 						name: 'referrer',
 						type: 'string',
 						default: '',
-						description: 'Full URL of the previous page. Equivalent to document.referrer from the DOM API.'
+						description: 'Full URL of the previous page. Equivalent to document.referrer from the DOM API.',
 					},
 					{
 						displayName: 'Search',
 						name: 'search',
 						type: 'string',
 						default: '',
-						description: 'Query string portion of the URL of the page. Equivalent to location.search from the DOM API.'
+						description: 'Query string portion of the URL of the page. Equivalent to location.search from the DOM API.',
 					},
 					{
 						displayName: 'Title',
 						name: 'title',
 						type: 'string',
 						default: '',
-						description: 'Title of the page. Equivalent to document.title from the DOM API.'
+						description: 'Title of the page. Equivalent to document.title from the DOM API.',
 					},
 					{
 						displayName: 'URL',
 						name: 'url',
 						type: 'string',
 						default: '',
-						description: 'Full URL of the page. First we look for the canonical url. If the canonical url is not provided, we use location.href from the DOM API.'
+						description: 'Full URL of the page. First we look for the canonical url. If the canonical url is not provided, we use location.href from the DOM API.',
 					},
 					{
 						displayName: 'Keywords',
 						name: 'keywords',
 						type: 'string',
 						default: '',
-						description: 'A list/array of keywords describing the content of the page. The keywords would most likely be the same as, or similar to, the keywords you would find in an html meta tag for SEO purposes.'
+						description: 'A list/array of keywords describing the content of the page. The keywords would most likely be the same as, or similar to, the keywords you would find in an html meta tag for SEO purposes.',
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/Sendy/CampaignDescription.ts b/packages/nodes-base/nodes/Sendy/CampaignDescription.ts
new file mode 100644
index 000000000..7c077ff3f
--- /dev/null
+++ b/packages/nodes-base/nodes/Sendy/CampaignDescription.ts
@@ -0,0 +1,248 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const campaignOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a campaign',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const campaignFields = [
+
+/* -------------------------------------------------------------------------- */
+/*                                campaign:create                             */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'From Name',
+		name: 'fromName',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: `The 'From name' of your campaign.`,
+	},
+	{
+		displayName: 'From Email',
+		name: 'fromEmail',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: `The 'From email' of your campaign.`,
+	},
+	{
+		displayName: 'Reply To',
+		name: 'replyTo',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: `The 'Reply to' of your campaign.`,
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: `The 'Title' of your campaign.`,
+	},
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: `The 'Subject' of your campaign.`,
+	},
+	{
+		displayName: 'HTML Text',
+		name: 'htmlText',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: `The 'HTML version' of your campaign.`,
+	},
+	{
+		displayName: 'Send Campaign',
+		name: 'sendCampaign',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: false,
+		description: `Set to true if you want to send the campaign as well and not just create a draft. Default is false.`,
+	},
+	{
+		displayName: 'Brand ID',
+		name: 'brandId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'campaign',
+				],
+				sendCampaign: [
+					false,
+				],
+			},
+		},
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'campaign',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Exclude List IDs',
+				name: 'excludeListIds',
+				type: 'string',
+				default: '',
+				description: ` Lists to exclude from your campaign. List IDs should be single or comma-separated`,
+			},
+			{
+				displayName: 'Exclude Segment IDs',
+				name: 'excludeSegmentIds',
+				type: 'string',
+				default: '',
+				description: `Segments to exclude from your campaign. Segment IDs should be single or comma-separated.`,
+			},
+			{
+				displayName: 'List IDs',
+				name: 'listIds',
+				type: 'string',
+				default: '',
+				description: `List IDs should be single or comma-separated.`,
+			},
+			{
+				displayName: 'Plain Text',
+				name: 'plainText',
+				type: 'string',
+				default: '',
+				description: `The 'Plain text version' of your campaign.`,
+			},
+			{
+				displayName: 'Querystring',
+				name: 'queryString',
+				type: 'string',
+				default: '',
+				description: `Google Analytics tags.`,
+			},
+			{
+				displayName: 'Segment IDs',
+				name: 'segmentIds',
+				type: 'string',
+				default: '',
+				description: `Segment IDs should be single or comma-separated.`,
+			},
+			{
+				displayName: 'Track Clicks',
+				name: 'trackClicks',
+				type: 'boolean',
+				default: true,
+				description: ` Set to false if you want to disable clicks tracking. Default is true.`,
+			},
+			{
+				displayName: 'Track Opens',
+				name: 'trackOpens',
+				type: 'boolean',
+				default: true,
+				description: `Set to false if you want to disable opens tracking. Default is true.`,
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
new file mode 100644
index 000000000..890c07cf3
--- /dev/null
+++ b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
@@ -0,0 +1,48 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function sendyApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const credentials = this.getCredentials('sendyApi') as IDataObject;
+
+	body.api_key = credentials.apiKey;
+
+	body.boolean = true;
+
+	const options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+		method,
+		form: body,
+		qs,
+		uri: `${credentials.url}${path}`,
+	};
+
+	try {
+		//@ts-ignore
+		return await this.helpers.request.call(this, options);
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.error) {
+
+			let errors = error.response.body.error.errors;
+
+			errors = errors.map((e: IDataObject) => e.message);
+			// Try to return the error prettier
+			throw new Error(
+				`Sendy error response [${error.statusCode}]: ${errors.join('|')}`,
+			);
+		}
+		throw error;
+	}
+}
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
new file mode 100644
index 000000000..ada1dbac2
--- /dev/null
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -0,0 +1,319 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	sendyApiRequest,
+} from './GenericFunctions';
+
+import {
+	campaignFields,
+	campaignOperations,
+} from './CampaignDescription';
+
+import {
+	subscriberFields,
+	subscriberOperations,
+} from './SubscriberDescription';
+
+export class Sendy implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Sendy',
+		name: 'sendy',
+		icon: 'file:sendy.png',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Sendy API.',
+		defaults: {
+			name: 'Sendy',
+			color: '#000000',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'sendyApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Campaign',
+						value: 'campaign',
+					},
+					{
+						name: 'Subscriber',
+						value: 'subscriber',
+					},
+				],
+				default: 'subscriber',
+				description: 'The resource to operate on.',
+			},
+			...campaignOperations,
+			...campaignFields,
+			...subscriberOperations,
+			...subscriberFields,
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+
+			if (resource === 'campaign') {
+				if (operation === 'create') {
+
+					const fromName = this.getNodeParameter('fromName', i) as string;
+
+					const fromEmail = this.getNodeParameter('fromEmail', i) as string;
+
+					const replyTo = this.getNodeParameter('replyTo', i) as string;
+
+					const title = this.getNodeParameter('title', i) as string;
+
+					const subject = this.getNodeParameter('subject', i) as string;
+
+					const htmlText = this.getNodeParameter('htmlText', i) as boolean;
+
+					const sendCampaign = this.getNodeParameter('sendCampaign', i) as boolean;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						from_name: fromName,
+						from_email: fromEmail,
+						reply_to: replyTo,
+						title,
+						subject,
+						send_campaign: sendCampaign ? 1 : 0,
+						html_text: htmlText,
+					};
+
+					if (additionalFields.plainText) {
+						body.plain_text = additionalFields.plainText;
+					}
+
+					if (additionalFields.listIds) {
+						body.list_ids = additionalFields.listIds as string;
+					}
+
+					if (additionalFields.segmentIds) {
+						body.segment_ids = additionalFields.segmentIds as string;
+					}
+
+					if (additionalFields.excludeListIds) {
+						body.exclude_list_ids = additionalFields.excludeListIds as string;
+					}
+
+					if (additionalFields.excludeSegmentIds) {
+						body.exclude_segments_ids = additionalFields.excludeSegmentIds as string;
+					}
+
+					if (additionalFields.brandId) {
+						body.brand_id = additionalFields.brandId as string;
+					}
+
+					if (additionalFields.queryString) {
+						body.query_string = additionalFields.queryString as string;
+					}
+
+					if (additionalFields.trackOpens) {
+						body.track_opens = additionalFields.trackOpens as boolean ? 1 : 0;
+					}
+
+					if (additionalFields.trackClicks) {
+						body.track_clicks = additionalFields.trackClicks as boolean ? 1 : 0;
+					}
+
+					responseData = await sendyApiRequest.call(
+						this,
+						'POST',
+						'/api/campaigns/create.php',
+						body,
+					);
+
+					const success = [
+						'Campaign created',
+						'Campaign created and now sending',
+					];
+
+					if (success.includes(responseData)) {
+						responseData = { message: responseData };
+					} else {
+						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+					}
+				}
+			}
+
+			if (resource === 'subscriber') {
+				if (operation === 'add') {
+
+					const email = this.getNodeParameter('email', i) as string;
+
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						email,
+						list: listId,
+					};
+
+					Object.assign(body, additionalFields);
+
+					responseData = await sendyApiRequest.call(
+						this,
+						'POST',
+						'/subscribe',
+						body,
+					);
+
+					if (responseData === '1') {
+						responseData = { success: true };
+					} else {
+						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+					}
+				}
+
+				if (operation === 'count') {
+
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					const body: IDataObject = {
+						list_id: listId,
+					};
+
+					responseData = await sendyApiRequest.call(
+						this,
+						'POST',
+						'/api/subscribers/active-subscriber-count.php',
+						body,
+					);
+
+					const errors = [
+						'No data passed',
+						'API key not passed',
+						'Invalid API key',
+						'List ID not passed',
+						'List does not exist',
+					];
+
+					if (!errors.includes(responseData)) {
+						responseData = { count: responseData };
+					} else {
+						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+					}
+				}
+
+				if (operation === 'delete') {
+
+					const email = this.getNodeParameter('email', i) as string;
+
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					const body: IDataObject = {
+						email,
+						list_id: listId,
+					};
+
+					responseData = await sendyApiRequest.call(
+						this,
+						'POST',
+						'/api/subscribers/delete.php',
+						body,
+					);
+
+					if (responseData === '1') {
+						responseData = { success: true };
+					} else {
+						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+					}
+				}
+
+				if (operation === 'remove') {
+
+					const email = this.getNodeParameter('email', i) as string;
+
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					const body: IDataObject = {
+						email,
+						list: listId,
+					};
+
+					responseData = await sendyApiRequest.call(
+						this,
+						'POST',
+						'/unsubscribe',
+						body,
+					);
+
+					if (responseData === '1') {
+						responseData = { success: true };
+					} else {
+						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+					}
+				}
+
+				if (operation === 'status') {
+
+					const email = this.getNodeParameter('email', i) as string;
+
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					const body: IDataObject = {
+						email,
+						list_id: listId,
+					};
+
+					responseData = await sendyApiRequest.call(
+						this,
+						'POST',
+						'/api/subscribers/subscription-status.php',
+						body,
+					);
+
+					const status = [
+						'Subscribed',
+						'Unsubscribed',
+						'Unconfirmed',
+						'Bounced',
+						'Soft bounced',
+						'Complained',
+					];
+
+					if (status.includes(responseData)) {
+						responseData = { status: responseData };
+					} else {
+						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+					}
+				}
+			}
+		}
+		if (Array.isArray(responseData)) {
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+		} else if (responseData !== undefined) {
+			returnData.push(responseData as IDataObject);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Sendy/SubscriberDescription.ts b/packages/nodes-base/nodes/Sendy/SubscriberDescription.ts
new file mode 100644
index 000000000..48771dcad
--- /dev/null
+++ b/packages/nodes-base/nodes/Sendy/SubscriberDescription.ts
@@ -0,0 +1,292 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const subscriberOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add a subscriber to a list',
+			},
+			{
+				name: 'Count',
+				value: 'count',
+				description: 'Count subscribers',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a subscriber from a list',
+			},
+			{
+				name: 'Remove',
+				value: 'remove',
+				description: 'Unsubscribe user from a list',
+			},
+			{
+				name: 'Status',
+				value: 'status',
+				description: 'Get the status of subscriber',
+			},
+		],
+		default: 'add',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const subscriberFields = [
+
+/* -------------------------------------------------------------------------- */
+/*                                subscriber:add                              */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'add',
+				],
+			},
+		},
+		default: '',
+		description: 'Email address of the subscriber.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'add',
+				],
+			},
+		},
+		default: '',
+		description: `The list id you want to subscribe a user to.<br>
+		This encrypted & hashed id can be found under View all lists section named ID.`,
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'add',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Country',
+				name: 'country',
+				type: 'string',
+				default: '',
+				description: `User's 2 letter country code`,
+			},
+			{
+				displayName: 'GDPR',
+				name: 'gdpr',
+				type: 'boolean',
+				default: false,
+				description: `If you're signing up EU users in a GDPR compliant manner, set this to "true"`,
+			},
+			{
+				displayName: 'Honeypot',
+				name: 'hp',
+				type: 'boolean',
+				default: false,
+				description: `Include this 'honeypot' field to prevent spambots from signing up via this API call. When spambots fills in this field, this API call will exit, preventing them from signing up fake addresses to your form. This parameter is only supported in Sendy 3.0 onwards.`,
+			},
+			{
+				displayName: 'IP Address',
+				name: 'ipaddress',
+				type: 'string',
+				default: '',
+				description: `User's IP address`,
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: `User's name`,
+			},
+			{
+				displayName: 'Referrer',
+				name: 'referrer',
+				type: 'string',
+				default: '',
+				description: `The URL where the user signed up from`,
+			},
+			{
+				displayName: 'Silent',
+				name: 'silent',
+				type: 'boolean',
+				default: false,
+				description: `Set to "true" if your list is 'Double opt-in' but you want to bypass that and signup the user to the list as 'Single Opt-in instead' (optional)`,
+			},
+		],
+	},
+/* -------------------------------------------------------------------------- */
+/*                                subscriber:count                            */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'count',
+				],
+			},
+		},
+		default: '',
+		description: `The list id you want to subscribe a user to.<br>
+		This encrypted & hashed id can be found under View all lists section named ID.`,
+	},
+/* -------------------------------------------------------------------------- */
+/*                                subscriber:delete                           */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		default: '',
+		description: 'Email address of the subscriber.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		default: '',
+		description: `The list id you want to subscribe a user to.<br>
+		This encrypted & hashed id can be found under View all lists section named ID.`,
+	},
+/* -------------------------------------------------------------------------- */
+/*                                subscriber:remove                           */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'remove',
+				],
+			},
+		},
+		default: '',
+		description: 'Email address of the subscriber.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'remove',
+				],
+			},
+		},
+		default: '',
+		description: `The list id you want to subscribe a user to.<br>
+		This encrypted & hashed id can be found under View all lists section named ID.`,
+	},
+/* -------------------------------------------------------------------------- */
+/*                                subscriber:status                           */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'status',
+				],
+			},
+		},
+		default: '',
+		description: 'Email address of the subscriber.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'subscriber',
+				],
+				operation: [
+					'status',
+				],
+			},
+		},
+		default: '',
+		description: `The list id you want to subscribe a user to.<br>
+		This encrypted & hashed id can be found under View all lists section named ID.`,
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Sendy/sendy.png b/packages/nodes-base/nodes/Sendy/sendy.png
new file mode 100644
index 000000000..d49af7b83
Binary files /dev/null and b/packages/nodes-base/nodes/Sendy/sendy.png differ
diff --git a/packages/nodes-base/nodes/SentryIo/EventDescription.ts b/packages/nodes-base/nodes/SentryIo/EventDescription.ts
index 64aa81b8c..8248b867a 100644
--- a/packages/nodes-base/nodes/SentryIo/EventDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/EventDescription.ts
@@ -24,7 +24,7 @@ export const eventOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all events',
-			}
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
diff --git a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
index 82105de7d..f318c44ba 100644
--- a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
@@ -17,13 +17,15 @@ import {
 export async function sentryIoApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const authentication = this.getNodeParameter('authentication', 0);
 
+	const version = this.getNodeParameter('sentryVersion', 0);
+
 	const options: OptionsWithUri = {
 		headers: {},
 		method,
 		qs,
 		body,
 		uri: uri ||`https://sentry.io${resource}`,
-		json: true
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.body;
@@ -37,10 +39,22 @@ export async function sentryIoApiRequest(this: IHookFunctions | IExecuteFunction
 		delete options.qs.limit;
 	}
 
+	let credentialName;
+
 	try {
 		if (authentication === 'accessToken') {
 
-			const credentials = this.getCredentials('sentryIoApi');
+			if (version === 'cloud') {
+				credentialName = 'sentryIoApi';
+			} else {
+				credentialName = 'sentryIoServerApi';
+			}
+
+			const credentials = this.getCredentials(credentialName);
+
+			if (credentials?.url) {
+				options.uri = `${credentials?.url}${resource}`;
+			}
 
 			options.headers = {
 				Authorization: `Bearer ${credentials?.token}`,
@@ -50,6 +64,7 @@ export async function sentryIoApiRequest(this: IHookFunctions | IExecuteFunction
 			return this.helpers.request(options);
 
 		} else {
+
 			return await this.helpers.requestOAuth2!.call(this, 'sentryIoOAuth2Api', options);
 		}
 
diff --git a/packages/nodes-base/nodes/SentryIo/IssueDescription.ts b/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
index cc2cb0893..37d9abbe7 100644
--- a/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
@@ -180,13 +180,13 @@ export const issueFields = [
 				options: [
 					{
 						name: '14 Days',
-						value: '14d'
+						value: '14d',
 					},
 					{
 						name: '24 Hours',
-						value: '24h'
+						value: '24h',
 					},
-				]
+				],
 			},
 			{
 				displayName: 'Short ID lookup',
@@ -195,7 +195,7 @@ export const issueFields = [
 				default: true,
 				description: 'If this is set to true then short IDs are looked up by this function as well. This can cause the return value of the function to return an event issue of a different project which is why this is an opt-in',
 			},
-		]
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                issue:update                                */
@@ -279,22 +279,22 @@ export const issueFields = [
 				options: [
 					{
 						name: 'Ignored',
-						value: 'ignored'
+						value: 'ignored',
 					},
 					{
 						name: 'Resolved',
-						value: 'resolved'
+						value: 'resolved',
 					},
 					{
 						name: 'Resolved Next Release',
-						value: 'resolvedInNextRelease'
+						value: 'resolvedInNextRelease',
 					},
 					{
 						name: 'Unresolved',
-						value: 'unresolved'
+						value: 'unresolved',
 					},
-				]
+				],
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts b/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
index d57947908..50a7c8ea0 100644
--- a/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
@@ -29,7 +29,7 @@ export const organizationOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all organizations',
-			}
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -112,7 +112,7 @@ export const organizationFields = [
 				default: true,
 				description: 'Restrict results to organizations which you are the owner',
 			},
-		]
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                organization:get                            */
@@ -200,6 +200,6 @@ export const organizationFields = [
 				default: '',
 				description: 'The unique URL slug for this organization. If this is not provided a slug is automatically generated based on the name',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts b/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
index 44c272693..a499a320b 100644
--- a/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
@@ -24,7 +24,7 @@ export const projectOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all projects',
-			}
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -145,7 +145,7 @@ export const projectFields = [
 				default: '',
 				description: 'Optionally a slug for the new project. If it’s not provided a slug is generated from the name',
 			},
-		]
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                project:getAll                              */
diff --git a/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts b/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
index 5c5686f9a..f4045a77f 100644
--- a/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
@@ -126,7 +126,7 @@ export const releaseFields = [
 				default: '',
 				description: 'This parameter can be used to create a “starts with” filter for the version',
 			},
-		]
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                release:get                                   */
@@ -295,7 +295,7 @@ export const releaseFields = [
 								type: 'string',
 								default: '',
 								description: 'the sha of the commit',
-								required: true
+								required: true,
 							},
 							{
 								displayName: 'Author Email',
@@ -338,7 +338,7 @@ export const releaseFields = [
 												type: 'string',
 												default: '',
 												description: 'he path to the file. Both forward and backward slashes are supported',
-												required: true
+												required: true,
 											},
 											{
 												displayName: 'Type',
@@ -349,19 +349,19 @@ export const releaseFields = [
 												options: [
 													{
 														name: 'Add',
-														value: 'add'
+														value: 'add',
 													},
 													{
 														name: 'Modify',
-														value: 'modify'
+														value: 'modify',
 													},
 													{
 														name: 'Delete',
-														value: 'delete'
+														value: 'delete',
 													},
-												]
+												],
 											},
-										]
+										],
 									},
 								],
 							},
@@ -379,7 +379,7 @@ export const releaseFields = [
 								default: '',
 								description: 'Timestamp of commit',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -403,7 +403,7 @@ export const releaseFields = [
 								type: 'string',
 								default: '',
 								description: 'the head sha of the commit',
-								required: true
+								required: true,
 							},
 							{
 								displayName: 'Repository',
@@ -411,7 +411,7 @@ export const releaseFields = [
 								type: 'string',
 								default: '',
 								description: 'Repository name',
-								required: true
+								required: true,
 							},
 							{
 								displayName: 'Previous Commit',
@@ -420,10 +420,10 @@ export const releaseFields = [
 								default: '',
 								description: 'the sha of the HEAD of the previous release',
 							},
-						]
+						],
 					},
 				],
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index 74213e543..0e02a2852 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -4,21 +4,21 @@ import {
 
 import {
 	IDataObject,
+	ILoadOptionsFunctions,
 	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	ILoadOptionsFunctions,
-	INodePropertyOptions,
 } from 'n8n-workflow';
 
 import {
-	eventOperations,
 	eventFields,
+	eventOperations,
 } from './EventDescription';
 
 import {
-	issueOperations,
 	issueFields,
+	issueOperations,
 } from './IssueDescription';
 
 import {
@@ -27,25 +27,30 @@ import {
 } from './OrganizationDescription';
 
 import {
-	projectOperations,
 	projectFields,
+	projectOperations,
 } from './ProjectDescription';
 
 import {
-	releaseOperations,
 	releaseFields,
+	releaseOperations,
 } from './ReleaseDescription';
 
 import {
-	teamOperations,
 	teamFields,
+	teamOperations,
 } from './TeamDescription';
 
 import {
-	sentryIoApiRequest,
 	sentryApiRequestAllItems,
+	sentryIoApiRequest,
 } from './GenericFunctions';
-import { ICommit, IPatchSet, IRef } from './Interface';
+
+import {
+	ICommit,
+	IPatchSet,
+	IRef,
+} from './Interface';
 
 export class SentryIo implements INodeType {
 	description: INodeTypeDescription = {
@@ -71,6 +76,9 @@ export class SentryIo implements INodeType {
 						authentication: [
 							'oAuth2',
 						],
+						sentryVersion: [
+							'cloud',
+						],
 					},
 				},
 			},
@@ -82,15 +90,55 @@ export class SentryIo implements INodeType {
 						authentication: [
 							'accessToken',
 						],
+						sentryVersion: [
+							'cloud',
+						],
+					},
+				},
+			},
+			{
+				name: 'sentryIoServerApi',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+						sentryVersion: [
+							'server',
+						],
 					},
 				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Sentry Version',
+				name: 'sentryVersion',
+				type: 'options',
+				options: [
+					{
+						name: 'Cloud',
+						value: 'cloud',
+					},
+					{
+						name: 'Server (Self Hosted)',
+						value: 'server',
+					},
+				],
+				default: 'cloud',
+			},
 			{
 				displayName: 'Authentication',
 				name: 'authentication',
 				type: 'options',
+				displayOptions: {
+					show: {
+						sentryVersion: [
+							'cloud',
+						],
+					},
+				},
 				options: [
 					{
 						name: 'Access Token',
@@ -104,6 +152,26 @@ export class SentryIo implements INodeType {
 				default: 'accessToken',
 				description: 'The resource to operate on.',
 			},
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				displayOptions: {
+					show: {
+						sentryVersion: [
+							'server',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+				],
+				default: 'accessToken',
+				description: 'The resource to operate on.',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -160,7 +228,7 @@ export class SentryIo implements INodeType {
 
 			// TEAM
 			...teamOperations,
-			...teamFields
+			...teamFields,
 		],
 	};
 
diff --git a/packages/nodes-base/nodes/SentryIo/TeamDescription.ts b/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
index f44e6853d..4bc74fa39 100644
--- a/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
@@ -29,7 +29,7 @@ export const teamOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Get all teams',
-			}
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -210,7 +210,7 @@ export const teamFields = [
 				default: '',
 				description: 'The optional slug for this team. If not provided it will be auto generated from the name',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                team:update                                 */
@@ -229,7 +229,7 @@ export const teamFields = [
 					'team',
 				],
 				operation: [
-					'update', 'delete'
+					'update', 'delete',
 				],
 			},
 		},
@@ -247,7 +247,7 @@ export const teamFields = [
 					'team',
 				],
 				operation: [
-					'update', 'delete'
+					'update', 'delete',
 				],
 			},
 		},
@@ -285,6 +285,6 @@ export const teamFields = [
 				default: '',
 				description: 'The new name of the team',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/SentryIo/sentryio.png b/packages/nodes-base/nodes/SentryIo/sentryio.png
index 31fd69c1b..a44ffc3cc 100644
Binary files a/packages/nodes-base/nodes/SentryIo/sentryio.png and b/packages/nodes-base/nodes/SentryIo/sentryio.png differ
diff --git a/packages/nodes-base/nodes/Set.node.ts b/packages/nodes-base/nodes/Set.node.ts
index 24ff044e6..5e9b93282 100644
--- a/packages/nodes-base/nodes/Set.node.ts
+++ b/packages/nodes-base/nodes/Set.node.ts
@@ -60,7 +60,7 @@ export class Set implements INodeType {
 								default: false,
 								description: 'The boolean value to write in the property.',
 							},
-						]
+						],
 					},
 					{
 						name: 'number',
@@ -80,7 +80,7 @@ export class Set implements INodeType {
 								default: 0,
 								description: 'The number value to write in the property.',
 							},
-						]
+						],
 					},
 					{
 						name: 'string',
@@ -100,7 +100,7 @@ export class Set implements INodeType {
 								default: '',
 								description: 'The string value to write in the property.',
 							},
-						]
+						],
 					},
 				],
 			},
@@ -124,7 +124,7 @@ export class Set implements INodeType {
 					},
 				],
 			},
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index 909220431..e808846a2 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -3,11 +3,11 @@ import {
 } from 'request';
 
 import {
+	BINARY_ENCODING,
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions,
-	BINARY_ENCODING
 } from 'n8n-core';
 
 import {
@@ -32,7 +32,7 @@ export async function shopifyApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs: query,
 		uri: uri || `https://${credentials.shopSubdomain}.myshopify.com/admin/api/2019-10${resource}`,
 		body,
-		json: true
+		json: true,
 	};
 
 	if (Object.keys(option).length !== 0) {
diff --git a/packages/nodes-base/nodes/Shopify/ProductDescription.ts b/packages/nodes-base/nodes/Shopify/ProductDescription.ts
index 008e66ce0..a0209dd33 100644
--- a/packages/nodes-base/nodes/Shopify/ProductDescription.ts
+++ b/packages/nodes-base/nodes/Shopify/ProductDescription.ts
@@ -233,7 +233,7 @@ export const productFields = [
 								default: '',
 								description: `Option\'s values.`,
 							},
-						]
+						],
 					},
 				],
 			},
@@ -458,7 +458,7 @@ export const productFields = [
 								default: '',
 								description: `Option\'s values.`,
 							},
-						]
+						],
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index dc093bb12..9ae04b763 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -5,10 +5,10 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
-	INodeTypeDescription,
 	INodeExecutionData,
-	INodeType,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -28,10 +28,10 @@ import {
 } from './ProductDescription';
 
 import {
-	IOrder,
-	IDiscountCode,
 	IAddress,
+	IDiscountCode,
 	ILineItem,
+	IOrder,
 } from './OrderInterface';
 
 import {
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
index 07b7939a7..f0d627d50 100644
--- a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -16,7 +16,7 @@ import {
 
 import {
 	createHmac,
- } from 'crypto';
+} from 'crypto';
 
 export class ShopifyTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -36,7 +36,7 @@ export class ShopifyTrigger implements INodeType {
 			{
 				name: 'shopifyApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
@@ -55,240 +55,240 @@ export class ShopifyTrigger implements INodeType {
 				options:
 					[
 						{
-						  name: 'App uninstalled',
-						  value: 'app/uninstalled',
+							name: 'App uninstalled',
+							value: 'app/uninstalled',
 						},
 						{
-						  name: 'Carts create',
-						  value: 'carts/create',
+							name: 'Carts create',
+							value: 'carts/create',
 						},
 						{
-						  name: 'Carts update',
-						  value: 'carts/update',
+							name: 'Carts update',
+							value: 'carts/update',
 						},
 						{
-						  name: 'Checkouts create',
-						  value: 'checkouts/create',
+							name: 'Checkouts create',
+							value: 'checkouts/create',
 						},
 						{
-						  name: 'Checkouts delete',
-						  value: 'checkouts/delete',
+							name: 'Checkouts delete',
+							value: 'checkouts/delete',
 						},
 						{
-						  name: 'Checkouts update',
-						  value: 'checkouts/update',
+							name: 'Checkouts update',
+							value: 'checkouts/update',
 						},
 						{
-						  name: 'Collection listings add',
-						  value: 'collection_listings/add',
+							name: 'Collection listings add',
+							value: 'collection_listings/add',
 						},
 						{
-						  name: 'Collection listings remove',
-						  value: 'collection_listings/remove',
+							name: 'Collection listings remove',
+							value: 'collection_listings/remove',
 						},
 						{
-						  name: 'Collection listings update',
-						  value: 'collection_listings/update',
+							name: 'Collection listings update',
+							value: 'collection_listings/update',
 						},
 						{
-						  name: 'Collections create',
-						  value: 'collections/create',
+							name: 'Collections create',
+							value: 'collections/create',
 						},
 						{
-						  name: 'Collections delete',
-						  value: 'collections/delete',
+							name: 'Collections delete',
+							value: 'collections/delete',
 						},
 						{
-						  name: 'Collections update',
-						  value: 'collections/update',
+							name: 'Collections update',
+							value: 'collections/update',
 						},
 						{
-						  name: 'Customer groups create',
-						  value: 'customer_groups/create',
+							name: 'Customer groups create',
+							value: 'customer_groups/create',
 						},
 						{
-						  name: 'Customer groups delete',
-						  value: 'customer_groups/delete',
+							name: 'Customer groups delete',
+							value: 'customer_groups/delete',
 						},
 						{
-						  name: 'Customer groups update',
-						  value: 'customer_groups/update',
+							name: 'Customer groups update',
+							value: 'customer_groups/update',
 						},
 						{
-						  name: 'Customers create',
-						  value: 'customers/create',
+							name: 'Customers create',
+							value: 'customers/create',
 						},
 						{
-						  name: 'Customers delete',
-						  value: 'customers/delete',
+							name: 'Customers delete',
+							value: 'customers/delete',
 						},
 						{
-						  name: 'Customers disable',
-						  value: 'customers/disable',
+							name: 'Customers disable',
+							value: 'customers/disable',
 						},
 						{
-						  name: 'Customers enable',
-						  value: 'customers/enable',
+							name: 'Customers enable',
+							value: 'customers/enable',
 						},
 						{
-						  name: 'Customers update',
-						  value: 'customers/update',
+							name: 'Customers update',
+							value: 'customers/update',
 						},
 						{
-						  name: 'Draft orders create',
-						  value: 'draft_orders/create',
+							name: 'Draft orders create',
+							value: 'draft_orders/create',
 						},
 						{
-						  name: 'Draft orders delete',
-						  value: 'draft_orders/delete',
+							name: 'Draft orders delete',
+							value: 'draft_orders/delete',
 						},
 						{
-						  name: 'Draft orders update',
-						  value: 'draft_orders/update',
+							name: 'Draft orders update',
+							value: 'draft_orders/update',
 						},
 						{
-						  name: 'Fulfillment events create',
-						  value: 'fulfillment_events/create',
+							name: 'Fulfillment events create',
+							value: 'fulfillment_events/create',
 						},
 						{
-						  name: 'Fulfillment events delete',
-						  value: 'fulfillment_events/delete',
+							name: 'Fulfillment events delete',
+							value: 'fulfillment_events/delete',
 						},
 						{
-						  name: 'Fulfillments create',
-						  value: 'fulfillments/create',
+							name: 'Fulfillments create',
+							value: 'fulfillments/create',
 						},
 						{
-						  name: 'Fulfillments update',
-						  value: 'fulfillments/update',
+							name: 'Fulfillments update',
+							value: 'fulfillments/update',
 						},
 						{
-						  name: 'Inventory_items create',
-						  value: 'inventory_items/create',
+							name: 'Inventory_items create',
+							value: 'inventory_items/create',
 						},
 						{
-						  name: 'Inventory_items delete',
-						  value: 'inventory_items/delete',
+							name: 'Inventory_items delete',
+							value: 'inventory_items/delete',
 						},
 						{
-						  name: 'Inventory_items update',
-						  value: 'inventory_items/update',
+							name: 'Inventory_items update',
+							value: 'inventory_items/update',
 						},
 						{
-						  name: 'Inventory_levels connect',
-						  value: 'inventory_levels/connect',
+							name: 'Inventory_levels connect',
+							value: 'inventory_levels/connect',
 						},
 						{
-						  name: 'Inventory_levels disconnect',
-						  value: 'inventory_levels/disconnect',
+							name: 'Inventory_levels disconnect',
+							value: 'inventory_levels/disconnect',
 						},
 						{
-						  name: 'Inventory_levels update',
-						  value: 'inventory_levels/update',
+							name: 'Inventory_levels update',
+							value: 'inventory_levels/update',
 						},
 						{
-						  name: 'Locales create',
-						  value: 'locales/create',
+							name: 'Locales create',
+							value: 'locales/create',
 						},
 						{
-						  name: 'Locales update',
-						  value: 'locales/update',
+							name: 'Locales update',
+							value: 'locales/update',
 						},
 						{
-						  name: 'Locations create',
-						  value: 'locations/create',
+							name: 'Locations create',
+							value: 'locations/create',
 						},
 						{
-						  name: 'Locations delete',
-						  value: 'locations/delete',
+							name: 'Locations delete',
+							value: 'locations/delete',
 						},
 						{
-						  name: 'Locations update',
-						  value: 'locations/update',
+							name: 'Locations update',
+							value: 'locations/update',
 						},
 						{
-						  name: 'Order transactions create',
-						  value: 'order_transactions/create',
+							name: 'Order transactions create',
+							value: 'order_transactions/create',
 						},
 						{
-						  name: 'Orders cancelled',
-						  value: 'orders/cancelled',
+							name: 'Orders cancelled',
+							value: 'orders/cancelled',
 						},
 						{
-						  name: 'Orders create',
-						  value: 'orders/create',
+							name: 'Orders create',
+							value: 'orders/create',
 						},
 						{
-						  name: 'Orders delete',
-						  value: 'orders/delete',
+							name: 'Orders delete',
+							value: 'orders/delete',
 						},
 						{
-						  name: 'Orders fulfilled',
-						  value: 'orders/fulfilled',
+							name: 'Orders fulfilled',
+							value: 'orders/fulfilled',
 						},
 						{
-						  name: 'Orders paid',
-						  value: 'orders/paid',
+							name: 'Orders paid',
+							value: 'orders/paid',
 						},
 						{
-						  name: 'Orders partially fulfilled',
-						  value: 'orders/partially_fulfilled',
+							name: 'Orders partially fulfilled',
+							value: 'orders/partially_fulfilled',
 						},
 						{
-						  name: 'Orders updated',
-						  value: 'orders/updated',
+							name: 'Orders updated',
+							value: 'orders/updated',
 						},
 						{
-						  name: 'Product listings add',
-						  value: 'product_listings/add',
+							name: 'Product listings add',
+							value: 'product_listings/add',
 						},
 						{
-						  name: 'Product listings remove',
-						  value: 'product_listings/remove',
+							name: 'Product listings remove',
+							value: 'product_listings/remove',
 						},
 						{
-						  name: 'Product listings update',
-						  value: 'product_listings/update',
+							name: 'Product listings update',
+							value: 'product_listings/update',
 						},
 						{
-						  name: 'Products create',
-						  value: 'products/create',
+							name: 'Products create',
+							value: 'products/create',
 						},
 						{
-						  name: 'Products delete',
-						  value: 'products/delete',
+							name: 'Products delete',
+							value: 'products/delete',
 						},
 						{
-						  name: 'Products update',
-						  value: 'products/update',
+							name: 'Products update',
+							value: 'products/update',
 						},
 						{
-						  name: 'Refunds create',
-						  value: 'refunds/create',
+							name: 'Refunds create',
+							value: 'refunds/create',
 						},
 						{
-						  name: 'Shop update',
-						  value: 'shop/update',
+							name: 'Shop update',
+							value: 'shop/update',
 						},
 						{
-						  name: 'Tender transactions create',
-						  value: 'tender_transactions/create',
+							name: 'Tender transactions create',
+							value: 'tender_transactions/create',
 						},
 						{
-						  name: 'Themes create',
-						  value: 'themes/create',
+							name: 'Themes create',
+							value: 'themes/create',
 						},
 						{
-						  name: 'Themes delete',
-						  value: 'themes/delete',
+							name: 'Themes delete',
+							value: 'themes/delete',
 						},
 						{
-						  name: 'Themes publish',
-						  value: 'themes/publish',
+							name: 'Themes publish',
+							value: 'themes/publish',
 						},
 						{
-						  name: 'Themes update',
-						  value: 'themes/update',
+							name: 'Themes update',
+							value: 'themes/update',
 						},
 					],
 				description: 'Event that triggers the webhook',
@@ -326,13 +326,13 @@ export class ShopifyTrigger implements INodeType {
 						topic,
 						address: webhookUrl,
 						format: 'json',
-					}
+					},
 				};
 
 				let responseData;
 				try {
-					 responseData = await shopifyApiRequest.call(this, 'POST', endpoint, body);
-				} catch(error) {
+					responseData = await shopifyApiRequest.call(this, 'POST', endpoint, body);
+				} catch (error) {
 					return false;
 				}
 
@@ -370,9 +370,9 @@ export class ShopifyTrigger implements INodeType {
 		const req = this.getRequestObject();
 		const webhookData = this.getWorkflowStaticData('node') as IDataObject;
 		if (headerData['x-shopify-topic'] !== undefined
-		&& headerData['x-shopify-hmac-sha256'] !== undefined
-		&& headerData['x-shopify-shop-domain'] !== undefined
-		&& headerData['x-shopify-api-version'] !== undefined) {
+			&& headerData['x-shopify-hmac-sha256'] !== undefined
+			&& headerData['x-shopify-shop-domain'] !== undefined
+			&& headerData['x-shopify-api-version'] !== undefined) {
 			// @ts-ignore
 			const computedSignature = createHmac('sha256', webhookData.sharedSecret as string).update(req.rawBody).digest('base64');
 			if (headerData['x-shopify-hmac-sha256'] !== computedSignature) {
@@ -386,7 +386,7 @@ export class ShopifyTrigger implements INodeType {
 		}
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.ts b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
index b4022ff0e..2b8defc44 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.ts
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
@@ -1,6 +1,6 @@
 import {
-	IExecuteFunctions,
 	BINARY_ENCODING,
+	IExecuteFunctions,
 } from 'n8n-core';
 
 import {
@@ -122,7 +122,7 @@ export class Signl4 implements INodeType {
 							{
 								name: 'Single ACK',
 								value: 'single_ack',
-								description: 'In case only one person needs to confirm this Signl.'
+								description: 'In case only one person needs to confirm this Signl.',
 							},
 							{
 								name: 'Multi ACK',
@@ -207,7 +207,7 @@ export class Signl4 implements INodeType {
 										default: '',
 									},
 								],
-							}
+							},
 						],
 					},
 					{
diff --git a/packages/nodes-base/nodes/Signl4/signl4.png b/packages/nodes-base/nodes/Signl4/signl4.png
index 205c94a5d..444eda1b6 100644
Binary files a/packages/nodes-base/nodes/Signl4/signl4.png and b/packages/nodes-base/nodes/Signl4/signl4.png differ
diff --git a/packages/nodes-base/nodes/Slack/ChannelDescription.ts b/packages/nodes-base/nodes/Slack/ChannelDescription.ts
index 8e279bbea..5034bf0bc 100644
--- a/packages/nodes-base/nodes/Slack/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Slack/ChannelDescription.ts
@@ -114,7 +114,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'archive'
+					'archive',
 				],
 				resource: [
 					'channel',
@@ -138,7 +138,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'close'
+					'close',
 				],
 				resource: [
 					'channel',
@@ -161,7 +161,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'create'
+					'create',
 				],
 				resource: [
 					'channel',
@@ -205,7 +205,7 @@ export const channelFields = [
 				default: [],
 				description: `Required for workspace apps. A list of between 1 and 30 human users that will be added to the newly-created conversation`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 channel:invite                             */
@@ -221,7 +221,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'invite'
+					'invite',
 				],
 				resource: [
 					'channel',
@@ -242,7 +242,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'invite'
+					'invite',
 				],
 				resource: [
 					'channel',
@@ -263,7 +263,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'get'
+					'get',
 				],
 				resource: [
 					'channel',
@@ -296,7 +296,7 @@ export const channelFields = [
 				type: 'boolean',
 				default: false,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                  channel:kick                              */
@@ -313,7 +313,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'kick'
+					'kick',
 				],
 				resource: [
 					'channel',
@@ -333,7 +333,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'kick'
+					'kick',
 				],
 				resource: [
 					'channel',
@@ -357,7 +357,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'join'
+					'join',
 				],
 				resource: [
 					'channel',
@@ -441,25 +441,25 @@ export const channelFields = [
 				options: [
 					{
 						name: 'Public Channel',
-						value: 'public_channel'
+						value: 'public_channel',
 					},
 					{
 						name: 'Private Channel',
-						value: 'private_channel'
+						value: 'private_channel',
 					},
 					{
 						name: 'mpim',
-						value: 'mpim'
+						value: 'mpim',
 					},
 					{
 						name: 'im',
-						value: 'im'
+						value: 'im',
 					},
 				],
 				default: ['public_channel'],
 				description: 'Mix and match channel types',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 channel:history                            */
@@ -476,7 +476,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'history'
+					'history',
 				],
 				resource: [
 					'channel',
@@ -565,7 +565,7 @@ export const channelFields = [
 				default: '',
 				description: 'Start of time range of messages to include in results.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                channel:leave                               */
@@ -580,7 +580,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'leave'
+					'leave',
 				],
 				resource: [
 					'channel',
@@ -635,7 +635,7 @@ export const channelFields = [
 				default: [],
 				description: `If only one user is included, this creates a 1:1 DM. The ordering of the users is preserved whenever a multi-person direct message is returned. Supply a channel when not supplying users.`,
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                channel:rename                              */
@@ -650,7 +650,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'rename'
+					'rename',
 				],
 				resource: [
 					'channel',
@@ -668,7 +668,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'rename'
+					'rename',
 				],
 				resource: [
 					'channel',
@@ -694,7 +694,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'replies'
+					'replies',
 				],
 				resource: [
 					'channel',
@@ -712,7 +712,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'replies'
+					'replies',
 				],
 				resource: [
 					'channel',
@@ -801,7 +801,7 @@ export const channelFields = [
 				default: '',
 				description: 'Start of time range of messages to include in results.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                channel:setPurpose                          */
@@ -816,7 +816,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'setPurpose'
+					'setPurpose',
 				],
 				resource: [
 					'channel',
@@ -834,7 +834,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'setPurpose'
+					'setPurpose',
 				],
 				resource: [
 					'channel',
@@ -858,7 +858,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'setTopic'
+					'setTopic',
 				],
 				resource: [
 					'channel',
@@ -876,7 +876,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'setTopic'
+					'setTopic',
 				],
 				resource: [
 					'channel',
@@ -900,7 +900,7 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'unarchive'
+					'unarchive',
 				],
 				resource: [
 					'channel',
diff --git a/packages/nodes-base/nodes/Slack/FileDescription.ts b/packages/nodes-base/nodes/Slack/FileDescription.ts
index fe1bbe8f8..1b78fc294 100644
--- a/packages/nodes-base/nodes/Slack/FileDescription.ts
+++ b/packages/nodes-base/nodes/Slack/FileDescription.ts
@@ -47,7 +47,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
@@ -64,13 +64,13 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
 				],
 				binaryData: [
-					false
+					false,
 				],
 			},
 
@@ -87,13 +87,13 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
 				],
 				binaryData: [
-					true
+					true,
 				],
 			},
 
@@ -108,7 +108,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'upload'
+					'upload',
 				],
 				resource: [
 					'file',
@@ -210,7 +210,7 @@ export const fileFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'getAll'
+					'getAll',
 				],
 				resource: [
 					'file',
diff --git a/packages/nodes-base/nodes/Slack/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/GenericFunctions.ts
index 5686d9c0e..09d1ef45f 100644
--- a/packages/nodes-base/nodes/Slack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/GenericFunctions.ts
@@ -20,12 +20,12 @@ export async function slackApiRequest(this: IExecuteFunctions | IExecuteSingleFu
 	let options: OptionsWithUri = {
 		method,
 		headers: headers || {
-			'Content-Type': 'application/json; charset=utf-8'
+			'Content-Type': 'application/json; charset=utf-8',
 		},
 		body,
 		qs: query,
 		uri: `https://slack.com/api${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(body).length === 0) {
@@ -35,6 +35,9 @@ export async function slackApiRequest(this: IExecuteFunctions | IExecuteSingleFu
 		delete options.qs;
 	}
 	try {
+
+		let response: any; // tslint:disable-line:no-any
+
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('slackApi');
 			if (credentials === undefined) {
@@ -42,7 +45,7 @@ export async function slackApiRequest(this: IExecuteFunctions | IExecuteSingleFu
 			}
 			options.headers!.Authorization = `Bearer ${credentials.accessToken}`;
 			//@ts-ignore
-			return await this.helpers.request(options);
+			response = await this.helpers.request(options);
 		} else {
 
 			const oAuth2Options: IOAuth2Options = {
@@ -50,8 +53,14 @@ export async function slackApiRequest(this: IExecuteFunctions | IExecuteSingleFu
 				property: 'authed_user.access_token',
 			};
 			//@ts-ignore
-			return await this.helpers.requestOAuth2.call(this, 'slackOAuth2Api', options, oAuth2Options);
+			response = await this.helpers.requestOAuth2.call(this, 'slackOAuth2Api', options, oAuth2Options);
 		}
+
+		if (response.ok === false) {
+			throw new Error('Slack error response: ' + JSON.stringify(response));
+		}
+
+		return response;
 	} catch (error) {
 		if (error.statusCode === 401) {
 			// Return a clear error
diff --git a/packages/nodes-base/nodes/Slack/MessageDescription.ts b/packages/nodes-base/nodes/Slack/MessageDescription.ts
index 6619c5181..ad5ac67f1 100644
--- a/packages/nodes-base/nodes/Slack/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/MessageDescription.ts
@@ -84,7 +84,7 @@ export const messageFields = [
 					'accessToken',
 				],
 				operation: [
-					'post'
+					'post',
 				],
 				resource: [
 					'message',
@@ -121,7 +121,7 @@ export const messageFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'post'
+					'post',
 				],
 				resource: [
 					'message',
@@ -318,10 +318,10 @@ export const messageFields = [
 								default: true,
 								description: 'If items can be displayed next to each other.',
 							},
-						]
+						],
 					},
 				],
-			}
+			},
 		],
 	},
 	{
@@ -331,7 +331,7 @@ export const messageFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'post'
+					'post',
 				],
 				resource: [
 					'message',
@@ -349,10 +349,10 @@ export const messageFields = [
 				displayOptions: {
 					show: {
 						'/as_user': [
-							false
+							false,
 						],
 						'/operation': [
-							'post'
+							'post',
 						],
 						'/resource': [
 							'message',
@@ -369,10 +369,10 @@ export const messageFields = [
 				displayOptions: {
 					show: {
 						'/as_user': [
-							false
+							false,
 						],
 						'/operation': [
-							'post'
+							'post',
 						],
 						'/resource': [
 							'message',
@@ -445,7 +445,7 @@ export const messageFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Channel containing the message to be updated.',
@@ -463,7 +463,7 @@ export const messageFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: `New text for the message, using the default formatting rules. It's not required when presenting attachments.`,
@@ -481,7 +481,7 @@ export const messageFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: `Timestamp of the message to be updated.`,
@@ -497,7 +497,7 @@ export const messageFields = [
 					'accessToken',
 				],
 				operation: [
-					'update'
+					'update',
 				],
 				resource: [
 					'message',
@@ -564,7 +564,7 @@ export const messageFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'post'
+					'post',
 				],
 				resource: [
 					'message',
@@ -1487,7 +1487,7 @@ export const messageFields = [
 					false,
 				],
 				operation: [
-					'update'
+					'update',
 				],
 				resource: [
 					'message',
@@ -1665,10 +1665,10 @@ export const messageFields = [
 								default: true,
 								description: 'If items can be displayed next to each other.',
 							},
-						]
+						],
 					},
 				],
-			}
+			},
 		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.ts b/packages/nodes-base/nodes/Slack/Slack.node.ts
index f95558b64..a82f894b4 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.ts
+++ b/packages/nodes-base/nodes/Slack/Slack.node.ts
@@ -5,37 +5,48 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
 	channelFields,
 	channelOperations,
 } from './ChannelDescription';
+
 import {
 	messageFields,
 	messageOperations,
 } from './MessageDescription';
+
 import {
 	starFields,
 	starOperations,
 } from './StarDescription';
+
 import {
 	fileFields,
 	fileOperations,
 } from './FileDescription';
+
+import {
+	userProfileFields,
+	userProfileOperations,
+} from './UserProfileDescription';
+
 import {
 	slackApiRequest,
 	slackApiRequestAllItems,
 	validateJSON,
 } from './GenericFunctions';
+
 import {
 	IAttachment,
 } from './MessageInterface';
+import moment = require('moment');
 
 interface Attachment {
 	fields: {
@@ -156,6 +167,10 @@ export class Slack implements INodeType {
 						name: 'Star',
 						value: 'star',
 					},
+					{
+						name: 'User Profile',
+						value: 'userProfile',
+					},
 				],
 				default: 'message',
 				description: 'The resource to operate on.',
@@ -169,6 +184,8 @@ export class Slack implements INodeType {
 			...starFields,
 			...fileOperations,
 			...fileFields,
+			...userProfileOperations,
+			...userProfileFields,
 		],
 	};
 
@@ -218,7 +235,23 @@ export class Slack implements INodeType {
 
 				return returnData;
 			},
-		}
+			// Get all the team fields to display them to user so that he can
+			// select them easily
+			async getTeamFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { profile: { fields } } = await slackApiRequest.call(this, 'GET', '/team.profile.get');
+				console.log(fields);
+				for (const field of fields) {
+					const fieldName = field.label;
+					const fieldId = field.id;
+					returnData.push({
+						name: fieldName,
+						value: fieldId,
+					});
+				}
+				return returnData;
+			},
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -232,6 +265,7 @@ export class Slack implements INodeType {
 		const operation = this.getNodeParameter('operation', 0) as string;
 
 		for (let i = 0; i < length; i++) {
+			responseData = { error: 'Resource ' + resource + ' / operation ' + operation + ' not found!'};
 			qs = {};
 			if (resource === 'channel') {
 				//https://api.slack.com/methods/conversations.archive
@@ -799,7 +833,7 @@ export class Slack implements INodeType {
 								filename: items[i].binary[binaryPropertyName].fileName,
 								//@ts-ignore
 								contentType: items[i].binary[binaryPropertyName].mimeType,
-							}
+							},
 						};
 						responseData = await slackApiRequest.call(this, 'POST', '/files.upload', {}, qs, { 'Content-Type': 'multipart/form-data' }, { formData: body });
 						responseData = responseData.file;
@@ -848,6 +882,55 @@ export class Slack implements INodeType {
 					responseData = responseData.file;
 				}
 			}
+			if (resource === 'userProfile') {
+				//https://api.slack.com/methods/users.profile.set
+				if (operation === 'update') {
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const timezone = this.getTimezone();
+
+					const body: IDataObject = {};
+
+					Object.assign(body, additionalFields);
+
+					if (body.status_expiration === undefined) {
+						body.status_expiration = 0;
+
+					} else {
+						body.status_expiration = moment.tz(body.status_expiration as string, timezone).unix();
+					}
+
+					if (body.customFieldUi) {
+						const customFields = (body.customFieldUi as IDataObject).customFieldValues as IDataObject[];
+
+						body.fields = {};
+
+						for (const customField of customFields) {
+							//@ts-ignore
+							body.fields[customField.id] = {
+								value: customField.value,
+								alt: customField.alt,
+							};
+						}
+					}
+
+					responseData = await slackApiRequest.call(this, 'POST', '/users.profile.set', { profile: body }, qs);
+
+					responseData = responseData.profile;
+				}
+				//https://api.slack.com/methods/users.profile.get
+				if (operation === 'get') {
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {};
+
+					Object.assign(body, additionalFields);
+
+					responseData = await slackApiRequest.call(this, 'POST', '/users.profile.get', body);
+
+					responseData = responseData.profile;
+				}
+			}
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
 			} else {
diff --git a/packages/nodes-base/nodes/Slack/StarDescription.ts b/packages/nodes-base/nodes/Slack/StarDescription.ts
index 282025b1e..0f77db759 100644
--- a/packages/nodes-base/nodes/Slack/StarDescription.ts
+++ b/packages/nodes-base/nodes/Slack/StarDescription.ts
@@ -46,7 +46,7 @@ export const starFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'add'
+					'add',
 				],
 				resource: [
 					'star',
@@ -100,7 +100,7 @@ export const starFields = [
 		displayOptions: {
 			show: {
 				operation: [
-					'delete'
+					'delete',
 				],
 				resource: [
 					'star',
diff --git a/packages/nodes-base/nodes/Slack/UserProfileDescription.ts b/packages/nodes-base/nodes/Slack/UserProfileDescription.ts
new file mode 100644
index 000000000..a3475ee99
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/UserProfileDescription.ts
@@ -0,0 +1,183 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+import { text } from 'express';
+
+export const userProfileOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'userProfile',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get',
+				value: 'get',
+				description: `Get your user's profile`,
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: `Update user's profile`,
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const userProfileFields = [
+
+/* -------------------------------------------------------------------------- */
+/*                                userProfile:update                          */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'userProfile',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldUi',
+				placeholder: 'Add Custom Fields',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customFieldValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'id',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getTeamFields',
+								},
+								default: '',
+								description: 'ID of the field to set.',
+							},
+							{
+								displayName: 'Field Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the field to set.',
+							},
+							{
+								displayName: 'Alt',
+								name: 'alt',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				description: `This field can only be changed by admins for users on paid teams.`,
+			},
+			{
+				displayName: 'First Name',
+				name: 'first_name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'last_name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Status Emoji',
+				name: 'status_emoji',
+				type: 'string',
+				default: '',
+				description: `is a string referencing an emoji enabled for the Slack team, such as :mountain_railway:`,
+			},
+			{
+				displayName: 'Status Expiration',
+				name: 'status_expiration',
+				type: 'dateTime',
+				default: '',
+				description: `is an integer specifying seconds since the epoch, more commonly known as "UNIX time". Providing 0 or omitting this field results in a custom status that will not expire`,
+			},
+			{
+				displayName: 'Status Text',
+				name: 'status_text',
+				type: 'string',
+				default: '',
+				description: `allows up to 100 characters, though we strongly encourage brevity.`,
+			},
+			{
+				displayName: 'User ID',
+				name: 'user',
+				type: 'string',
+				default: '',
+				description: `ID of user to change. This argument may only be specified by team admins on paid teams.`,
+			},
+		],
+	},
+/* -------------------------------------------------------------------------- */
+/*                                userProfile:get                             */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'userProfile',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Labels',
+				name: 'include_labels',
+				type: 'boolean',
+				default: false,
+				description: `Include labels for each ID in custom profile fields`,
+			},
+			{
+				displayName: 'User ID',
+				name: 'user',
+				type: 'string',
+				default: '',
+				description: `User to retrieve profile info for`,
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.ts b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
index 6e12c517d..745563d71 100644
--- a/packages/nodes-base/nodes/Sms77/Sms77.node.ts
+++ b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
@@ -21,7 +21,7 @@ export class Sms77 implements INodeType {
 			{
 				name: 'sms77Api',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index f4c86a9d2..539b43f1c 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -31,7 +31,7 @@ export async function spotifyApiRequest(this: IHookFunctions | IExecuteFunctions
 		body,
 		qs: query,
 		uri: uri || `https://api.spotify.com/v1${endpoint}`,
-		json: true
+		json: true,
 	};
 
 	try {
@@ -48,17 +48,17 @@ export async function spotifyApiRequest(this: IHookFunctions | IExecuteFunctions
 		return await this.helpers.requestOAuth2.call(this, 'spotifyOAuth2Api', options);
 	} catch (error) {
 		if (error.statusCode === 401) {
-            // Return a clear error
-            throw new Error('The Spotify credentials are not valid!');
-        }
+			// Return a clear error
+			throw new Error('The Spotify credentials are not valid!');
+		}
 
-        if (error.error && error.error.error && error.error.error.message) {
-            // Try to return the error prettier
-            throw new Error(`Spotify error response [${error.error.error.status}]: ${error.error.error.message}`);
-        }
+		if (error.error && error.error.error && error.error.error.message) {
+			// Try to return the error prettier
+			throw new Error(`Spotify error response [${error.error.error.status}]: ${error.error.error.message}`);
+		}
 
-        // If that data does not exist for some reason return the actual error
-        throw error;
+		// If that data does not exist for some reason return the actual error
+		throw error;
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 797020c39..662d5d8d4 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -88,17 +88,17 @@ export class Spotify implements INodeType {
 					{
 						name: 'Add Song to Queue',
 						value: 'addSongToQueue',
-						description: 'Add a song to your queue.'
+						description: 'Add a song to your queue.',
 					},
 					{
 						name: 'Currently Playing',
 						value: 'currentlyPlaying',
-						description: 'Get your currently playing track.'
+						description: 'Get your currently playing track.',
 					},
 					{
 						name: 'Next Song',
 						value: 'nextSong',
-						description: 'Skip to your next track.'
+						description: 'Skip to your next track.',
 					},
 					{
 						name: 'Pause',
@@ -108,17 +108,17 @@ export class Spotify implements INodeType {
 					{
 						name: 'Previous Song',
 						value: 'previousSong',
-						description: 'Skip to your previous song.'
+						description: 'Skip to your previous song.',
 					},
 					{
 						name: 'Recently Played',
 						value: 'recentlyPlayed',
-						description: 'Get your recently played tracks.'
+						description: 'Get your recently played tracks.',
 					},
 					{
 						name: 'Start Music',
 						value: 'startMusic',
-						description: 'Start playing a playlist, artist, or album.'
+						description: 'Start playing a playlist, artist, or album.',
 					},
 				],
 				default: 'addSongToQueue',
@@ -133,7 +133,7 @@ export class Spotify implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'player'
+							'player',
 						],
 						operation: [
 							'startMusic',
@@ -152,7 +152,7 @@ export class Spotify implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'player'
+							'player',
 						],
 						operation: [
 							'addSongToQueue',
@@ -273,7 +273,7 @@ export class Spotify implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
-							'artist'
+							'artist',
 						],
 						operation: [
 							'getTopTracks',
@@ -449,7 +449,7 @@ export class Spotify implements INodeType {
 						resource: [
 							'album',
 							'artist',
-							'playlist'
+							'playlist',
 						],
 						operation: [
 							'getTracks',
@@ -489,7 +489,7 @@ export class Spotify implements INodeType {
 				},
 				description: `The number of items to return.`,
 			},
-		]
+		],
 	};
 
 
@@ -594,7 +594,7 @@ export class Spotify implements INodeType {
 					const id = this.getNodeParameter('id', i) as string;
 
 					qs = {
-						uri: id
+						uri: id,
 					};
 
 					responseData = await spotifyApiRequest.call(this, requestMethod, endpoint, body, qs);
@@ -739,7 +739,7 @@ export class Spotify implements INodeType {
 							const limit = this.getNodeParameter('limit', i) as number;
 
 							qs = {
-								'limit': limit
+								'limit': limit,
 							};
 
 							responseData = await spotifyApiRequest.call(this, requestMethod, endpoint, body, qs);
@@ -752,7 +752,7 @@ export class Spotify implements INodeType {
 						const trackId = this.getNodeParameter('trackID', i) as string;
 
 						qs = {
-							uris: trackId
+							uris: trackId,
 						};
 
 						endpoint = `/playlists/${id}/tracks`;
diff --git a/packages/nodes-base/nodes/Spotify/spotify.png b/packages/nodes-base/nodes/Spotify/spotify.png
index 2feeb78bb..14d3dea4a 100644
Binary files a/packages/nodes-base/nodes/Spotify/spotify.png and b/packages/nodes-base/nodes/Spotify/spotify.png differ
diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
index b1d1c1419..c902f0279 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
@@ -4,18 +4,19 @@ import {
 } from 'n8n-core';
 
 import {
+	IDataObject,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IDataObject,
 } from 'n8n-workflow';
 
 import {
 	read as xlsxRead,
+	Sheet2JSONOpts,
 	utils as xlsxUtils,
+	WorkBook,
 	write as xlsxWrite,
 	WritingOptions,
-	WorkBook,
 } from 'xlsx';
 
 
@@ -143,7 +144,7 @@ export class SpreadsheetFile implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'toFile'
+							'toFile',
 						],
 					},
 				},
@@ -212,7 +213,7 @@ export class SpreadsheetFile implements INodeType {
 						displayOptions: {
 							show: {
 								'/operation': [
-									'fromFile'
+									'fromFile',
 								],
 							},
 						},
@@ -226,13 +227,27 @@ export class SpreadsheetFile implements INodeType {
 						displayOptions: {
 							show: {
 								'/operation': [
-									'fromFile'
+									'fromFile',
 								],
 							},
 						},
 						default: false,
 						description: 'In some cases and file formats, it is necessary to read<br />specifically as string else some special character get interpreted wrong.',
 					},
+					{
+						displayName: 'Range',
+						name: 'range',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'fromFile',
+								],
+							},
+						},
+						default: '',
+						description: 'The range to read from the table.<br />If set to a number it will be the starting row.<br />If set to string it will be used as A1-style bounded range.',
+					},
 					{
 						displayName: 'Sheet Name',
 						name: 'sheetName',
@@ -268,7 +283,7 @@ export class SpreadsheetFile implements INodeType {
 					},
 				],
 			},
-		]
+		],
 	};
 
 
@@ -317,7 +332,16 @@ export class SpreadsheetFile implements INodeType {
 				}
 
 				// Convert it to json
-				const sheetJson = xlsxUtils.sheet_to_json(workbook.Sheets[sheetName]);
+				const sheetToJsonOptions: Sheet2JSONOpts = {};
+				if (options.range) {
+					if (isNaN(options.range as number)) {
+						sheetToJsonOptions.range = options.range;
+					} else {
+						sheetToJsonOptions.range = parseInt(options.range as string, 10);
+					}
+				}
+
+				const sheetJson = xlsxUtils.sheet_to_json(workbook.Sheets[sheetName], sheetToJsonOptions);
 
 				// Check if data could be found in file
 				if (sheetJson.length === 0) {
@@ -349,7 +373,7 @@ export class SpreadsheetFile implements INodeType {
 
 			const wopts: WritingOptions = {
 				bookSST: false,
-				type: 'buffer'
+				type: 'buffer',
 			};
 
 			if (fileFormat === 'csv') {
@@ -378,7 +402,7 @@ export class SpreadsheetFile implements INodeType {
 				SheetNames: [sheetName],
 				Sheets: {
 					[sheetName]: ws,
-				}
+				},
 			};
 			const wbout = xlsxWrite(wb, wopts);
 
diff --git a/packages/nodes-base/nodes/SseTrigger.node.ts b/packages/nodes-base/nodes/SseTrigger.node.ts
index 8c1c80700..6d410a097 100644
--- a/packages/nodes-base/nodes/SseTrigger.node.ts
+++ b/packages/nodes-base/nodes/SseTrigger.node.ts
@@ -31,7 +31,7 @@ export class SseTrigger implements INodeType {
 				description: 'The URL to receive the SSE from.',
 				required: true,
 			},
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/Strava/ActivityDescription.ts b/packages/nodes-base/nodes/Strava/ActivityDescription.ts
new file mode 100644
index 000000000..34b57945f
--- /dev/null
+++ b/packages/nodes-base/nodes/Strava/ActivityDescription.ts
@@ -0,0 +1,416 @@
+
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const activityOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new activity',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an activity',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all activities',
+			},
+			{
+				name: 'Get Comments',
+				value: 'getComments',
+				description: 'Get all activity comments',
+			},
+			{
+				name: 'Get Kudos',
+				value: 'getKudos',
+				description: 'Get all activity kudos',
+			},
+			{
+				name: 'Get Laps',
+				value: 'getLaps',
+				description: 'Get all activity laps',
+			},
+			{
+				name: 'Get Zones',
+				value: 'getZones',
+				description: 'Get all activity zones',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an activity',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const activityFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                activity:create                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: 'The name of the activity',
+	},
+	{
+		displayName: 'Type',
+		name: 'type',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: 'Type of activity. For example - Run, Ride etc.',
+	},
+	{
+		displayName: 'Start Date',
+		name: 'startDate',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'ISO 8601 formatted date time.',
+	},
+	{
+		displayName: 'Elapsed Time (Seconds)',
+		name: 'elapsedTime',
+		type: 'number',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 0,
+		},
+		default: 0,
+		description: 'In seconds.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Commute',
+				name: 'commute',
+				type: 'boolean',
+				default: false,
+				description: 'Set to true to mark as commute.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Description of the activity.',
+			},
+			{
+				displayName: 'Distance',
+				name: 'distance',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				description: 'In meters.',
+			},
+			{
+				displayName: 'Trainer',
+				name: 'trainer',
+				type: 'boolean',
+				default: false,
+				description: 'Set to true to mark as a trainer activity.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                activity:update                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Activity ID',
+		name: 'activityId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		default: '',
+		description: 'ID or email of activity',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Commute',
+				name: 'commute',
+				type: 'boolean',
+				default: false,
+				description: 'Set to true to mark as commute.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Description of the activity.',
+			},
+			{
+				displayName: 'Gear ID',
+				name: 'gear_id',
+				type: 'string',
+				default: '',
+				description: 'Identifier for the gear associated with the activity. ‘none’ clears gear from activity',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'The name of the activity',
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'string',
+				default: '',
+				description: 'Type of activity. For example - Run, Ride etc.',
+			},
+			{
+				displayName: 'Trainer',
+				name: 'trainer',
+				type: 'boolean',
+				default: false,
+				description: 'Set to true to mark as a trainer activity.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  activity:get                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Activity ID',
+		name: 'activityId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		default: '',
+		description: 'ID or email of activity',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  activity                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Activity ID',
+		name: 'activityId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'getComments',
+					'getLaps',
+					'getKudos',
+					'getZones',
+				],
+			},
+		},
+		default: '',
+		description: 'ID or email of activity',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				operation: [
+					'getComments',
+					'getLaps',
+					'getKudos',
+					'getZones',
+				],
+			},
+		},
+		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: [
+					'activity',
+				],
+				operation: [
+					'getComments',
+					'getLaps',
+					'getKudos',
+					'getZones',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  activity:getAll                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'activity',
+				],
+				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: [
+					'activity',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Strava/GenericFunctions.ts b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
new file mode 100644
index 000000000..832ee3e65
--- /dev/null
+++ b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
@@ -0,0 +1,91 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function stravaApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const options: OptionsWithUri = {
+		method,
+		form: body,
+		qs,
+		uri: uri || `https://www.strava.com/api/v3${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+
+		if (this.getNode().type.includes('Trigger') && resource.includes('/push_subscriptions')) {
+			const credentials = this.getCredentials('stravaOAuth2Api') as IDataObject;
+			if (method === 'GET') {
+				qs.client_id = credentials.clientId;
+				qs.client_secret = credentials.clientSecret;
+			} else {
+				body.client_id = credentials.clientId;
+				body.client_secret = credentials.clientSecret;
+			}
+			//@ts-ignore
+			return this.helpers?.request(options);
+
+		} else {
+			//@ts-ignore
+			return await this.helpers.requestOAuth2.call(this, 'stravaOAuth2Api', options);
+		}
+	} catch (error) {
+
+		if (error.statusCode === 402) {
+			throw new Error(
+				`Strava error response [${error.statusCode}]: Payment Required`,
+			);
+		}
+
+		if (error.response && error.response.body && error.response.body.errors) {
+
+			let errors = error.response.body.errors;
+
+			errors = errors.map((e: IDataObject) => `${e.code} -> ${e.field}`);
+			// Try to return the error prettier
+			throw new Error(
+				`Strava error response [${error.statusCode}]: ${errors.join('|')}`,
+			);
+		}
+		throw error;
+	}
+}
+
+export async function stravaApiRequestAllItems(this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	query.per_page = 30;
+
+	query.page = 1;
+
+	do {
+		responseData = await stravaApiRequest.call(this, method, resource, body, query);
+		query.page++;
+		returnData.push.apply(returnData, responseData);
+	} while (
+		responseData.length !== 0
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
new file mode 100644
index 000000000..e9f257e1f
--- /dev/null
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -0,0 +1,175 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	stravaApiRequest,
+	stravaApiRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	activityFields,
+	activityOperations,
+} from './ActivityDescription';
+
+import * as moment from 'moment';
+
+export class Strava implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Strava',
+		name: 'strava',
+		icon: 'file:strava.svg',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Strava API.',
+		defaults: {
+			name: 'Strava',
+			color: '#ea5929',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'stravaOAuth2Api',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Activity',
+						value: 'activity',
+					},
+				],
+				default: 'activity',
+				description: 'The resource to operate on.',
+			},
+			...activityOperations,
+			...activityFields,
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+
+			if (resource === 'activity') {
+				//https://developers.strava.com/docs/reference/#api-Activities-createActivity
+				if (operation === 'create') {
+					const name = this.getNodeParameter('name', i) as string;
+
+					const type = this.getNodeParameter('type', i) as string;
+
+					const startDate = this.getNodeParameter('startDate', i) as string;
+
+					const elapsedTime = this.getNodeParameter('elapsedTime', i) as number;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					if (additionalFields.trainer === true) {
+						additionalFields.trainer = 1;
+					}
+
+					if (additionalFields.commute === true) {
+						additionalFields.commute = 1;
+					}
+
+					const body: IDataObject = {
+						name,
+						type,
+						start_date_local: moment(startDate).toISOString(),
+						elapsed_time: elapsedTime,
+					};
+
+					Object.assign(body, additionalFields);
+
+					responseData = await stravaApiRequest.call(this, 'POST', '/activities', body);
+				}
+				//https://developers.strava.com/docs/reference/#api-Activities-getActivityById
+				if (operation === 'get') {
+					const activityId = this.getNodeParameter('activityId', i) as string;
+
+					responseData = await stravaApiRequest.call(this, 'GET', `/activities/${activityId}`);
+				}
+				if (['getLaps', 'getZones', 'getKudos', 'getComments'].includes(operation)) {
+
+					const path: IDataObject = {
+						'getComments': 'comments',
+						'getZones': 'zones',
+						'getKudos': 'kudos',
+						'getLaps': 'laps',
+					};
+
+					const activityId = this.getNodeParameter('activityId', i) as string;
+
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					responseData = await stravaApiRequest.call(this, 'GET', `/activities/${activityId}/${path[operation]}`);
+
+					if (returnAll === false) {
+						const limit = this.getNodeParameter('limit', i) as number;
+						responseData = responseData.splice(0, limit);
+					}
+				}
+				//https://developers.mailerlite.com/reference#subscribers
+				if (operation === 'getAll') {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					if (returnAll) {
+
+						responseData = await stravaApiRequestAllItems.call(this, 'GET', `/activities`, {}, qs);
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+
+						responseData = await stravaApiRequest.call(this, 'GET', `/activities`, {}, qs);
+					}
+				}
+				//https://developers.strava.com/docs/reference/#api-Activities-updateActivityById
+				if (operation === 'update') {
+					const activityId = this.getNodeParameter('activityId', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					if (updateFields.trainer === true) {
+						updateFields.trainer = 1;
+					}
+
+					if (updateFields.commute === true) {
+						updateFields.commute = 1;
+					}
+
+					const body: IDataObject = {};
+
+					Object.assign(body, updateFields);
+
+					responseData = await stravaApiRequest.call(this, 'PUT', `/activities/${activityId}`, body);
+				}
+			}
+		}
+		if (Array.isArray(responseData)) {
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+
+		} else if (responseData !== undefined) {
+			returnData.push(responseData as IDataObject);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
new file mode 100644
index 000000000..70deda752
--- /dev/null
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -0,0 +1,288 @@
+import {
+	IHookFunctions,
+	IWebhookFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+
+import {
+	stravaApiRequest,
+} from './GenericFunctions';
+
+import {
+	randomBytes,
+} from 'crypto';
+
+export class StravaTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Strava Trigger',
+		name: 'stravaTrigger',
+		icon: 'file:strava.svg',
+		group: ['trigger'],
+		version: 1,
+		description: 'Starts the workflow when a Github events occurs.',
+		defaults: {
+			name: 'Strava Trigger',
+			color: '#ea5929',
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'stravaOAuth2Api',
+				required: true,
+			},
+		],
+		webhooks: [
+			{
+				name: 'setup',
+				httpMethod: 'GET',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Object',
+				name: 'object',
+				type: 'options',
+				options: [
+					{
+						name: '*',
+						value: '*',
+					},
+					{
+						name: 'Activity',
+						value: 'activity',
+					},
+					{
+						name: 'Athlete',
+						value: 'athlete',
+					},
+				],
+				default: '*',
+			},
+			{
+				displayName: 'Event',
+				name: 'event',
+				type: 'options',
+				options: [
+					{
+						name: '*',
+						value: '*',
+					},
+					{
+						name: 'created',
+						value: 'create',
+					},
+					{
+						name: 'Deleted',
+						value: 'delete',
+					},
+					{
+						name: 'Updated',
+						value: 'update',
+					},
+				],
+				default: '*',
+			},
+			{
+				displayName: 'Resolve Data',
+				name: 'resolveData',
+				type: 'boolean',
+				default: true,
+				description: 'By default the webhook-data only contain the Object ID. If this option gets activated it<br />will resolve the data automatically.',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Delete If Exist',
+						name: 'deleteIfExist',
+						type: 'boolean',
+						default: false,
+						description: `Strava allows just one subscription at all times. If you want to delete the current subscription to make<br>
+						room for a new subcription with the current parameters, set this parameter to true. Keep in mind this is a destructive operation.`,
+					},
+				],
+			},
+		],
+	};
+
+	// @ts-ignore (because of request)
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				// Check all the webhooks which exist already if it is identical to the
+				// one that is supposed to get created.
+				const endpoint = '/push_subscriptions';
+
+				const webhooks = await stravaApiRequest.call(this, 'GET', endpoint, {});
+
+				for (const webhook of webhooks) {
+					if (webhook.callback_url === webhookUrl) {
+						webhookData.webhookId = webhook.id;
+						return true;
+					}
+				}
+
+				return false;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+
+				const endpoint = '/push_subscriptions';
+
+				const body = {
+					callback_url: webhookUrl,
+					verify_token: randomBytes(20).toString('hex') as string,
+				};
+
+				let responseData;
+
+				try {
+					responseData = await stravaApiRequest.call(this, 'POST', endpoint, body);
+				} catch (error) {
+					if (error.response && error.response.body && error.response.body.errors) {
+						const errors = error.response.body.errors;
+						for (error of errors) {
+							// if there is a subscription already created
+							if (error.resource === 'PushSubscription' && error.code === 'already exists') {
+								const options = this.getNodeParameter('options') as IDataObject;
+								//get the current subscription
+								const webhooks = await stravaApiRequest.call(this, 'GET', `/push_subscriptions`, {});
+
+								if (options.deleteIfExist) {
+									// delete the subscription
+									await stravaApiRequest.call(this, 'DELETE', `/push_subscriptions/${webhooks[0].id}`);
+									// now there is room create a subscription with the n8n data
+									const body = {
+										callback_url: webhookUrl,
+										verify_token: randomBytes(20).toString('hex') as string,
+									};
+
+									responseData = await stravaApiRequest.call(this, 'POST', `/push_subscriptions`, body);
+								} else {
+									throw new Error(`A subscription already exist [${webhooks[0].callback_url}].
+								If you want to delete this subcription and create a new one with the current parameters please go to options and set delete if exist to true`);
+								}
+							}
+						}
+					}
+
+					if (!responseData) {
+						let errorMessage = '';
+						if (error.response && error.response.body && error.response.body.message) {
+							errorMessage = error.response.body.message;
+						} else {
+							errorMessage = error.message;
+						}
+
+						throw new Error(
+							`Strava error response [${error.statusCode}]: ${errorMessage}`,
+						);
+					}
+				}
+
+				if (responseData.id === undefined) {
+					// Required data is missing so was not successful
+					return false;
+				}
+
+				webhookData.webhookId = responseData.id as string;
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				if (webhookData.webhookId !== undefined) {
+
+					const endpoint = `/push_subscriptions/${webhookData.webhookId}`;
+
+					try {
+						await stravaApiRequest.call(this, 'DELETE', endpoint);
+					} catch (e) {
+						return false;
+					}
+
+					// Remove from the static workflow data so that it is clear
+					// that no webhooks are registred anymore
+					delete webhookData.webhookId;
+				}
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const body = this.getBodyData() as IDataObject;
+		const query = this.getQueryData() as IDataObject;
+		const object = this.getNodeParameter('object');
+		const event = this.getNodeParameter('event');
+		const resolveData = this.getNodeParameter('resolveData') as boolean;
+
+		let objectType, eventType;
+
+		if (object === '*') {
+			objectType = ['activity', 'athlete'];
+		} else {
+			objectType = [object];
+		}
+
+		if (event === '*') {
+			eventType = ['create', 'update', 'delete'];
+		} else {
+			eventType = [event];
+		}
+
+		if (this.getWebhookName() === 'setup') {
+			if (query['hub.challenge']) {
+				// Is a create webhook confirmation request
+				const res = this.getResponseObject();
+				res.status(200).json({ 'hub.challenge': query['hub.challenge'] }).end();
+				return {
+					noWebhookResponse: true,
+				};
+			}
+		}
+
+		if (object !== '*' && !objectType.includes(body.object_type as string)) {
+			return {};
+		}
+
+		if (event !== '*' && !eventType.includes(body.aspect_type as string)) {
+			return {};
+		}
+
+		if (resolveData) {
+			let endpoint = `/athletes/${body.object_id}/stats`;
+			if (body.object_type === 'activity') {
+				endpoint = `/activities/${body.object_id}`;
+			}
+			body.object_data = await stravaApiRequest.call(this, 'GET', endpoint);
+		}
+
+		return {
+			workflowData: [
+				this.helpers.returnJsonArray(body),
+			],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Strava/strava.svg b/packages/nodes-base/nodes/Strava/strava.svg
new file mode 100644
index 000000000..d94ac6a66
--- /dev/null
+++ b/packages/nodes-base/nodes/Strava/strava.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" width="2500" height="2500"><path d="M0 0h16v16H0z" fill="#fc4c02"/><g fill="#fff" fill-rule="evenodd"><path d="M6.9 8.8l2.5 4.5 2.4-4.5h-1.5l-.9 1.7-1-1.7z" opacity=".6"/><path d="M7.2 2.5l3.1 6.3H4zm0 3.8l1.2 2.5H5.9z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index 304af3720..fa05e4bdc 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -5,8 +5,8 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -32,7 +32,7 @@ export class StripeTrigger implements INodeType {
 			{
 				name: 'stripeApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
@@ -59,745 +59,745 @@ export class StripeTrigger implements INodeType {
 					{
 						"name": "Account Updated",
 						"value": "account.updated",
-						"description": "Occurs whenever an account status or property has changed."
+						"description": "Occurs whenever an account status or property has changed.",
 					},
 					{
 						"name": "Account Application.authorized",
 						"value": "account.application.authorized",
-						"description": "Occurs whenever a user authorizes an application. Sent to the related application only."
+						"description": "Occurs whenever a user authorizes an application. Sent to the related application only.",
 					},
 					{
 						"name": "Account Application.deauthorized",
 						"value": "account.application.deauthorized",
-						"description": "Occurs whenever a user deauthorizes an application. Sent to the related application only."
+						"description": "Occurs whenever a user deauthorizes an application. Sent to the related application only.",
 					},
 					{
 						"name": "Account External_account.created",
 						"value": "account.external_account.created",
-						"description": "Occurs whenever an external account is created."
+						"description": "Occurs whenever an external account is created.",
 					},
 					{
 						"name": "Account External_account.deleted",
 						"value": "account.external_account.deleted",
-						"description": "Occurs whenever an external account is deleted."
+						"description": "Occurs whenever an external account is deleted.",
 					},
 					{
 						"name": "Account External_account.updated",
 						"value": "account.external_account.updated",
-						"description": "Occurs whenever an external account is updated."
+						"description": "Occurs whenever an external account is updated.",
 					},
 					{
 						"name": "Application Fee.created",
 						"value": "application_fee.created",
-						"description": "Occurs whenever an application fee is created on a charge."
+						"description": "Occurs whenever an application fee is created on a charge.",
 					},
 					{
 						"name": "Application Fee.refunded",
 						"value": "application_fee.refunded",
-						"description": "Occurs whenever an application fee is refunded, whether from refunding a charge or from refunding the application fee directly. This includes partial refunds."
+						"description": "Occurs whenever an application fee is refunded, whether from refunding a charge or from refunding the application fee directly. This includes partial refunds.",
 					},
 					{
 						"name": "Application Fee.refund.updated",
 						"value": "application_fee.refund.updated",
-						"description": "Occurs whenever an application fee refund is updated."
+						"description": "Occurs whenever an application fee refund is updated.",
 					},
 					{
 						"name": "Balance Available",
 						"value": "balance.available",
-						"description": "Occurs whenever your Stripe balance has been updated (e.g., when a charge is available to be paid out). By default, Stripe automatically transfers funds in your balance to your bank account on a daily basis."
+						"description": "Occurs whenever your Stripe balance has been updated (e.g., when a charge is available to be paid out). By default, Stripe automatically transfers funds in your balance to your bank account on a daily basis.",
 					},
 					{
 						"name": "Capability Updated",
 						"value": "capability.updated",
-						"description": "Occurs whenever a capability has new requirements or a new status."
+						"description": "Occurs whenever a capability has new requirements or a new status.",
 					},
 					{
 						"name": "Charge Captured",
 						"value": "charge.captured",
-						"description": "Occurs whenever a previously uncaptured charge is captured."
+						"description": "Occurs whenever a previously uncaptured charge is captured.",
 					},
 					{
 						"name": "Charge Expired",
 						"value": "charge.expired",
-						"description": "Occurs whenever an uncaptured charge expires."
+						"description": "Occurs whenever an uncaptured charge expires.",
 					},
 					{
 						"name": "Charge Failed",
 						"value": "charge.failed",
-						"description": "Occurs whenever a failed charge attempt occurs."
+						"description": "Occurs whenever a failed charge attempt occurs.",
 					},
 					{
 						"name": "Charge Pending",
 						"value": "charge.pending",
-						"description": "Occurs whenever a pending charge is created."
+						"description": "Occurs whenever a pending charge is created.",
 					},
 					{
 						"name": "Charge Refunded",
 						"value": "charge.refunded",
-						"description": "Occurs whenever a charge is refunded, including partial refunds."
+						"description": "Occurs whenever a charge is refunded, including partial refunds.",
 					},
 					{
 						"name": "Charge Succeeded",
 						"value": "charge.succeeded",
-						"description": "Occurs whenever a new charge is created and is successful."
+						"description": "Occurs whenever a new charge is created and is successful.",
 					},
 					{
 						"name": "Charge Updated",
 						"value": "charge.updated",
-						"description": "Occurs whenever a charge description or metadata is updated."
+						"description": "Occurs whenever a charge description or metadata is updated.",
 					},
 					{
 						"name": "Charge Dispute.closed",
 						"value": "charge.dispute.closed",
-						"description": "Occurs when a dispute is closed and the dispute status changes to lost, warning_closed, or won."
+						"description": "Occurs when a dispute is closed and the dispute status changes to lost, warning_closed, or won.",
 					},
 					{
 						"name": "Charge Dispute.created",
 						"value": "charge.dispute.created",
-						"description": "Occurs whenever a customer disputes a charge with their bank."
+						"description": "Occurs whenever a customer disputes a charge with their bank.",
 					},
 					{
 						"name": "Charge Dispute.funds_reinstated",
 						"value": "charge.dispute.funds_reinstated",
-						"description": "Occurs when funds are reinstated to your account after a dispute is closed. This includes partially refunded payments."
+						"description": "Occurs when funds are reinstated to your account after a dispute is closed. This includes partially refunded payments.",
 					},
 					{
 						"name": "Charge Dispute.funds_withdrawn",
 						"value": "charge.dispute.funds_withdrawn",
-						"description": "Occurs when funds are removed from your account due to a dispute."
+						"description": "Occurs when funds are removed from your account due to a dispute.",
 					},
 					{
 						"name": "Charge Dispute.updated",
 						"value": "charge.dispute.updated",
-						"description": "Occurs when the dispute is updated (usually with evidence)."
+						"description": "Occurs when the dispute is updated (usually with evidence).",
 					},
 					{
 						"name": "Charge Refund.updated",
 						"value": "charge.refund.updated",
-						"description": "Occurs whenever a refund is updated, on selected payment methods."
+						"description": "Occurs whenever a refund is updated, on selected payment methods.",
 					},
 					{
 						"name": "Checkout Session.completed",
 						"value": "checkout.session.completed",
-						"description": "Occurs when a Checkout Session has been successfully completed."
+						"description": "Occurs when a Checkout Session has been successfully completed.",
 					},
 					{
 						"name": "Coupon Created",
 						"value": "coupon.created",
-						"description": "Occurs whenever a coupon is created."
+						"description": "Occurs whenever a coupon is created.",
 					},
 					{
 						"name": "Coupon Deleted",
 						"value": "coupon.deleted",
-						"description": "Occurs whenever a coupon is deleted."
+						"description": "Occurs whenever a coupon is deleted.",
 					},
 					{
 						"name": "Coupon Updated",
 						"value": "coupon.updated",
-						"description": "Occurs whenever a coupon is updated."
+						"description": "Occurs whenever a coupon is updated.",
 					},
 					{
 						"name": "Credit Note.created",
 						"value": "credit_note.created",
-						"description": "Occurs whenever a credit note is created."
+						"description": "Occurs whenever a credit note is created.",
 					},
 					{
 						"name": "Credit Note.updated",
 						"value": "credit_note.updated",
-						"description": "Occurs whenever a credit note is updated."
+						"description": "Occurs whenever a credit note is updated.",
 					},
 					{
 						"name": "Credit Note.voided",
 						"value": "credit_note.voided",
-						"description": "Occurs whenever a credit note is voided."
+						"description": "Occurs whenever a credit note is voided.",
 					},
 					{
 						"name": "Customer Created",
 						"value": "customer.created",
-						"description": "Occurs whenever a new customer is created."
+						"description": "Occurs whenever a new customer is created.",
 					},
 					{
 						"name": "Customer Deleted",
 						"value": "customer.deleted",
-						"description": "Occurs whenever a customer is deleted."
+						"description": "Occurs whenever a customer is deleted.",
 					},
 					{
 						"name": "Customer Updated",
 						"value": "customer.updated",
-						"description": "Occurs whenever any property of a customer changes."
+						"description": "Occurs whenever any property of a customer changes.",
 					},
 					{
 						"name": "Customer Discount.created",
 						"value": "customer.discount.created",
-						"description": "Occurs whenever a coupon is attached to a customer."
+						"description": "Occurs whenever a coupon is attached to a customer.",
 					},
 					{
 						"name": "Customer Discount.deleted",
 						"value": "customer.discount.deleted",
-						"description": "Occurs whenever a coupon is removed from a customer."
+						"description": "Occurs whenever a coupon is removed from a customer.",
 					},
 					{
 						"name": "Customer Discount.updated",
 						"value": "customer.discount.updated",
-						"description": "Occurs whenever a customer is switched from one coupon to another."
+						"description": "Occurs whenever a customer is switched from one coupon to another.",
 					},
 					{
 						"name": "Customer Source.created",
 						"value": "customer.source.created",
-						"description": "Occurs whenever a new source is created for a customer."
+						"description": "Occurs whenever a new source is created for a customer.",
 					},
 					{
 						"name": "Customer Source.deleted",
 						"value": "customer.source.deleted",
-						"description": "Occurs whenever a source is removed from a customer."
+						"description": "Occurs whenever a source is removed from a customer.",
 					},
 					{
 						"name": "Customer Source.expiring",
 						"value": "customer.source.expiring",
-						"description": "Occurs whenever a card or source will expire at the end of the month."
+						"description": "Occurs whenever a card or source will expire at the end of the month.",
 					},
 					{
 						"name": "Customer Source.updated",
 						"value": "customer.source.updated",
-						"description": "Occurs whenever a source's details are changed."
+						"description": "Occurs whenever a source's details are changed.",
 					},
 					{
 						"name": "Customer Subscription.created",
 						"value": "customer.subscription.created",
-						"description": "Occurs whenever a customer is signed up for a new plan."
+						"description": "Occurs whenever a customer is signed up for a new plan.",
 					},
 					{
 						"name": "Customer Subscription.deleted",
 						"value": "customer.subscription.deleted",
-						"description": "Occurs whenever a customer's subscription ends."
+						"description": "Occurs whenever a customer's subscription ends.",
 					},
 					{
 						"name": "Customer Subscription.trial_will_end",
 						"value": "customer.subscription.trial_will_end",
-						"description": "Occurs three days before a subscription's trial period is scheduled to end, or when a trial is ended immediately (using trial_end=now)."
+						"description": "Occurs three days before a subscription's trial period is scheduled to end, or when a trial is ended immediately (using trial_end=now).",
 					},
 					{
 						"name": "Customer Subscription.updated",
 						"value": "customer.subscription.updated",
-						"description": "Occurs whenever a subscription changes (e.g., switching from one plan to another, or changing the status from trial to active)."
+						"description": "Occurs whenever a subscription changes (e.g., switching from one plan to another, or changing the status from trial to active).",
 					},
 					{
 						"name": "Customer Tax_id.created",
 						"value": "customer.tax_id.created",
-						"description": "Occurs whenever a tax ID is created for a customer."
+						"description": "Occurs whenever a tax ID is created for a customer.",
 					},
 					{
 						"name": "Customer Tax_id.deleted",
 						"value": "customer.tax_id.deleted",
-						"description": "Occurs whenever a tax ID is deleted from a customer."
+						"description": "Occurs whenever a tax ID is deleted from a customer.",
 					},
 					{
 						"name": "Customer Tax_id.updated",
 						"value": "customer.tax_id.updated",
-						"description": "Occurs whenever a customer's tax ID is updated."
+						"description": "Occurs whenever a customer's tax ID is updated.",
 					},
 					{
 						"name": "File Created",
 						"value": "file.created",
-						"description": "Occurs whenever a new Stripe-generated file is available for your account."
+						"description": "Occurs whenever a new Stripe-generated file is available for your account.",
 					},
 					{
 						"name": "Invoice Created",
 						"value": "invoice.created",
-						"description": "Occurs whenever a new invoice is created. To learn how webhooks can be used with this event, and how they can affect it, see Using Webhooks with Subscriptions."
+						"description": "Occurs whenever a new invoice is created. To learn how webhooks can be used with this event, and how they can affect it, see Using Webhooks with Subscriptions.",
 					},
 					{
 						"name": "Invoice Deleted",
 						"value": "invoice.deleted",
-						"description": "Occurs whenever a draft invoice is deleted."
+						"description": "Occurs whenever a draft invoice is deleted.",
 					},
 					{
 						"name": "Invoice Finalized",
 						"value": "invoice.finalized",
-						"description": "Occurs whenever a draft invoice is finalized and updated to be an open invoice."
+						"description": "Occurs whenever a draft invoice is finalized and updated to be an open invoice.",
 					},
 					{
 						"name": "Invoice Marked_uncollectible",
 						"value": "invoice.marked_uncollectible",
-						"description": "Occurs whenever an invoice is marked uncollectible."
+						"description": "Occurs whenever an invoice is marked uncollectible.",
 					},
 					{
 						"name": "Invoice Payment_action_required",
 						"value": "invoice.payment_action_required",
-						"description": "Occurs whenever an invoice payment attempt requires further user action to complete."
+						"description": "Occurs whenever an invoice payment attempt requires further user action to complete.",
 					},
 					{
 						"name": "Invoice Payment_failed",
 						"value": "invoice.payment_failed",
-						"description": "Occurs whenever an invoice payment attempt fails, due either to a declined payment or to the lack of a stored payment method."
+						"description": "Occurs whenever an invoice payment attempt fails, due either to a declined payment or to the lack of a stored payment method.",
 					},
 					{
 						"name": "Invoice Payment_succeeded",
 						"value": "invoice.payment_succeeded",
-						"description": "Occurs whenever an invoice payment attempt succeeds."
+						"description": "Occurs whenever an invoice payment attempt succeeds.",
 					},
 					{
 						"name": "Invoice Sent",
 						"value": "invoice.sent",
-						"description": "Occurs whenever an invoice email is sent out."
+						"description": "Occurs whenever an invoice email is sent out.",
 					},
 					{
 						"name": "Invoice Upcoming",
 						"value": "invoice.upcoming",
-						"description": "Occurs X number of days before a subscription is scheduled to create an invoice that is automatically charged—where X is determined by your subscriptions settings. Note: The received Invoice object will not have an invoice ID."
+						"description": "Occurs X number of days before a subscription is scheduled to create an invoice that is automatically charged—where X is determined by your subscriptions settings. Note: The received Invoice object will not have an invoice ID.",
 					},
 					{
 						"name": "Invoice Updated",
 						"value": "invoice.updated",
-						"description": "Occurs whenever an invoice changes (e.g., the invoice amount)."
+						"description": "Occurs whenever an invoice changes (e.g., the invoice amount).",
 					},
 					{
 						"name": "Invoice Voided",
 						"value": "invoice.voided",
-						"description": "Occurs whenever an invoice is voided."
+						"description": "Occurs whenever an invoice is voided.",
 					},
 					{
 						"name": "Invoiceitem Created",
 						"value": "invoiceitem.created",
-						"description": "Occurs whenever an invoice item is created."
+						"description": "Occurs whenever an invoice item is created.",
 					},
 					{
 						"name": "Invoiceitem Deleted",
 						"value": "invoiceitem.deleted",
-						"description": "Occurs whenever an invoice item is deleted."
+						"description": "Occurs whenever an invoice item is deleted.",
 					},
 					{
 						"name": "Invoiceitem Updated",
 						"value": "invoiceitem.updated",
-						"description": "Occurs whenever an invoice item is updated."
+						"description": "Occurs whenever an invoice item is updated.",
 					},
 					{
 						"name": "Issuing Authorization.created",
 						"value": "issuing_authorization.created",
-						"description": "Occurs whenever an authorization is created."
+						"description": "Occurs whenever an authorization is created.",
 					},
 					{
 						"name": "Issuing Authorization.request",
 						"value": "issuing_authorization.request",
-						"description": "Represents a synchronous request for authorization, see Using your integration to handle authorization requests."
+						"description": "Represents a synchronous request for authorization, see Using your integration to handle authorization requests.",
 					},
 					{
 						"name": "Issuing Authorization.updated",
 						"value": "issuing_authorization.updated",
-						"description": "Occurs whenever an authorization is updated."
+						"description": "Occurs whenever an authorization is updated.",
 					},
 					{
 						"name": "Issuing Card.created",
 						"value": "issuing_card.created",
-						"description": "Occurs whenever a card is created."
+						"description": "Occurs whenever a card is created.",
 					},
 					{
 						"name": "Issuing Card.updated",
 						"value": "issuing_card.updated",
-						"description": "Occurs whenever a card is updated."
+						"description": "Occurs whenever a card is updated.",
 					},
 					{
 						"name": "Issuing Cardholder.created",
 						"value": "issuing_cardholder.created",
-						"description": "Occurs whenever a cardholder is created."
+						"description": "Occurs whenever a cardholder is created.",
 					},
 					{
 						"name": "Issuing Cardholder.updated",
 						"value": "issuing_cardholder.updated",
-						"description": "Occurs whenever a cardholder is updated."
+						"description": "Occurs whenever a cardholder is updated.",
 					},
 					{
 						"name": "Issuing Dispute.created",
 						"value": "issuing_dispute.created",
-						"description": "Occurs whenever a dispute is created."
+						"description": "Occurs whenever a dispute is created.",
 					},
 					{
 						"name": "Issuing Dispute.updated",
 						"value": "issuing_dispute.updated",
-						"description": "Occurs whenever a dispute is updated."
+						"description": "Occurs whenever a dispute is updated.",
 					},
 					{
 						"name": "Issuing Settlement.created",
 						"value": "issuing_settlement.created",
-						"description": "Occurs whenever an issuing settlement is created."
+						"description": "Occurs whenever an issuing settlement is created.",
 					},
 					{
 						"name": "Issuing Settlement.updated",
 						"value": "issuing_settlement.updated",
-						"description": "Occurs whenever an issuing settlement is updated."
+						"description": "Occurs whenever an issuing settlement is updated.",
 					},
 					{
 						"name": "Issuing Transaction.created",
 						"value": "issuing_transaction.created",
-						"description": "Occurs whenever an issuing transaction is created."
+						"description": "Occurs whenever an issuing transaction is created.",
 					},
 					{
 						"name": "Issuing Transaction.updated",
 						"value": "issuing_transaction.updated",
-						"description": "Occurs whenever an issuing transaction is updated."
+						"description": "Occurs whenever an issuing transaction is updated.",
 					},
 					{
 						"name": "Order Created",
 						"value": "order.created",
-						"description": "Occurs whenever an order is created."
+						"description": "Occurs whenever an order is created.",
 					},
 					{
 						"name": "Order Payment_failed",
 						"value": "order.payment_failed",
-						"description": "Occurs whenever an order payment attempt fails."
+						"description": "Occurs whenever an order payment attempt fails.",
 					},
 					{
 						"name": "Order Payment_succeeded",
 						"value": "order.payment_succeeded",
-						"description": "Occurs whenever an order payment attempt succeeds."
+						"description": "Occurs whenever an order payment attempt succeeds.",
 					},
 					{
 						"name": "Order Updated",
 						"value": "order.updated",
-						"description": "Occurs whenever an order is updated."
+						"description": "Occurs whenever an order is updated.",
 					},
 					{
 						"name": "Order Return.created",
 						"value": "order_return.created",
-						"description": "Occurs whenever an order return is created."
+						"description": "Occurs whenever an order return is created.",
 					},
 					{
 						"name": "Payment Intent.amount_capturable_updated",
 						"value": "payment_intent.amount_capturable_updated",
-						"description": "Occurs when a PaymentIntent has funds to be captured. Check the amount_capturable property on the PaymentIntent to determine the amount that can be captured. You may capture the PaymentIntent with an amount_to_capture value up to the specified amount. Learn more about capturing PaymentIntents."
+						"description": "Occurs when a PaymentIntent has funds to be captured. Check the amount_capturable property on the PaymentIntent to determine the amount that can be captured. You may capture the PaymentIntent with an amount_to_capture value up to the specified amount. Learn more about capturing PaymentIntents.",
 					},
 					{
 						"name": "Payment Intent.canceled",
 						"value": "payment_intent.canceled",
-						"description": "Occurs when a PaymentIntent is canceled."
+						"description": "Occurs when a PaymentIntent is canceled.",
 					},
 					{
 						"name": "Payment Intent.created",
 						"value": "payment_intent.created",
-						"description": "Occurs when a new PaymentIntent is created."
+						"description": "Occurs when a new PaymentIntent is created.",
 					},
 					{
 						"name": "Payment Intent.payment_failed",
 						"value": "payment_intent.payment_failed",
-						"description": "Occurs when a PaymentIntent has failed the attempt to create a source or a payment."
+						"description": "Occurs when a PaymentIntent has failed the attempt to create a source or a payment.",
 					},
 					{
 						"name": "Payment Intent.succeeded",
 						"value": "payment_intent.succeeded",
-						"description": "Occurs when a PaymentIntent has been successfully fulfilled."
+						"description": "Occurs when a PaymentIntent has been successfully fulfilled.",
 					},
 					{
 						"name": "Payment Method.attached",
 						"value": "payment_method.attached",
-						"description": "Occurs whenever a new payment method is attached to a customer."
+						"description": "Occurs whenever a new payment method is attached to a customer.",
 					},
 					{
 						"name": "Payment Method.card_automatically_updated",
 						"value": "payment_method.card_automatically_updated",
-						"description": "Occurs whenever a card payment method's details are automatically updated by the network."
+						"description": "Occurs whenever a card payment method's details are automatically updated by the network.",
 					},
 					{
 						"name": "Payment Method.detached",
 						"value": "payment_method.detached",
-						"description": "Occurs whenever a payment method is detached from a customer."
+						"description": "Occurs whenever a payment method is detached from a customer.",
 					},
 					{
 						"name": "Payment Method.updated",
 						"value": "payment_method.updated",
-						"description": "Occurs whenever a payment method is updated via the PaymentMethod update API."
+						"description": "Occurs whenever a payment method is updated via the PaymentMethod update API.",
 					},
 					{
 						"name": "Payout Canceled",
 						"value": "payout.canceled",
-						"description": "Occurs whenever a payout is canceled."
+						"description": "Occurs whenever a payout is canceled.",
 					},
 					{
 						"name": "Payout Created",
 						"value": "payout.created",
-						"description": "Occurs whenever a payout is created."
+						"description": "Occurs whenever a payout is created.",
 					},
 					{
 						"name": "Payout Failed",
 						"value": "payout.failed",
-						"description": "Occurs whenever a payout attempt fails."
+						"description": "Occurs whenever a payout attempt fails.",
 					},
 					{
 						"name": "Payout Paid",
 						"value": "payout.paid",
-						"description": "Occurs whenever a payout is expected to be available in the destination account. If the payout fails, a payout.failed notification is also sent, at a later time."
+						"description": "Occurs whenever a payout is expected to be available in the destination account. If the payout fails, a payout.failed notification is also sent, at a later time.",
 					},
 					{
 						"name": "Payout Updated",
 						"value": "payout.updated",
-						"description": "Occurs whenever a payout is updated."
+						"description": "Occurs whenever a payout is updated.",
 					},
 					{
 						"name": "Person Created",
 						"value": "person.created",
-						"description": "Occurs whenever a person associated with an account is created."
+						"description": "Occurs whenever a person associated with an account is created.",
 					},
 					{
 						"name": "Person Deleted",
 						"value": "person.deleted",
-						"description": "Occurs whenever a person associated with an account is deleted."
+						"description": "Occurs whenever a person associated with an account is deleted.",
 					},
 					{
 						"name": "Person Updated",
 						"value": "person.updated",
-						"description": "Occurs whenever a person associated with an account is updated."
+						"description": "Occurs whenever a person associated with an account is updated.",
 					},
 					{
 						"name": "Plan Created",
 						"value": "plan.created",
-						"description": "Occurs whenever a plan is created."
+						"description": "Occurs whenever a plan is created.",
 					},
 					{
 						"name": "Plan Deleted",
 						"value": "plan.deleted",
-						"description": "Occurs whenever a plan is deleted."
+						"description": "Occurs whenever a plan is deleted.",
 					},
 					{
 						"name": "Plan Updated",
 						"value": "plan.updated",
-						"description": "Occurs whenever a plan is updated."
+						"description": "Occurs whenever a plan is updated.",
 					},
 					{
 						"name": "Product Created",
 						"value": "product.created",
-						"description": "Occurs whenever a product is created."
+						"description": "Occurs whenever a product is created.",
 					},
 					{
 						"name": "Product Deleted",
 						"value": "product.deleted",
-						"description": "Occurs whenever a product is deleted."
+						"description": "Occurs whenever a product is deleted.",
 					},
 					{
 						"name": "Product Updated",
 						"value": "product.updated",
-						"description": "Occurs whenever a product is updated."
+						"description": "Occurs whenever a product is updated.",
 					},
 					{
 						"name": "Radar Early_fraud_warning.created",
 						"value": "radar.early_fraud_warning.created",
-						"description": "Occurs whenever an early fraud warning is created."
+						"description": "Occurs whenever an early fraud warning is created.",
 					},
 					{
 						"name": "Radar Early_fraud_warning.updated",
 						"value": "radar.early_fraud_warning.updated",
-						"description": "Occurs whenever an early fraud warning is updated."
+						"description": "Occurs whenever an early fraud warning is updated.",
 					},
 					{
 						"name": "Recipient Created",
 						"value": "recipient.created",
-						"description": "Occurs whenever a recipient is created."
+						"description": "Occurs whenever a recipient is created.",
 					},
 					{
 						"name": "Recipient Deleted",
 						"value": "recipient.deleted",
-						"description": "Occurs whenever a recipient is deleted."
+						"description": "Occurs whenever a recipient is deleted.",
 					},
 					{
 						"name": "Recipient Updated",
 						"value": "recipient.updated",
-						"description": "Occurs whenever a recipient is updated."
+						"description": "Occurs whenever a recipient is updated.",
 					},
 					{
 						"name": "Reporting Report_run.failed",
 						"value": "reporting.report_run.failed",
-						"description": "Occurs whenever a requested **ReportRun** failed to complete."
+						"description": "Occurs whenever a requested **ReportRun** failed to complete.",
 					},
 					{
 						"name": "Reporting Report_run.succeeded",
 						"value": "reporting.report_run.succeeded",
-						"description": "Occurs whenever a requested **ReportRun** completed succesfully."
+						"description": "Occurs whenever a requested **ReportRun** completed succesfully.",
 					},
 					{
 						"name": "Reporting Report_type.updated",
 						"value": "reporting.report_type.updated",
-						"description": "Occurs whenever a **ReportType** is updated (typically to indicate that a new day's data has come available)."
+						"description": "Occurs whenever a **ReportType** is updated (typically to indicate that a new day's data has come available).",
 					},
 					{
 						"name": "Review Closed",
 						"value": "review.closed",
-						"description": "Occurs whenever a review is closed. The review's reason field indicates why: approved, disputed, refunded, or refunded_as_fraud."
+						"description": "Occurs whenever a review is closed. The review's reason field indicates why: approved, disputed, refunded, or refunded_as_fraud.",
 					},
 					{
 						"name": "Review Opened",
 						"value": "review.opened",
-						"description": "Occurs whenever a review is opened."
+						"description": "Occurs whenever a review is opened.",
 					},
 					{
 						"name": "Setup Intent.canceled",
 						"value": "setup_intent.canceled",
-						"description": "Occurs when a SetupIntent is canceled."
+						"description": "Occurs when a SetupIntent is canceled.",
 					},
 					{
 						"name": "Setup Intent.created",
 						"value": "setup_intent.created",
-						"description": "Occurs when a new SetupIntent is created."
+						"description": "Occurs when a new SetupIntent is created.",
 					},
 					{
 						"name": "Setup Intent.setup_failed",
 						"value": "setup_intent.setup_failed",
-						"description": "Occurs when a SetupIntent has failed the attempt to setup a payment method."
+						"description": "Occurs when a SetupIntent has failed the attempt to setup a payment method.",
 					},
 					{
 						"name": "Setup Intent.succeeded",
 						"value": "setup_intent.succeeded",
-						"description": "Occurs when an SetupIntent has successfully setup a payment method."
+						"description": "Occurs when an SetupIntent has successfully setup a payment method.",
 					},
 					{
 						"name": "Sigma Scheduled_query_run.created",
 						"value": "sigma.scheduled_query_run.created",
-						"description": "Occurs whenever a Sigma scheduled query run finishes."
+						"description": "Occurs whenever a Sigma scheduled query run finishes.",
 					},
 					{
 						"name": "Sku Created",
 						"value": "sku.created",
-						"description": "Occurs whenever a SKU is created."
+						"description": "Occurs whenever a SKU is created.",
 					},
 					{
 						"name": "Sku Deleted",
 						"value": "sku.deleted",
-						"description": "Occurs whenever a SKU is deleted."
+						"description": "Occurs whenever a SKU is deleted.",
 					},
 					{
 						"name": "Sku Updated",
 						"value": "sku.updated",
-						"description": "Occurs whenever a SKU is updated."
+						"description": "Occurs whenever a SKU is updated.",
 					},
 					{
 						"name": "Source Canceled",
 						"value": "source.canceled",
-						"description": "Occurs whenever a source is canceled."
+						"description": "Occurs whenever a source is canceled.",
 					},
 					{
 						"name": "Source Chargeable",
 						"value": "source.chargeable",
-						"description": "Occurs whenever a source transitions to chargeable."
+						"description": "Occurs whenever a source transitions to chargeable.",
 					},
 					{
 						"name": "Source Failed",
 						"value": "source.failed",
-						"description": "Occurs whenever a source fails."
+						"description": "Occurs whenever a source fails.",
 					},
 					{
 						"name": "Source Mandate_notification",
 						"value": "source.mandate_notification",
-						"description": "Occurs whenever a source mandate notification method is set to manual."
+						"description": "Occurs whenever a source mandate notification method is set to manual.",
 					},
 					{
 						"name": "Source Refund_attributes_required",
 						"value": "source.refund_attributes_required",
-						"description": "Occurs whenever the refund attributes are required on a receiver source to process a refund or a mispayment."
+						"description": "Occurs whenever the refund attributes are required on a receiver source to process a refund or a mispayment.",
 					},
 					{
 						"name": "Source Transaction.created",
 						"value": "source.transaction.created",
-						"description": "Occurs whenever a source transaction is created."
+						"description": "Occurs whenever a source transaction is created.",
 					},
 					{
 						"name": "Source Transaction.updated",
 						"value": "source.transaction.updated",
-						"description": "Occurs whenever a source transaction is updated."
+						"description": "Occurs whenever a source transaction is updated.",
 					},
 					{
 						"name": "Subscription Schedule.aborted",
 						"value": "subscription_schedule.aborted",
-						"description": "Occurs whenever a subscription schedule is canceled due to the underlying subscription being canceled because of delinquency."
+						"description": "Occurs whenever a subscription schedule is canceled due to the underlying subscription being canceled because of delinquency.",
 					},
 					{
 						"name": "Subscription Schedule.canceled",
 						"value": "subscription_schedule.canceled",
-						"description": "Occurs whenever a subscription schedule is canceled."
+						"description": "Occurs whenever a subscription schedule is canceled.",
 					},
 					{
 						"name": "Subscription Schedule.completed",
 						"value": "subscription_schedule.completed",
-						"description": "Occurs whenever a new subscription schedule is completed."
+						"description": "Occurs whenever a new subscription schedule is completed.",
 					},
 					{
 						"name": "Subscription Schedule.created",
 						"value": "subscription_schedule.created",
-						"description": "Occurs whenever a new subscription schedule is created."
+						"description": "Occurs whenever a new subscription schedule is created.",
 					},
 					{
 						"name": "Subscription Schedule.expiring",
 						"value": "subscription_schedule.expiring",
-						"description": "Occurs 7 days before a subscription schedule will expire."
+						"description": "Occurs 7 days before a subscription schedule will expire.",
 					},
 					{
 						"name": "Subscription Schedule.released",
 						"value": "subscription_schedule.released",
-						"description": "Occurs whenever a new subscription schedule is released."
+						"description": "Occurs whenever a new subscription schedule is released.",
 					},
 					{
 						"name": "Subscription Schedule.updated",
 						"value": "subscription_schedule.updated",
-						"description": "Occurs whenever a subscription schedule is updated."
+						"description": "Occurs whenever a subscription schedule is updated.",
 					},
 					{
 						"name": "Tax Rate.created",
 						"value": "tax_rate.created",
-						"description": "Occurs whenever a new tax rate is created."
+						"description": "Occurs whenever a new tax rate is created.",
 					},
 					{
 						"name": "Tax Rate.updated",
 						"value": "tax_rate.updated",
-						"description": "Occurs whenever a tax rate is updated."
+						"description": "Occurs whenever a tax rate is updated.",
 					},
 					{
 						"name": "Topup Canceled",
 						"value": "topup.canceled",
-						"description": "Occurs whenever a top-up is canceled."
+						"description": "Occurs whenever a top-up is canceled.",
 					},
 					{
 						"name": "Topup Created",
 						"value": "topup.created",
-						"description": "Occurs whenever a top-up is created."
+						"description": "Occurs whenever a top-up is created.",
 					},
 					{
 						"name": "Topup Failed",
 						"value": "topup.failed",
-						"description": "Occurs whenever a top-up fails."
+						"description": "Occurs whenever a top-up fails.",
 					},
 					{
 						"name": "Topup Reversed",
 						"value": "topup.reversed",
-						"description": "Occurs whenever a top-up is reversed."
+						"description": "Occurs whenever a top-up is reversed.",
 					},
 					{
 						"name": "Topup Succeeded",
 						"value": "topup.succeeded",
-						"description": "Occurs whenever a top-up succeeds."
+						"description": "Occurs whenever a top-up succeeds.",
 					},
 					{
 						"name": "Transfer Created",
 						"value": "transfer.created",
-						"description": "Occurs whenever a transfer is created."
+						"description": "Occurs whenever a transfer is created.",
 					},
 					{
 						"name": "Transfer Failed",
 						"value": "transfer.failed",
-						"description": "Occurs whenever a transfer failed."
+						"description": "Occurs whenever a transfer failed.",
 					},
 					{
 						"name": "Transfer Paid",
 						"value": "transfer.paid",
-						"description": "Occurs after a transfer is paid. For Instant Payouts, the event will be sent on the next business day, although the funds should be received well beforehand."
+						"description": "Occurs after a transfer is paid. For Instant Payouts, the event will be sent on the next business day, although the funds should be received well beforehand.",
 					},
 					{
 						"name": "Transfer Reversed",
 						"value": "transfer.reversed",
-						"description": "Occurs whenever a transfer is reversed, including partial reversals."
+						"description": "Occurs whenever a transfer is reversed, including partial reversals.",
 					},
 					{
 						"name": "Transfer Updated",
 						"value": "transfer.updated",
-						"description": "Occurs whenever a transfer's description or metadata is updated."
-					}
-				]
-			}
+						"description": "Occurs whenever a transfer's description or metadata is updated.",
+					},
+				],
+			},
 		],
 	};
 
@@ -906,7 +906,7 @@ export class StripeTrigger implements INodeType {
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Stripe/helpers.ts b/packages/nodes-base/nodes/Stripe/helpers.ts
index 72bbe6f02..f2c05eede 100644
--- a/packages/nodes-base/nodes/Stripe/helpers.ts
+++ b/packages/nodes-base/nodes/Stripe/helpers.ts
@@ -26,7 +26,7 @@ export async function stripeApiRequest(this: IHookFunctions | IExecuteFunctions,
 		form: body,
 		qs: query,
 		uri: `https://api.stripe.com/v1${endpoint}`,
-		json: true
+		json: true,
 	};
 
 	try {
diff --git a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
index bfca4dde1..2c31a182d 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
@@ -26,7 +26,7 @@ export async function surveyMonkeyApiRequest(this: IExecuteFunctions | IWebhookF
 		body,
 		qs: query,
 		uri: uri || `${endpoint}${resource}`,
-		json: true
+		json: true,
 	};
 
 	if (!Object.keys(body).length) {
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index c0f722dd8..0c14549d9 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -22,9 +22,9 @@ import {
 import {
 	IAnswer,
 	IChoice,
+	IOther,
 	IQuestion,
 	IRow,
-	IOther,
 } from './Interfaces';
 
 import {
@@ -124,7 +124,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						objectType: [
-							'survey'
+							'survey',
 						],
 					},
 				},
@@ -529,7 +529,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 				let returnItem: INodeExecutionData[] = [
 					{
 						json: responseData,
-					}
+					},
 				];
 
 				if (event === 'response_completed') {
@@ -725,7 +725,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 						returnItem = [
 							{
 								json: responseData,
-							}
+							},
 						];
 					}
 				}
diff --git a/packages/nodes-base/nodes/Switch.node.ts b/packages/nodes-base/nodes/Switch.node.ts
index 80b3845bc..2cf3ee598 100644
--- a/packages/nodes-base/nodes/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch.node.ts
@@ -59,7 +59,7 @@ export class Switch implements INodeType {
 				displayOptions: {
 					show: {
 						mode: [
-							'expression'
+							'expression',
 						],
 					},
 				},
@@ -110,7 +110,7 @@ export class Switch implements INodeType {
 				displayOptions: {
 					show: {
 						dataType: [
-							'boolean'
+							'boolean',
 						],
 						mode: [
 							'rules',
@@ -131,7 +131,7 @@ export class Switch implements INodeType {
 				displayOptions: {
 					show: {
 						dataType: [
-							'boolean'
+							'boolean',
 						],
 						mode: [
 							'rules',
@@ -152,11 +152,11 @@ export class Switch implements INodeType {
 								options: [
 									{
 										name: 'Equal',
-										value: 'equal'
+										value: 'equal',
 									},
 									{
 										name: 'Not Equal',
-										value: 'notEqual'
+										value: 'notEqual',
 									},
 								],
 								default: 'equal',
@@ -195,7 +195,7 @@ export class Switch implements INodeType {
 				displayOptions: {
 					show: {
 						dataType: [
-							'number'
+							'number',
 						],
 						mode: [
 							'rules',
@@ -216,7 +216,7 @@ export class Switch implements INodeType {
 				displayOptions: {
 					show: {
 						dataType: [
-							'number'
+							'number',
 						],
 						mode: [
 							'rules',
@@ -237,27 +237,27 @@ export class Switch implements INodeType {
 								options: [
 									{
 										name: 'Smaller',
-										value: 'smaller'
+										value: 'smaller',
 									},
 									{
 										name: 'Smaller Equal',
-										value: 'smallerEqual'
+										value: 'smallerEqual',
 									},
 									{
 										name: 'Equal',
-										value: 'equal'
+										value: 'equal',
 									},
 									{
 										name: 'Not Equal',
-										value: 'notEqual'
+										value: 'notEqual',
 									},
 									{
 										name: 'Larger',
-										value: 'larger'
+										value: 'larger',
 									},
 									{
 										name: 'Larger Equal',
-										value: 'largerEqual'
+										value: 'largerEqual',
 									},
 								],
 								default: 'smaller',
@@ -296,7 +296,7 @@ export class Switch implements INodeType {
 				displayOptions: {
 					show: {
 						dataType: [
-							'string'
+							'string',
 						],
 						mode: [
 							'rules',
@@ -317,7 +317,7 @@ export class Switch implements INodeType {
 				displayOptions: {
 					show: {
 						dataType: [
-							'string'
+							'string',
 						],
 						mode: [
 							'rules',
@@ -338,23 +338,23 @@ export class Switch implements INodeType {
 								options: [
 									{
 										name: 'Contains',
-										value: 'contains'
+										value: 'contains',
 									},
 									{
 										name: 'Equal',
-										value: 'equal'
+										value: 'equal',
 									},
 									{
 										name: 'Not Contains',
-										value: 'notContains'
+										value: 'notContains',
 									},
 									{
 										name: 'Not Equal',
-										value: 'notEqual'
+										value: 'notEqual',
 									},
 									{
 										name: 'Regex',
-										value: 'regex'
+										value: 'regex',
 									},
 								],
 								default: 'equal',
diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
new file mode 100644
index 000000000..ce5fcde5b
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -0,0 +1,129 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+} from 'n8n-core';
+
+import {
+	ICredentialDataDecryptedObject,
+	IDataObject,
+} from 'n8n-workflow';
+
+import {
+	createHash,
+} from 'crypto';
+
+export async function getAuthorization(
+	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	credentials?: ICredentialDataDecryptedObject,
+): Promise<string> {
+	if (credentials === undefined) {
+		throw new Error('No credentials got returned!');
+	}
+
+	const { password, username } = credentials;
+	const options: OptionsWithUri = {
+		headers: { 'Content-Type': 'application/json' },
+		method: 'POST',
+		body: {
+			type: 'normal',
+			password,
+			username,
+		},
+		uri: (credentials.url) ? `${credentials.url}/api/v1/auth` : 'https://api.taiga.io/api/v1/auth',
+		json: true,
+	};
+
+	try {
+		const response = await this.helpers.request!(options);
+
+		return response.auth_token;
+	} catch (error) {
+		throw new Error('Taiga Error: ' + error.err || error);
+	}
+}
+
+export async function taigaApiRequest(
+	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: string,
+	resource: string,
+	body = {},
+	query = {},
+	uri?: string | undefined,
+	option = {},
+): Promise<any> { // tslint:disable-line:no-any
+
+	const version = this.getNodeParameter('version', 0, 'cloud') as string;
+
+	let credentials;
+
+	if (version === 'server') {
+		credentials = this.getCredentials('taigaServerApi') as ICredentialDataDecryptedObject;
+	} else {
+		credentials = this.getCredentials('taigaCloudApi') as ICredentialDataDecryptedObject;
+	}
+
+	const authToken = await getAuthorization.call(this, credentials);
+
+	const options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		auth: {
+			bearer: authToken,
+		},
+		qs: query,
+		method,
+		body,
+		uri: uri || (credentials.url) ? `${credentials.url}/api/v1${resource}` : `https://api.taiga.io/api/v1${resource}`,
+		json: true,
+	};
+
+	if (Object.keys(option).length !== 0) {
+		Object.assign(options, option);
+	}
+
+	try {
+		return await this.helpers.request!(options);
+	} catch (error) {
+		let errorMessage = error;
+		if (error.response.body && error.response.body._error_message) {
+			errorMessage = error.response.body._error_message;
+		}
+
+		throw new Error(`Taigan error response [${error.statusCode}]: ${errorMessage}`);
+	}
+}
+
+export async function taigaApiRequestAllItems(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	let uri: string | undefined;
+
+	do {
+		responseData = await taigaApiRequest.call(this, method, resource, body, query, uri, { resolveWithFullResponse: true });
+		returnData.push.apply(returnData, responseData.body);
+		uri = responseData.headers['x-pagination-next'];
+		if (query.limit && returnData.length >= query.limit) {
+			return returnData;
+		}
+	} while (
+		responseData.headers['x-pagination-next'] !== undefined &&
+		responseData.headers['x-pagination-next'] !== ''
+	);
+	return returnData;
+}
+
+export function getAutomaticSecret(credentials: ICredentialDataDecryptedObject) {
+	const data = `${credentials.username},${credentials.password}`;
+	return createHash('md5').update(data).digest('hex');
+}
diff --git a/packages/nodes-base/nodes/Taiga/IssueOperations.ts b/packages/nodes-base/nodes/Taiga/IssueOperations.ts
new file mode 100644
index 000000000..b20d1e439
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/IssueOperations.ts
@@ -0,0 +1,40 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const issueOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an issue',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an issue',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an issue',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all issues',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an issue',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.ts b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
new file mode 100644
index 000000000..dd888afc6
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
@@ -0,0 +1,329 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	taigaApiRequest,
+	taigaApiRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	issueOperations,
+} from './IssueOperations';
+
+import {
+	issueOperationFields,
+} from './issueOperationFields';
+
+export class Taiga implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Taiga',
+		name: 'taiga',
+		icon: 'file:taiga.png',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Taiga API',
+		defaults: {
+			name: 'Taiga',
+			color: '#772244',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'taigaCloudApi',
+				displayOptions: {
+					show: {
+						version: [
+							'cloud',
+						],
+					},
+				},
+				required: true,
+			},
+			{
+				name: 'taigaServerApi',
+				displayOptions: {
+					show: {
+						version: [
+							'server',
+						],
+					},
+				},
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Taiga Version',
+				name: 'version',
+				type: 'options',
+				options: [
+					{
+						name: 'Cloud',
+						value: 'cloud',
+					},
+					{
+						name: 'Server (Self Hosted)',
+						value: 'server',
+					},
+				],
+				default: 'cloud',
+			},
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Issue',
+						value: 'issue',
+					},
+				],
+				default: 'issue',
+				description: 'Resource to consume.',
+			},
+			...issueOperations,
+			...issueOperationFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			// Get all the available tags to display them to user so that he can
+			// select them easily
+			async getTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const projectId = this.getCurrentNodeParameter('projectId') as string;
+
+				const returnData: INodePropertyOptions[] = [];
+
+				const types = await taigaApiRequest.call(this, 'GET', `/issue-types?project=${projectId}`);
+				for (const type of types) {
+					const typeName = type.name;
+					const typeId = type.id;
+					returnData.push({
+						name: typeName,
+						value: typeId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the available statuses to display them to user so that he can
+			// select them easily
+			async getStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const projectId = this.getCurrentNodeParameter('projectId') as string;
+
+				const statuses = await taigaApiRequest.call(this, 'GET', '/issue-statuses', {}, { project: projectId });
+				for (const status of statuses) {
+					const statusName = status.name;
+					const statusId = status.id;
+					returnData.push({
+						name: statusName,
+						value: statusId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the available users to display them to user so that he can
+			// select them easily
+			async getProjectUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const projectId = this.getCurrentNodeParameter('projectId') as string;
+
+				const users = await taigaApiRequest.call(this, 'GET', '/users', {}, { project: projectId });
+				for (const user of users) {
+					const userName = user.username;
+					const userId = user.id;
+					returnData.push({
+						name: userName,
+						value: userId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the available priorities to display them to user so that he can
+			// select them easily
+			async getProjectPriorities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const projectId = this.getCurrentNodeParameter('projectId') as string;
+
+				const priorities = await taigaApiRequest.call(this, 'GET', '/priorities', {}, { project: projectId });
+				for (const priority of priorities) {
+					const priorityName = priority.name;
+					const priorityId = priority.id;
+					returnData.push({
+						name: priorityName,
+						value: priorityId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the available severities to display them to user so that he can
+			// select them easily
+			async getProjectSeverities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const projectId = this.getCurrentNodeParameter('projectId') as string;
+
+				const severities = await taigaApiRequest.call(this, 'GET', '/severities', {}, { project: projectId });
+				for (const severity of severities) {
+					const severityName = severity.name;
+					const severityId = severity.id;
+					returnData.push({
+						name: severityName,
+						value: severityId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the available milestones to display them to user so that he can
+			// select them easily
+			async getProjectMilestones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const projectId = this.getCurrentNodeParameter('projectId') as string;
+
+				const milestones = await taigaApiRequest.call(this, 'GET', '/milestones', {}, { project: projectId });
+				for (const milestone of milestones) {
+					const milestoneName = milestone.name;
+					const milestoneId = milestone.id;
+					returnData.push({
+						name: milestoneName,
+						value: milestoneId,
+					});
+				}
+				return returnData;
+			},
+
+			// Get all the available projects to display them to user so that he can
+			// select them easily
+			async getUserProjects(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const { id } = await taigaApiRequest.call(this, 'GET', '/users/me');
+
+				const projects = await taigaApiRequest.call(this, 'GET', '/projects', {}, { member: id });
+				for (const project of projects) {
+					const projectName = project.name;
+					const projectId = project.id;
+					returnData.push({
+						name: projectName,
+						value: projectId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		let responseData;
+
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		const qs: IDataObject = {};
+
+		for (let i = 0; i < items.length; i++) {
+			if (resource === 'issue') {
+				if (operation === 'create') {
+					const projectId = this.getNodeParameter('projectId', i) as number;
+
+					const subject = this.getNodeParameter('subject', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const body: IDataObject = {
+						project: projectId,
+						subject,
+					};
+
+					Object.assign(body, additionalFields);
+
+					if (body.tags) {
+						body.tags = (body.tags as string).split(',') as string[];
+					}
+
+					responseData = await taigaApiRequest.call(this, 'POST', '/issues', body);
+				}
+
+				if (operation === 'update') {
+
+					const issueId = this.getNodeParameter('issueId', i) as string;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body: IDataObject = {};
+
+					Object.assign(body, updateFields);
+
+					if (body.tags) {
+						body.tags = (body.tags as string).split(',') as string[];
+					}
+
+					const { version } = await taigaApiRequest.call(this, 'GET', `/issues/${issueId}`);
+
+					body.version = version;
+
+					responseData = await taigaApiRequest.call(this, 'PATCH', `/issues/${issueId}`, body);
+				}
+
+				if (operation === 'delete') {
+					const issueId = this.getNodeParameter('issueId', i) as string;
+					responseData = await taigaApiRequest.call(this, 'DELETE', `/issues/${issueId}`);
+					responseData = { success: true };
+				}
+
+				if (operation === 'get') {
+					const issueId = this.getNodeParameter('issueId', i) as string;
+					responseData = await taigaApiRequest.call(this, 'GET', `/issues/${issueId}`);
+				}
+
+				if (operation === 'getAll') {
+
+					const projectId = this.getNodeParameter('projectId', i) as number;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					qs.project = projectId;
+
+					if (returnAll === true) {
+						responseData = await taigaApiRequestAllItems.call(this, 'GET', '/issues', {}, qs);
+
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+						responseData = await taigaApiRequestAllItems.call(this, 'GET', '/issues', {}, qs);
+						responseData = responseData.splice(0, qs.limit);
+					}
+				}
+			}
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+			} else {
+				returnData.push(responseData as IDataObject);
+			}
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts
new file mode 100644
index 000000000..6598b1bac
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts
@@ -0,0 +1,225 @@
+import {
+	ICredentialDataDecryptedObject,
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookFunctions,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+
+import {
+	IHookFunctions,
+} from 'n8n-core';
+
+import {
+	getAutomaticSecret,
+	taigaApiRequest,
+} from './GenericFunctions';
+
+// import {
+// 	createHmac,
+// } from 'crypto';
+
+export class TaigaTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Taiga Trigger',
+		name: 'taigaTrigger',
+		icon: 'file:taiga.png',
+		group: ['trigger'],
+		version: 1,
+		subtitle: '={{"project:" + $parameter["projectSlug"]}}',
+		description: 'Handle Taiga events via webhook',
+		defaults: {
+			name: 'Taiga Trigger',
+			color: '#772244',
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'taigaCloudApi',
+				displayOptions: {
+					show: {
+						version: [
+							'cloud',
+						],
+					},
+				},
+				required: true,
+			},
+			{
+				name: 'taigaServerApi',
+				displayOptions: {
+					show: {
+						version: [
+							'server',
+						],
+					},
+				},
+				required: true,
+			},
+		],
+		webhooks: [
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Taiga Version',
+				name: 'version',
+				type: 'options',
+				options: [
+					{
+						name: 'Cloud',
+						value: 'cloud',
+					},
+					{
+						name: 'Server (Self Hosted)',
+						value: 'server',
+					},
+				],
+				default: 'cloud',
+			},
+			{
+				displayName: 'Project ID',
+				name: 'projectId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getUserProjects',
+				},
+				default: '',
+				description: 'Project ID',
+				required: true,
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			// Get all the available projects to display them to user so that he can
+			// select them easily
+			async getUserProjects(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const { id } = await taigaApiRequest.call(this, 'GET', '/users/me');
+
+				const projects = await taigaApiRequest.call(this, 'GET', '/projects', {}, { member: id });
+				for (const project of projects) {
+					const projectName = project.name;
+					const projectId = project.id;
+					returnData.push({
+						name: projectName,
+						value: projectId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	// @ts-ignore
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+
+				const webhookData = this.getWorkflowStaticData('node');
+
+				const endpoint = `/webhooks`;
+
+				const webhooks = await taigaApiRequest.call(this, 'GET', endpoint);
+
+				for (const webhook of webhooks) {
+					if (webhook.url === webhookUrl) {
+						webhookData.webhookId = webhook.id;
+						webhookData.key = webhook.key;
+						return true;
+					}
+				}
+
+				return false;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const version = this.getNodeParameter('version') as string;
+
+				let credentials;
+
+				if (version === 'server') {
+					credentials = this.getCredentials('taigaServerApi') as ICredentialDataDecryptedObject;
+				} else {
+					credentials = this.getCredentials('taigaCloudApi') as ICredentialDataDecryptedObject;
+				}
+
+				const webhookUrl = this.getNodeWebhookUrl('default') as string;
+
+				const webhookData = this.getWorkflowStaticData('node');
+
+				const projectId = this.getNodeParameter('projectId') as string;
+
+				const key = getAutomaticSecret(credentials);
+
+				const body: IDataObject = {
+					name: `n8n-webhook:${webhookUrl}`,
+					url: webhookUrl,
+					key, //can't validate the secret, see: https://github.com/taigaio/taiga-back/issues/1031
+					project: projectId,
+				};
+				const { id } = await taigaApiRequest.call(this, 'POST', '/webhooks', body);
+
+				webhookData.webhookId = id;
+				webhookData.key = key;
+
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				try {
+					await taigaApiRequest.call(this, 'DELETE', `/webhooks/${webhookData.webhookId}`);
+				} catch (error) {
+					return false;
+				}
+				delete webhookData.webhookId;
+				delete webhookData.key;
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		//const webhookData = this.getWorkflowStaticData('node');
+		const req = this.getRequestObject();
+		const bodyData = req.body;
+		//const headerData = this.getHeaderData();
+
+
+		// TODO
+		// Validate signature
+		// https://github.com/taigaio/taiga-back/issues/1031
+
+		// //@ts-ignore
+		// const requestSignature: string = headerData['x-taiga-webhook-signature'];
+
+		// if (requestSignature === undefined) {
+		// 	return {};
+		// }
+
+		// //@ts-ignore
+		// const computedSignature = createHmac('sha1', webhookData.key as string).update(JSON.stringify(bodyData)).digest('hex');
+
+		// if (requestSignature !== computedSignature) {
+		// 	return {};
+		// }
+
+		return {
+			workflowData: [
+				this.helpers.returnJsonArray(bodyData),
+			],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Taiga/issueOperationFields.ts b/packages/nodes-base/nodes/Taiga/issueOperationFields.ts
new file mode 100644
index 000000000..1ecf03341
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/issueOperationFields.ts
@@ -0,0 +1,357 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const issueOperationFields = [
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getUserProjects',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'create',
+					'getAll',
+					'update',
+				],
+			},
+		},
+		default: '',
+		description: 'The project ID.',
+		required: true,
+	},
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		required: true,
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getProjectUsers',
+				},
+				default: '',
+				description: 'User id to you want assign the issue to',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the issue is blocked',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Closed',
+				name: 'is_closed',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Milestone ID',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectSlug',
+					],
+					loadOptionsMethod: 'getProjectMilestones',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Priority ID',
+				name: 'priority',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectSlug',
+					],
+					loadOptionsMethod: 'getProjectPriorities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Severity ID',
+				name: 'severity',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectSlug',
+					],
+					loadOptionsMethod: 'getProjectSeverities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Status ID',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getStatuses',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'string',
+				description: 'Tags separated by comma.',
+				default: '',
+				placeholder: 'product, sales',
+			},
+			{
+				displayName: 'Type ID',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectSlug',
+					],
+					loadOptionsMethod: 'getTypes',
+				},
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Issue ID',
+		name: 'issueId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'update',
+					'delete',
+					'get',
+				],
+			},
+		},
+		default: '',
+		required: true,
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getProjectUsers',
+				},
+				default: '',
+				description: 'User id to you want assign the issue to',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the issue is blocked',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Closed',
+				name: 'is_closed',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Milestone ID',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectSlug',
+					],
+					loadOptionsMethod: 'getProjectMilestones',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Priority ID',
+				name: 'priority',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectSlug',
+					],
+					loadOptionsMethod: 'getProjectPriorities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Severity ID',
+				name: 'severity',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectSlug',
+					],
+					loadOptionsMethod: 'getProjectSeverities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Status ID',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getStatuses',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'string',
+				description: 'Tags separated by comma.',
+				default: '',
+				placeholder: 'product, sales',
+			},
+			{
+				displayName: 'Type ID',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectSlug',
+					],
+					loadOptionsMethod: 'getTypes',
+				},
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'issue',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'issue',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Taiga/taiga.png b/packages/nodes-base/nodes/Taiga/taiga.png
new file mode 100644
index 000000000..3d7481cba
Binary files /dev/null and b/packages/nodes-base/nodes/Taiga/taiga.png differ
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 2597b0a0c..c64d13a2e 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -5,13 +5,13 @@ import {
 import {
 	IDataObject,
 	INodeExecutionData,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
-	apiRequest,
 	addAdditionalFields,
+	apiRequest,
 } from './GenericFunctions';
 
 
@@ -34,7 +34,7 @@ export class Telegram implements INodeType {
 			{
 				name: 'telegramApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -53,7 +53,7 @@ export class Telegram implements INodeType {
 					{
 						name: 'Message',
 						value: 'message',
-					}
+					},
 				],
 				default: 'message',
 				description: 'The resource to operate on.',
@@ -250,7 +250,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'member'
+							'member',
 						],
 						resource: [
 							'chat',
@@ -273,7 +273,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'setDescription'
+							'setDescription',
 						],
 						resource: [
 							'chat',
@@ -296,7 +296,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'setTitle'
+							'setTitle',
 						],
 						resource: [
 							'chat',
@@ -323,7 +323,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'answerQuery'
+							'answerQuery',
 						],
 						resource: [
 							'callback',
@@ -342,7 +342,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'answerQuery'
+							'answerQuery',
 						],
 						resource: [
 							'callback',
@@ -434,7 +434,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						messageType: [
-							'message'
+							'message',
 						],
 						operation: [
 							'editMessageText',
@@ -455,7 +455,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						messageType: [
-							'message'
+							'message',
 						],
 						operation: [
 							'editMessageText',
@@ -476,7 +476,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						messageType: [
-							'inlineMessage'
+							'inlineMessage',
 						],
 						operation: [
 							'editMessageText',
@@ -530,7 +530,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'sendAnimation'
+							'sendAnimation',
 						],
 						resource: [
 							'message',
@@ -553,7 +553,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'sendAudio'
+							'sendAudio',
 						],
 						resource: [
 							'message',
@@ -575,7 +575,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'sendChatAction'
+							'sendChatAction',
 						],
 						resource: [
 							'message',
@@ -641,7 +641,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'sendDocument'
+							'sendDocument',
 						],
 						resource: [
 							'message',
@@ -662,7 +662,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'sendMediaGroup'
+							'sendMediaGroup',
 						],
 						resource: [
 							'message',
@@ -784,7 +784,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'sendPhoto'
+							'sendPhoto',
 						],
 						resource: [
 							'message',
@@ -806,7 +806,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'sendSticker'
+							'sendSticker',
 						],
 						resource: [
 							'message',
@@ -828,7 +828,7 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
-							'sendVideo'
+							'sendVideo',
 						],
 						resource: [
 							'message',
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index c9659cfee..116855de6 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -266,8 +266,8 @@ export class TelegramTrigger implements INodeType {
 								binary: {
 									data: binaryData,
 								},
-							}
-						]
+							},
+						],
 					],
 				};
 			}
@@ -275,7 +275,7 @@ export class TelegramTrigger implements INodeType {
 
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray([bodyData as unknown as IDataObject])
+				this.helpers.returnJsonArray([bodyData as unknown as IDataObject]),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Todoist/Todoist.node.ts b/packages/nodes-base/nodes/Todoist/Todoist.node.ts
index d2dbe002e..4190f54cd 100644
--- a/packages/nodes-base/nodes/Todoist/Todoist.node.ts
+++ b/packages/nodes-base/nodes/Todoist/Todoist.node.ts
@@ -4,11 +4,11 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -416,8 +416,8 @@ export class Todoist implements INodeType {
 				}
 
 				return returnData;
-			}
-		}
+			},
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Todoist/todoist.png b/packages/nodes-base/nodes/Todoist/todoist.png
index db8c55479..63ac5b456 100644
Binary files a/packages/nodes-base/nodes/Todoist/todoist.png and b/packages/nodes-base/nodes/Todoist/todoist.png differ
diff --git a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
index 37c6bdb80..534606adf 100644
--- a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
@@ -2,9 +2,9 @@ import { OptionsWithUri } from 'request';
 
 import {
 	IExecuteFunctions,
+	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-	IExecuteSingleFunctions,
 	IPollFunctions,
 	ITriggerFunctions,
 } from 'n8n-core';
@@ -27,7 +27,7 @@ export async function togglApiRequest(this: ITriggerFunctions | IPollFunctions |
 		qs: query,
 		uri: uri || `https://www.toggl.com/api/v8${resource}`,
 		body,
-		json: true
+		json: true,
 	};
 	if (Object.keys(options.body).length === 0) {
 		delete options.body;
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index c32734bc2..2f9242215 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -1,9 +1,9 @@
 import { IPollFunctions } from 'n8n-core';
 import {
+	IDataObject,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IDataObject,
 } from 'n8n-workflow';
 
 import * as moment from 'moment';
@@ -25,7 +25,7 @@ export class TogglTrigger implements INodeType {
 			{
 				name: 'togglApi',
 				required: true,
-			}
+			},
 		],
 		polling: true,
 		inputs: [],
@@ -39,12 +39,12 @@ export class TogglTrigger implements INodeType {
 					{
 						name: 'New Time Entry',
 						value: 'newTimeEntry',
-					}
+					},
 				],
 				required: true,
 				default: 'newTimeEntry',
 			},
-		]
+		],
 	};
 
 	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
diff --git a/packages/nodes-base/nodes/TravisCi/BuildDescription.ts b/packages/nodes-base/nodes/TravisCi/BuildDescription.ts
index 0506dfdaf..2afd7e5cd 100644
--- a/packages/nodes-base/nodes/TravisCi/BuildDescription.ts
+++ b/packages/nodes-base/nodes/TravisCi/BuildDescription.ts
@@ -198,7 +198,7 @@ export const buildFields = [
 					{
 						name: 'DESC',
 						value: 'desc',
-					}
+					},
 				],
 				default: 'asc',
 				description: 'You may specify order to sort your response.',
diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
index a7168039d..4ae360499 100644
--- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
@@ -35,7 +35,7 @@ export async function travisciApiRequest(this: IHookFunctions | IExecuteFunction
 		qs,
 		body,
 		uri: uri || `https://api.travis-ci.com${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
index 140a4cd0d..7be473da6 100644
--- a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
+++ b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
@@ -4,9 +4,9 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -38,7 +38,7 @@ export class TravisCi implements INodeType {
 			{
 				name: 'travisCiApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/TravisCi/travisci.png b/packages/nodes-base/nodes/TravisCi/travisci.png
index d655d4439..da76c1eb0 100644
Binary files a/packages/nodes-base/nodes/TravisCi/travisci.png and b/packages/nodes-base/nodes/TravisCi/travisci.png differ
diff --git a/packages/nodes-base/nodes/Trello/AttachmentDescription.ts b/packages/nodes-base/nodes/Trello/AttachmentDescription.ts
index 1fa0bc58d..8be93f634 100644
--- a/packages/nodes-base/nodes/Trello/AttachmentDescription.ts
+++ b/packages/nodes-base/nodes/Trello/AttachmentDescription.ts
@@ -37,7 +37,7 @@ export const attachmentOperations = [
 				name: 'Get All',
 				value: 'getAll',
 				description: 'Returns all attachments for the card',
-			}
+			},
 		],
 		default: 'getAll',
 		description: 'The operation to perform.',
diff --git a/packages/nodes-base/nodes/Trello/BoardDescription.ts b/packages/nodes-base/nodes/Trello/BoardDescription.ts
index 9e75de40c..c613d0ce2 100644
--- a/packages/nodes-base/nodes/Trello/BoardDescription.ts
+++ b/packages/nodes-base/nodes/Trello/BoardDescription.ts
@@ -41,7 +41,7 @@ export const boardOperations = [
 		],
 		default: 'create',
 		description: 'The operation to perform.',
-	}
+	},
 ] as INodeProperties[];
 
 export const boardFields = [
diff --git a/packages/nodes-base/nodes/Trello/ChecklistDescription.ts b/packages/nodes-base/nodes/Trello/ChecklistDescription.ts
index a8ecb03e6..4079f53c5 100644
--- a/packages/nodes-base/nodes/Trello/ChecklistDescription.ts
+++ b/packages/nodes-base/nodes/Trello/ChecklistDescription.ts
@@ -452,7 +452,7 @@ export const checklistFields = [
 				options: [
 					{
 						name: 'complete',
-						value: 'complete'
+						value: 'complete',
 					},
 					{
 						name: 'incomplete',
diff --git a/packages/nodes-base/nodes/Trello/LabelDescription.ts b/packages/nodes-base/nodes/Trello/LabelDescription.ts
index 3aaa91809..fee245ec2 100644
--- a/packages/nodes-base/nodes/Trello/LabelDescription.ts
+++ b/packages/nodes-base/nodes/Trello/LabelDescription.ts
@@ -52,7 +52,7 @@ export const labelOperations = [
 				name: 'Update',
 				value: 'update',
 				description: 'Update a label.',
-			}
+			},
 
 		],
 		default: 'getAll',
@@ -127,7 +127,7 @@ export const labelFields = [
 			},
 			{
 				name: 'green',
-				value: 'green'
+				value: 'green',
 			},
 			{
 				name: 'orange',
@@ -159,7 +159,7 @@ export const labelFields = [
 			},
 			{
 				name: 'yellow',
-				value: 'yellow'
+				value: 'yellow',
 			},
 		],
 		default: 'null',
@@ -425,7 +425,7 @@ export const labelFields = [
 					},
 					{
 						name: 'green',
-						value: 'green'
+						value: 'green',
 					},
 					{
 						name: 'orange',
@@ -457,7 +457,7 @@ export const labelFields = [
 					},
 					{
 						name: 'yellow',
-						value: 'yellow'
+						value: 'yellow',
 					},
 				],
 				default: 'null',
diff --git a/packages/nodes-base/nodes/Trello/ListDescription.ts b/packages/nodes-base/nodes/Trello/ListDescription.ts
index 105f84114..c2a539e28 100644
--- a/packages/nodes-base/nodes/Trello/ListDescription.ts
+++ b/packages/nodes-base/nodes/Trello/ListDescription.ts
@@ -21,27 +21,27 @@ export const listOperations = [
 			{
 				name: 'Archive',
 				value: 'archive',
-				description: 'Archive/Unarchive a list'
+				description: 'Archive/Unarchive a list',
 			},
 			{
 				name: 'Create',
 				value: 'create',
-				description: 'Create a new list'
+				description: 'Create a new list',
 			},
 			{
 				name: 'Get',
 				value: 'get',
-				description: 'Get the data of a list'
+				description: 'Get the data of a list',
 			},
 			{
 				name: 'Update',
 				value: 'update',
-				description: 'Update a list'
-			}
+				description: 'Update a list',
+			},
 		],
 		default: 'create',
-		description: 'The operation to perform.'
-	}
+		description: 'The operation to perform.',
+	},
 ] as INodeProperties[];
 
 export const listFields = [
@@ -64,7 +64,7 @@ export const listFields = [
 				],
 			},
 		},
-		description: 'The ID of the list to archive or unarchive.'
+		description: 'The ID of the list to archive or unarchive.',
 	},
 	{
 		displayName: 'Archive',
@@ -81,7 +81,7 @@ export const listFields = [
 				],
 			},
 		},
-		description: 'If the list should be archived or unarchived.'
+		description: 'If the list should be archived or unarchived.',
 	},
 
 	// ----------------------------------
@@ -103,7 +103,7 @@ export const listFields = [
 				],
 			},
 		},
-		description: 'The ID of the board the list should be created in'
+		description: 'The ID of the board the list should be created in',
 	},
 	{
 		displayName: 'Name',
@@ -122,7 +122,7 @@ export const listFields = [
 				],
 			},
 		},
-		description: 'The name of the list'
+		description: 'The name of the list',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -146,7 +146,7 @@ export const listFields = [
 				name: 'idListSource',
 				type: 'string',
 				default: '',
-				description: 'ID of the list to copy into the new list.'
+				description: 'ID of the list to copy into the new list.',
 			},
 			{
 				displayName: 'Position',
@@ -154,9 +154,9 @@ export const listFields = [
 				type: 'string',
 				default: 'bottom',
 				description:
-					'The position of the new list. top, bottom, or a positive float.'
-			}
-		]
+					'The position of the new list. top, bottom, or a positive float.',
+			},
+		],
 	},
 
 	// ----------------------------------
@@ -178,7 +178,7 @@ export const listFields = [
 				],
 			},
 		},
-		description: 'The ID of the list to get.'
+		description: 'The ID of the list to get.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -202,9 +202,9 @@ export const listFields = [
 				name: 'fields',
 				type: 'string',
 				default: 'all',
-				description: 'Fields to return. Either "all" or a comma-separated list of fields.'
-			}
-		]
+				description: 'Fields to return. Either "all" or a comma-separated list of fields.',
+			},
+		],
 	},
 
 	// ----------------------------------
@@ -226,7 +226,7 @@ export const listFields = [
 				],
 			},
 		},
-		description: 'The ID of the list to update.'
+		description: 'The ID of the list to update.',
 	},
 	{
 		displayName: 'Update Fields',
@@ -250,21 +250,21 @@ export const listFields = [
 				name: 'idBoard',
 				type: 'string',
 				default: '',
-				description: 'ID of a board the list should be moved to.'
+				description: 'ID of a board the list should be moved to.',
 			},
 			{
 				displayName: 'Closed',
 				name: 'closed',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the list is closed.'
+				description: 'Whether the list is closed.',
 			},
 			{
 				displayName: 'Name',
 				name: 'name',
 				type: 'string',
 				default: '',
-				description: 'New name of the list'
+				description: 'New name of the list',
 			},
 			{
 				displayName: 'Position',
@@ -272,15 +272,15 @@ export const listFields = [
 				type: 'string',
 				default: 'bottom',
 				description:
-					'The position of the list. top, bottom, or a positive float.'
+					'The position of the list. top, bottom, or a positive float.',
 			},
 			{
 				displayName: 'Subscribed',
 				name: 'subscribed',
 				type: 'boolean',
 				default: false,
-				description: 'Whether the acting user is subscribed to the list.'
-			}
-		]
-	}
+				description: 'Whether the acting user is subscribed to the list.',
+			},
+		],
+	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.ts b/packages/nodes-base/nodes/Trello/Trello.node.ts
index c39b51a6c..99378d969 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.ts
+++ b/packages/nodes-base/nodes/Trello/Trello.node.ts
@@ -4,9 +4,9 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -14,38 +14,38 @@ import {
 } from './GenericFunctions';
 
 import {
-	attachmentOperations,
 	attachmentFields,
+	attachmentOperations,
 } from './AttachmentDescription';
 
 import {
-	boardOperations,
 	boardFields,
+	boardOperations,
 } from './BoardDescription';
 
 import {
-	cardOperations,
 	cardFields,
+	cardOperations,
 } from './CardDescription';
 
 import {
-	cardCommentOperations,
 	cardCommentFields,
+	cardCommentOperations,
 } from './CardCommentDescription';
 
 import {
-	checklistOperations,
 	checklistFields,
+	checklistOperations,
 } from './ChecklistDescription';
 
 import {
-	labelOperations,
 	labelFields,
+	labelOperations,
 } from './LabelDescription';
 
 import {
-	listOperations,
 	listFields,
+	listOperations,
 } from './ListDescription';
 
 export class Trello implements INodeType {
@@ -77,7 +77,7 @@ export class Trello implements INodeType {
 				options: [
 					{
 						name: 'Attachment',
-						value: 'attachment'
+						value: 'attachment',
 					},
 					{
 						name: 'Board',
@@ -97,7 +97,7 @@ export class Trello implements INodeType {
 					},
 					{
 						name: 'Label',
-						value: 'label'
+						value: 'label',
 					},
 					{
 						name: 'List',
@@ -128,7 +128,7 @@ export class Trello implements INodeType {
 			...cardCommentFields,
 			...checklistFields,
 			...labelFields,
-			...listFields
+			...listFields,
 
 		],
 	};
@@ -582,7 +582,7 @@ export class Trello implements INodeType {
 					Object.assign(qs, {
 						idBoard,
 						name,
-						color
+						color,
 					});
 
 					endpoint = 'labels';
diff --git a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
index 9d58c935b..edc0b3df2 100644
--- a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
+++ b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
@@ -4,9 +4,8 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -14,7 +13,7 @@ import {
 	apiRequest,
 } from './GenericFunctions';
 
-import { createHmac } from 'crypto';
+// import { createHmac } from 'crypto';
 
 
 export class TrelloTrigger implements INodeType {
@@ -69,12 +68,6 @@ export class TrelloTrigger implements INodeType {
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
-				if (this.getWebhookName() === 'setup') {
-					// Is setup-webhook which only gets used once when
-					// the webhook gets created so nothing to do.
-					return true;
-				}
-
 				const credentials = this.getCredentials('trelloApi');
 
 				if (credentials === undefined) {
@@ -102,12 +95,6 @@ export class TrelloTrigger implements INodeType {
 				return false;
 			},
 			async create(this: IHookFunctions): Promise<boolean> {
-				if (this.getWebhookName() === 'setup') {
-					// Is setup-webhook which only gets used once when
-					// the webhook gets created so nothing to do.
-					return true;
-				}
-
 				const webhookUrl = this.getNodeWebhookUrl('default');
 
 				const credentials = this.getCredentials('trelloApi');
@@ -138,12 +125,6 @@ export class TrelloTrigger implements INodeType {
 				return true;
 			},
 			async delete(this: IHookFunctions): Promise<boolean> {
-				if (this.getWebhookName() === 'setup') {
-					// Is setup-webhook which only gets used once when
-					// the webhook gets created so nothing to do.
-					return true;
-				}
-
 				const webhookData = this.getWorkflowStaticData('node');
 
 				if (webhookData.webhookId !== undefined) {
diff --git a/packages/nodes-base/nodes/Twake/Twake.node.ts b/packages/nodes-base/nodes/Twake/Twake.node.ts
index 3b5459cde..7d1da3182 100644
--- a/packages/nodes-base/nodes/Twake/Twake.node.ts
+++ b/packages/nodes-base/nodes/Twake/Twake.node.ts
@@ -3,12 +3,12 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeExecutionData,
 	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	ILoadOptionsFunctions,
-	INodePropertyOptions,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Twake/twake.png b/packages/nodes-base/nodes/Twake/twake.png
index 3b8408938..6bc695371 100644
Binary files a/packages/nodes-base/nodes/Twake/twake.png and b/packages/nodes-base/nodes/Twake/twake.png differ
diff --git a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
index c399911b6..fba00a7e3 100644
--- a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
@@ -35,7 +35,7 @@ export async function twilioApiRequest(this: IHookFunctions | IExecuteFunctions,
 			user: credentials.accountSid as string,
 			pass: credentials.authToken as string,
 		},
-		json: true
+		json: true,
 	};
 
 	try {
diff --git a/packages/nodes-base/nodes/Twilio/Twilio.node.ts b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
index 479cb11e6..f227c6668 100644
--- a/packages/nodes-base/nodes/Twilio/Twilio.node.ts
+++ b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
@@ -3,9 +3,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -31,7 +31,7 @@ export class Twilio implements INodeType {
 			{
 				name: 'twilioApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
index 655345ec9..bb2336eea 100644
--- a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
@@ -3,9 +3,9 @@ import {
 } from 'request';
 
 import {
-	IHookFunctions,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
+	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
@@ -19,7 +19,7 @@ export async function twitterApiRequest(this: IExecuteFunctions | IExecuteSingle
 		body,
 		qs,
 		url: uri || `https://api.twitter.com/1.1${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		if (Object.keys(option).length !== 0) {
@@ -74,5 +74,3 @@ export function chunks (buffer: Buffer, chunkSize: number) {
 
 	return result;
 }
-
-
diff --git a/packages/nodes-base/nodes/Twitter/TweetDescription.ts b/packages/nodes-base/nodes/Twitter/TweetDescription.ts
index 12cb87ebf..cd3a517e1 100644
--- a/packages/nodes-base/nodes/Twitter/TweetDescription.ts
+++ b/packages/nodes-base/nodes/Twitter/TweetDescription.ts
@@ -18,13 +18,23 @@ export const tweetOperations = [
 			{
 				name: 'Create',
 				value: 'create',
-				description: 'Create a new tweet',
+				description: 'Create or reply a tweet',
 			},
 			{
 				name: 'Search',
 				value: 'search',
 				description: 'Search tweets',
 			},
+			{
+				name: 'Like',
+				value: 'like',
+				description: 'Like a tweet',
+			},
+			{
+				name: 'Retweet',
+				value: 'retweet',
+				description: 'Retweet a tweet',
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -87,6 +97,13 @@ export const tweetFields = [
 				default: false,
 				description: 'Whether or not to put a pin on the exact coordinates a Tweet has been sent from.',
 			},
+			{
+				displayName: 'In Reply to Tweet',
+				name: 'inReplyToStatusId',
+				type: 'string',
+				default: '',
+				description: 'The ID of an existing status that the update is in reply to.',
+			},
 			{
 				displayName: 'Location',
 				name: 'locationFieldsUi',
@@ -126,7 +143,7 @@ export const tweetFields = [
 				default: false,
 				description: 'If you upload Tweet media that might be considered sensitive content such as nudity, or medical procedures, you must set this value to true.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                tweet:search                                */
@@ -306,7 +323,7 @@ export const tweetFields = [
 					{
 						name: 'Popular',
 						value: 'popular',
-						description: 'Return only the most popular results in the response.'
+						description: 'Return only the most popular results in the response.',
 					},
 				],
 				default: 'mixed',
@@ -321,4 +338,98 @@ export const tweetFields = [
 			},
 		],
 	},
+/* -------------------------------------------------------------------------- */
+/*                                tweet:like                                  */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Tweet ID',
+		name: 'tweetId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'like',
+				],
+				resource: [
+					'tweet',
+				],
+			},
+		},
+		description: 'The ID of the tweet',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'like',
+				],
+				resource: [
+					'tweet',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Entities',
+				name: 'includeEntities',
+				type: 'boolean',
+				default: false,
+				description: 'The entities will be omitted when set to false',
+			},
+		],
+	},
+/* -------------------------------------------------------------------------- */
+/*                                tweet:retweet                               */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Tweet ID',
+		name: 'tweetId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'retweet',
+				],
+				resource: [
+					'tweet',
+				],
+			},
+		},
+		description: 'The ID of the tweet',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'retweet',
+				],
+				resource: [
+					'tweet',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Trim User',
+				name: 'trimUser',
+				type: 'boolean',
+				default: false,
+				description: `When set to either true, each tweet returned in a timeline will include a user object including only the status authors numerical ID.`,
+			},
+		],
+	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Twitter/TweetInterface.ts b/packages/nodes-base/nodes/Twitter/TweetInterface.ts
index 10b16d6a2..fee604601 100644
--- a/packages/nodes-base/nodes/Twitter/TweetInterface.ts
+++ b/packages/nodes-base/nodes/Twitter/TweetInterface.ts
@@ -1,8 +1,10 @@
 export interface ITweet {
+	auto_populate_reply_metadata?: boolean;
 	display_coordinates?: boolean;
 	lat?: number;
 	long?: number;
 	media_ids?: string;
 	possibly_sensitive?: boolean;
 	status: string;
+	in_reply_to_status_id?: string;
 }
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.ts b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
index a62f9fd95..4e546f135 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.ts
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
@@ -1,17 +1,17 @@
 
 import {
+	BINARY_ENCODING,
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
-	BINARY_ENCODING,
 } from 'n8n-core';
 
 import {
 	IBinaryKeyData,
 	IDataObject,
 	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	INodePropertyOptions,
 } from 'n8n-workflow';
 
 import {
@@ -28,6 +28,7 @@ import {
 import {
 	ITweet,
 } from './TweetInterface';
+import { isDate } from 'util';
 
 const ISO6391 = require('iso-639-1');
 
@@ -50,7 +51,7 @@ export class Twitter implements INodeType {
 			{
 				name: 'twitterOAuth1Api',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -109,6 +110,11 @@ export class Twitter implements INodeType {
 						status: text,
 					};
 
+					if (additionalFields.inReplyToStatusId) {
+						body.in_reply_to_status_id = additionalFields.inReplyToStatusId as string;
+						body.auto_populate_reply_metadata = true;
+					}
+
 					if (additionalFields.attachments) {
 						const mediaIds = [];
 						const attachments = additionalFields.attachments as string;
@@ -233,7 +239,7 @@ export class Twitter implements INodeType {
 					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					const qs: IDataObject = {
-						q
+						q,
 					};
 
 					if (additionalFields.includeEntities) {
@@ -268,6 +274,36 @@ export class Twitter implements INodeType {
 						responseData = responseData.statuses;
 					}
 				}
+				//https://developer.twitter.com/en/docs/twitter-api/v1/tweets/post-and-engage/api-reference/post-favorites-create
+				if (operation === 'like') {
+					const tweetId = this.getNodeParameter('tweetId', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const qs: IDataObject = {
+						id: tweetId,
+					};
+
+					if (additionalFields.includeEntities) {
+						qs.include_entities = additionalFields.includeEntities as boolean;
+					}
+
+					responseData = await twitterApiRequest.call(this, 'POST', '/favorites/create.json', {}, qs);
+				}
+				//https://developer.twitter.com/en/docs/twitter-api/v1/tweets/post-and-engage/api-reference/post-statuses-retweet-id
+				if (operation === 'retweet') {
+					const tweetId = this.getNodeParameter('tweetId', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					const qs: IDataObject = {
+						id: tweetId,
+					};
+
+					if (additionalFields.trimUser) {
+						qs.trim_user = additionalFields.trimUser as boolean;
+					}
+
+					responseData = await twitterApiRequest.call(this, 'POST', `/statuses/retweet/${tweetId}.json`, {}, qs);
+				}
 			}
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index 9c8f6e16f..4af0342d8 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
@@ -4,10 +4,10 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
index e5ef6b3f9..fd3bf6525 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
@@ -10,19 +10,19 @@ import {
 } from 'n8n-workflow';
 
 import {
+	convertNETDates,
 	unleashedApiRequest,
 	unleashedApiRequestAllItems,
-	convertNETDates,
 } from './GenericFunctions';
 
 import {
-	salesOrderOperations,
 	salesOrderFields,
+	salesOrderOperations,
 } from './SalesOrderDescription';
 
 import {
-	stockOnHandOperations,
 	stockOnHandFields,
+	stockOnHandOperations,
 } from './StockOnHandDescription';
 
 import * as moment from 'moment';
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/unleashedSoftware.png b/packages/nodes-base/nodes/UnleashedSoftware/unleashedSoftware.png
index d6afb1aff..19696c710 100644
Binary files a/packages/nodes-base/nodes/UnleashedSoftware/unleashedSoftware.png and b/packages/nodes-base/nodes/UnleashedSoftware/unleashedSoftware.png differ
diff --git a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
index ff6d7b481..176996342 100644
--- a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
@@ -18,7 +18,7 @@ export async function upleadApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs,
 		body,
 		uri: uri ||`https://api.uplead.com/v2${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Uplead/Uplead.node.ts b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
index 93350e99d..bd280ad35 100644
--- a/packages/nodes-base/nodes/Uplead/Uplead.node.ts
+++ b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
@@ -15,8 +15,8 @@ import {
 	companyOperations,
 } from './CompanyDesciption';
 import {
+	personFields,
 	personOperations,
-	 personFields,
 } from './PersonDescription';
 
 export class Uplead implements INodeType {
@@ -38,7 +38,7 @@ export class Uplead implements INodeType {
 			{
 				name: 'upleadApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -54,7 +54,7 @@ export class Uplead implements INodeType {
 					{
 						name: 'Person',
 						value: 'person',
-						description: `Person API lets you lookup a person based on an email address OR based on a domain name + first name + last name`
+						description: `Person API lets you lookup a person based on an email address OR based on a domain name + first name + last name`,
 					},
 				],
 				default: 'company',
diff --git a/packages/nodes-base/nodes/Vero/EventDescripion.ts b/packages/nodes-base/nodes/Vero/EventDescripion.ts
index b92f295b9..54c0d0e32 100644
--- a/packages/nodes-base/nodes/Vero/EventDescripion.ts
+++ b/packages/nodes-base/nodes/Vero/EventDescripion.ts
@@ -43,7 +43,7 @@ export const eventFields = [
 				],
 				operation: [
 					'track',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier of the customer',
@@ -61,7 +61,7 @@ export const eventFields = [
 				],
 				operation: [
 					'track',
-				]
+				],
 			},
 		},
 		description: 'Email',
@@ -79,7 +79,7 @@ export const eventFields = [
 				],
 				operation: [
 					'track',
-				]
+				],
 			},
 		},
 		description: 'The name of the event tracked.',
@@ -97,9 +97,9 @@ export const eventFields = [
 				],
 				operation: [
 					'track',
-				]
+				],
 			},
-		}
+		},
 	},
 	{
 		displayName: 'Data',
@@ -143,7 +143,7 @@ export const eventFields = [
 						default: '',
 						description: 'Value of the property to set.',
 					},
-				]
+				],
 			},
 		],
 	},
@@ -189,7 +189,7 @@ export const eventFields = [
 						default: '',
 						description: 'Value of the property to set.',
 					},
-				]
+				],
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Vero/GenericFunctions.ts b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
index 2e5053fb7..dd3a7fcab 100644
--- a/packages/nodes-base/nodes/Vero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
@@ -1,8 +1,8 @@
 import { OptionsWithUri } from 'request';
 import {
 	IExecuteFunctions,
-	ILoadOptionsFunctions,
 	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
 } from 'n8n-core';
 import { IDataObject } from 'n8n-workflow';
 
@@ -21,7 +21,7 @@ export async function veroApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 			...body,
 		},
 		uri: uri ||`https://api.getvero.com/api/v2${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Vero/UserDescription.ts b/packages/nodes-base/nodes/Vero/UserDescription.ts
index 240241afb..cd33f2a05 100644
--- a/packages/nodes-base/nodes/Vero/UserDescription.ts
+++ b/packages/nodes-base/nodes/Vero/UserDescription.ts
@@ -73,7 +73,7 @@ export const userFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier of the customer',
@@ -91,9 +91,9 @@ export const userFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
-		}
+		},
 	},
 	{
 		displayName: 'Additional Fields',
@@ -119,7 +119,7 @@ export const userFields = [
 				default: '',
 				description: 'The table to create the row in.',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Data',
@@ -163,7 +163,7 @@ export const userFields = [
 						default: '',
 						description: 'Value of the property to set.',
 					},
-				]
+				],
 			},
 		],
 	},
@@ -208,7 +208,7 @@ export const userFields = [
 				],
 				operation: [
 					'alias',
-				]
+				],
 			},
 		},
 		description: 'The old unique identifier of the user',
@@ -226,7 +226,7 @@ export const userFields = [
 				],
 				operation: [
 					'alias',
-				]
+				],
 			},
 		},
 		description: 'The new unique identifier of the user',
@@ -247,7 +247,7 @@ export const userFields = [
 				],
 				operation: [
 					'unsubscribe',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier of the user',
@@ -268,7 +268,7 @@ export const userFields = [
 				],
 				operation: [
 					'resubscribe',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier of the user',
@@ -289,7 +289,7 @@ export const userFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier of the user',
@@ -310,7 +310,7 @@ export const userFields = [
 				],
 				operation: [
 					'addTags',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier of the user',
@@ -328,7 +328,7 @@ export const userFields = [
 				],
 				operation: [
 					'addTags',
-				]
+				],
 			},
 		},
 		description: 'Tags to add separated by ","',
@@ -349,7 +349,7 @@ export const userFields = [
 				],
 				operation: [
 					'removeTags',
-				]
+				],
 			},
 		},
 		description: 'The unique identifier of the user',
@@ -367,7 +367,7 @@ export const userFields = [
 				],
 				operation: [
 					'removeTags',
-				]
+				],
 			},
 		},
 		description: 'Tags to remove separated by ","',
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index 6638e22b5..6eb28aa76 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -3,21 +3,21 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
-	veroApiRequest,
 	validateJSON,
+	veroApiRequest,
 } from './GenericFunctions';
 import {
-	userOperations,
 	userFields,
+	userOperations,
 } from './UserDescription';
 import {
+	eventFields,
 	eventOperations,
-	eventFields
 } from './EventDescripion';
 
 export class Vero implements INodeType {
@@ -39,7 +39,7 @@ export class Vero implements INodeType {
 			{
 				name: 'veroApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
new file mode 100644
index 000000000..0427d3689
--- /dev/null
+++ b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
@@ -0,0 +1,50 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function vonageApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const credentials = this.getCredentials('vonageApi') as IDataObject;
+
+	body.api_key = credentials.apiKey as string;
+
+	body.api_secret = credentials.apiSecret as string;
+
+	const options: OptionsWithUri = {
+		method,
+		form: body,
+		qs,
+		uri: `https://rest.nexmo.com${path}`,
+		json: true,
+	};
+
+	try {
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		//@ts-ignore
+		return await this.helpers.request.call(this, options);
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.error) {
+
+			let errors = error.response.body.error.errors;
+
+			errors = errors.map((e: IDataObject) => e.message);
+			// Try to return the error prettier
+			throw new Error(
+				`Vonage error response [${error.statusCode}]: ${errors.join('|')}`,
+			);
+		}
+		throw error;
+	}
+}
diff --git a/packages/nodes-base/nodes/Vonage/Vonage.node.ts b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
new file mode 100644
index 000000000..d93f52812
--- /dev/null
+++ b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
@@ -0,0 +1,509 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	vonageApiRequest,
+} from './GenericFunctions';
+
+export class Vonage implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Vonage',
+		name: 'vonage',
+		icon: 'file:vonage.png',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Vonage API',
+		defaults: {
+			name: 'Vonage',
+			color: '#000000',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'vonageApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'SMS',
+						value: 'sms',
+					},
+				],
+				default: 'sms',
+				description: 'The resource to operate on.',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [
+					{
+						name: 'Send',
+						value: 'send',
+					},
+				],
+				displayOptions: {
+					show: {
+						resource: [
+							'sms',
+						],
+					},
+				},
+				default: 'send',
+				description: 'The resource to operate on.',
+			},
+			{
+				displayName: 'From',
+				name: 'from',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'sms',
+						],
+						operation: [
+							'send',
+						],
+					},
+				},
+				default: '',
+				description: `The name or number the message should be sent from`,
+			},
+			{
+				displayName: 'To',
+				name: 'to',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'sms',
+						],
+						operation: [
+							'send',
+						],
+					},
+				},
+				default: '',
+				description: `The number that the message should be sent to. Numbers are specified in E.164 format.`,
+			},
+			// {
+			// 	displayName: 'Type',
+			// 	name: 'type',
+			// 	type: 'options',
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 		},
+			// 	},
+			// 	options: [
+			// 		{
+			// 			name: 'Binary',
+			// 			value: 'binary',
+			// 		},
+			// 		{
+			// 			name: 'Text',
+			// 			value: 'text',
+			// 		},
+			// 		{
+			// 			name: 'Wappush',
+			// 			value: 'wappush',
+			// 		},
+			// 		{
+			// 			name: 'Unicode',
+			// 			value: 'unicode',
+			// 		},
+			// 		{
+			// 			name: 'VCAL',
+			// 			value: 'vcal',
+			// 		},
+			// 		{
+			// 			name: 'VCARD',
+			// 			value: 'vcard',
+			// 		},
+			// 	],
+			// 	default: 'text',
+			// 	description: 'The format of the message body',
+			// },
+			// {
+			// 	displayName: 'Binary Property',
+			// 	name: 'binaryPropertyName',
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 			type: [
+			// 				'binary',
+			// 			],
+			// 		},
+			// 	},
+			// 	type: 'string',
+			// 	default: 'data',
+			// 	description: 'Object property name which holds binary data.',
+			// 	required: true,
+			// },
+			// {
+			// 	displayName: 'Body',
+			// 	name: 'body',
+			// 	type: 'string',
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 			type: [
+			// 				'binary',
+			// 			],
+			// 		},
+			// 	},
+			// 	default: '',
+			// 	description: 'Hex encoded binary data',
+			// },
+			// {
+			// 	displayName: 'UDH',
+			// 	name: 'udh',
+			// 	type: 'string',
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 			type: [
+			// 				'binary',
+			// 			],
+			// 		},
+			// 	},
+			// 	default: '',
+			// 	description: 'Your custom Hex encoded User Data Header',
+			// },
+			// {
+			// 	displayName: 'Title',
+			// 	name: 'title',
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 			type: [
+			// 				'wappush',
+			// 			],
+			// 		},
+			// 	},
+			// 	type: 'string',
+			// 	default: '',
+			// 	description: 'The title for a wappush SMS',
+			// },
+			// {
+			// 	displayName: 'URL',
+			// 	name: 'url',
+			// 	type: 'string',
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 			type: [
+			// 				'wappush',
+			// 			],
+			// 		},
+			// 	},
+			// 	default: '',
+			// 	description: 'The URL of your website',
+			// },
+			// {
+			// 	displayName: 'Validity (in minutes)',
+			// 	name: 'validity',
+			// 	type: 'number',
+			// 	default: 0,
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 			type: [
+			// 				'wappush',
+			// 			],
+			// 		},
+			// 	},
+			// 	description: 'The availability for an SMS in minutes',
+			// },
+			{
+				displayName: 'Message',
+				name: 'message',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'sms',
+						],
+						operation: [
+							'send',
+						],
+						// type: [
+						// 	'text',
+						// 	'unicode',
+						// ],
+					},
+				},
+				default: '',
+				description: `The body of the message being sent`,
+			},
+			// {
+			// 	displayName: 'VCard',
+			// 	name: 'vcard',
+			// 	type: 'string',
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 			type: [
+			// 				'vcard',
+			// 			],
+			// 		},
+			// 	},
+			// 	default: '',
+			// 	description: 'A business card in vCard format',
+			// },
+			// {
+			// 	displayName: 'VCal',
+			// 	name: 'vcal',
+			// 	type: 'string',
+			// 	displayOptions: {
+			// 		show: {
+			// 			resource: [
+			// 				'sms',
+			// 			],
+			// 			operation: [
+			// 				'send',
+			// 			],
+			// 			type: [
+			// 				'vcal',
+			// 			],
+			// 		},
+			// 	},
+			// 	default: '',
+			// 	description: 'A calendar event in vCal format',
+			// },
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				displayOptions: {
+					show: {
+						resource: [
+							'sms',
+						],
+						operation: [
+							'send',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Account Ref',
+						name: 'account-ref',
+						type: 'string',
+						default: '',
+						description: 'An optional string used to identify separate accounts using the SMS endpoint for billing purposes. To use this feature, please email support@nexmo.com',
+					},
+					{
+						displayName: 'Callback',
+						name: 'callback',
+						type: 'string',
+						default: '',
+						description: 'The webhook endpoint the delivery receipt for this sms is sent to. This parameter overrides the webhook endpoint you set in Dashboard.',
+					},
+					{
+						displayName: 'Client Ref',
+						name: 'client-ref',
+						type: 'string',
+						default: '',
+						description: 'You can optionally include your own reference of up to 40 characters.',
+					},
+					{
+						displayName: 'Message Class',
+						name: 'message-class',
+						type: 'options',
+						options: [
+							{
+								name: '0',
+								value: 0,
+							},
+							{
+								name: '1',
+								value: 1,
+							},
+							{
+								name: '2',
+								value: 2,
+							},
+							{
+								name: '3',
+								value: 3,
+							},
+						],
+						default: '',
+						description: 'The Data Coding Scheme value of the message',
+					},
+					{
+						displayName: 'Protocol ID',
+						name: 'protocol-id',
+						type: 'string',
+						default: '',
+						description: 'The value of the protocol identifier to use. Ensure that the value is aligned with udh.',
+					},
+					{
+						displayName: 'Status Report Req',
+						name: 'status-report-req',
+						type: 'boolean',
+						default: false,
+						description: 'Boolean indicating if you like to receive a Delivery Receipt.',
+					},
+					{
+						displayName: 'TTL (in minutes)',
+						name: 'ttl',
+						type: 'number',
+						default: 4320,
+						description: 'By default Nexmo attempt delivery for 72 hours',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+
+			if (resource === 'sms') {
+
+				if (operation === 'send') {
+
+					const from = this.getNodeParameter('from', i) as string;
+
+					const to = this.getNodeParameter('to', i) as string;
+
+					const type = this.getNodeParameter('type', i, 'text') as string;
+
+					const body: IDataObject = {
+						from,
+						to,
+						type,
+					};
+
+					if (type === 'text' || type === 'unicode') {
+						const message = this.getNodeParameter('message', i) as string;
+
+						body.text = message;
+					}
+
+					if (type === 'binary') {
+						const data = this.getNodeParameter('body', i) as string;
+
+						const udh = this.getNodeParameter('udh', i) as string;
+
+						body.udh = udh;
+
+						body.body = data;
+					}
+
+					if (type === 'wappush') {
+						const title = this.getNodeParameter('title', i) as string;
+
+						const url = this.getNodeParameter('url', i) as string;
+
+						const validity = this.getNodeParameter('validity', i) as number;
+
+						body.title = title;
+
+						body.url = url;
+
+						body.validity = validity * 60000;
+					}
+
+					if (type === 'vcard') {
+						const vcard = this.getNodeParameter('vcard', i) as string;
+
+						body.vcard = vcard;
+					}
+
+					if (type === 'vcal') {
+						const vcal = this.getNodeParameter('vcal', i) as string;
+
+						body.vcal = vcal;
+					}
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					Object.assign(body, additionalFields);
+
+					if (body.ttl) {
+						// transform minutes to milliseconds
+						body.ttl = (body.ttl as number) * 60000;
+					}
+
+					responseData = await vonageApiRequest.call(this, 'POST', '/sms/json', body);
+
+					responseData = responseData.messages;
+				}
+			}
+		}
+		if (Array.isArray(responseData)) {
+			returnData.push.apply(returnData, responseData as IDataObject[]);
+		} else if (responseData !== undefined) {
+			returnData.push(responseData as IDataObject);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Vonage/vonage.png b/packages/nodes-base/nodes/Vonage/vonage.png
new file mode 100644
index 000000000..f4b8b0256
Binary files /dev/null and b/packages/nodes-base/nodes/Vonage/vonage.png differ
diff --git a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
index 783b67480..4632ec93a 100644
--- a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
@@ -25,7 +25,7 @@ export async function webflowApiRequest(this: IHookFunctions | IExecuteFunctions
 		qs,
 		body,
 		uri: uri ||`https://api.webflow.com${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index 73b2efef6..becb8a962 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -5,11 +5,11 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Webhook.node.ts b/packages/nodes-base/nodes/Webhook.node.ts
index 1778d4429..8d819d37b 100644
--- a/packages/nodes-base/nodes/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook.node.ts
@@ -6,8 +6,8 @@ import {
 import {
 	IDataObject,
 	INodeExecutionData,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
@@ -96,15 +96,15 @@ export class Webhook implements INodeType {
 				options: [
 					{
 						name: 'Basic Auth',
-						value: 'basicAuth'
+						value: 'basicAuth',
 					},
 					{
 						name: 'Header Auth',
-						value: 'headerAuth'
+						value: 'headerAuth',
 					},
 					{
 						name: 'None',
-						value: 'none'
+						value: 'none',
 					},
 				],
 				default: 'none',
@@ -206,7 +206,7 @@ export class Webhook implements INodeType {
 				displayOptions: {
 					show: {
 						responseData: [
-							'firstEntryBinary'
+							'firstEntryBinary',
 						],
 					},
 				},
@@ -297,7 +297,7 @@ export class Webhook implements INodeType {
 										default: '',
 										description: 'Value of the header.',
 									},
-								]
+								],
 							},
 						],
 					},
@@ -418,7 +418,7 @@ export class Webhook implements INodeType {
 						workflowData: [
 							[
 								returnItem,
-							]
+							],
 						],
 					});
 				});
@@ -450,8 +450,8 @@ export class Webhook implements INodeType {
 					return resolve({
 						workflowData: [
 							[
-								returnItem
-							]
+								returnItem,
+							],
 						],
 					});
 				});
@@ -476,7 +476,7 @@ export class Webhook implements INodeType {
 					// @ts-ignore
 					data: req.rawBody.toString(BINARY_ENCODING),
 					mimeType,
-				}
+				},
 			};
 		}
 
diff --git a/packages/nodes-base/nodes/Wekan/BoardDescription.ts b/packages/nodes-base/nodes/Wekan/BoardDescription.ts
new file mode 100644
index 000000000..41b7dec9b
--- /dev/null
+++ b/packages/nodes-base/nodes/Wekan/BoardDescription.ts
@@ -0,0 +1,307 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const boardOperations = [
+	// ----------------------------------
+	//         board
+	// ----------------------------------
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'board',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new board',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a board',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get the data of a board',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all user boards',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const boardFields = [
+
+	// ----------------------------------
+	//         board:create
+	// ----------------------------------
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		placeholder: 'My board',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'board',
+				],
+			},
+		},
+		description: 'The title of the board.',
+	},
+	{
+		displayName: 'Owner',
+		name: 'owner',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getUsers',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'board',
+				],
+			},
+		},
+		description: 'The user ID in Wekan.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'board',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Active',
+				name: 'isActive',
+				type: 'boolean',
+				default: false,
+				description: 'Set the board active.',
+			},
+			{
+				displayName: 'Admin',
+				name: 'isAdmin',
+				type: 'boolean',
+				default: false,
+				description: 'Set the owner an admin of the board.',
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'options',
+				options: [
+					{
+						name: 'Belize',
+						value: 'belize',
+					},
+					{
+						name: 'Nephritis',
+						value: 'nephritis',
+					},
+					{
+						name: 'Pomegranate',
+						value: 'pomegranate',
+					},
+					{
+						name: 'Pumpkin',
+						value: 'pumpkin',
+					},
+					{
+						name: 'Wisteria',
+						value: 'wisteria',
+					},
+					{
+						name: 'Midnight',
+						value: 'midnight',
+					},
+				],
+				default: '',
+				description: 'The color of the board.',
+			},
+			{
+				displayName: 'Comment only',
+				name: 'isCommentOnly',
+				type: 'boolean',
+				default: false,
+				description: 'Only enable comments.',
+			},
+			{
+				displayName: 'No comments',
+				name: 'isNoComments',
+				type: 'boolean',
+				default: false,
+				description: 'Disable comments.',
+			},
+			{
+				displayName: 'Permission',
+				name: 'permission',
+				type: 'options',
+				options: [
+					{
+						name: 'Private',
+						value: 'private',
+					},
+					{
+						name: 'Public',
+						value: 'public',
+					},
+				],
+				default: 'private',
+				description: 'Set the board permission.',
+			},
+			{
+				displayName: 'Worker',
+				name: 'isWorker',
+				type: 'boolean',
+				default: false,
+				description: 'Only move cards, assign himself to card and comment.',
+			},
+		],
+	},
+
+	// ----------------------------------
+	//         board:delete
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'board',
+				],
+			},
+		},
+		description: 'The ID of the board to delete.',
+	},
+
+	// ----------------------------------
+	//         board:get
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'board',
+				],
+			},
+		},
+		description: 'The ID of the board to get.',
+	},
+
+	// ----------------------------------
+	//         board:getAll
+	// ----------------------------------
+	{
+		displayName: 'User ID',
+		name: 'IdUser',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getUsers',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'board',
+				],
+			},
+		},
+		description: 'The ID of the user that boards are attached.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'board',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'board',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 200,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Wekan/CardCommentDescription.ts b/packages/nodes-base/nodes/Wekan/CardCommentDescription.ts
new file mode 100644
index 000000000..955690f07
--- /dev/null
+++ b/packages/nodes-base/nodes/Wekan/CardCommentDescription.ts
@@ -0,0 +1,460 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const cardCommentOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a comment on a card',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a comment from a card',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a card comment',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all card comments',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const cardCommentFields = [
+	// ----------------------------------
+	//         cardComment:create
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the card',
+	},
+	{
+		displayName: 'Author ID',
+		name: 'authorId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getUsers',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The user who posted the comment.',
+	},
+	{
+		displayName: 'Comment',
+		name: 'comment',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The comment text.',
+	},
+
+	// ----------------------------------
+	//         cardComment:delete
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the card.',
+	},
+	{
+		displayName: 'Comment ID',
+		name: 'commentId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getComments',
+			loadOptionsDependsOn: [
+				'boardId',
+				'cardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the comment to delete.',
+	},
+
+	// ----------------------------------
+	//         cardComment:get
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the card.',
+	},
+	{
+		displayName: 'Comment ID',
+		name: 'commentId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the comment to get.',
+	},
+
+	// ----------------------------------
+	//         cardComment:getAll
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		description: 'The ID of the card.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'cardComment',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'cardComment',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 200,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Wekan/CardDescription.ts b/packages/nodes-base/nodes/Wekan/CardDescription.ts
new file mode 100644
index 000000000..e2579d39c
--- /dev/null
+++ b/packages/nodes-base/nodes/Wekan/CardDescription.ts
@@ -0,0 +1,837 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const cardOperations = [
+	// ----------------------------------
+	//         card
+	// ----------------------------------
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'card',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new card',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a card',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a card',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all cards',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a card',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const cardFields = [
+	// ----------------------------------
+	//         card:create
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the board that list belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the list to create card in.',
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		placeholder: 'My card',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The title of the card.',
+	},
+	{
+		displayName: 'Swimlane ID',
+		name: 'swimlaneId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getSwimlanes',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The swimlane ID of the new card.',
+	},
+	{
+		displayName: 'Author ID',
+		name: 'authorId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getUsers',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The author ID.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Assignees',
+				name: 'assignees',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'The new list of assignee IDs attached to the card.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The new description of the card.',
+			},
+			{
+				displayName: 'Members',
+				name: 'members',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'The new list of member IDs attached to the card.',
+			},
+		],
+	},
+
+	// ----------------------------------
+	//         card:delete
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the board that list belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the card to delete.',
+	},
+
+	// ----------------------------------
+	//         card:get
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the board that list belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the card to get.',
+	},
+
+	// ----------------------------------
+	//         card:getAll
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the board that list belongs to.',
+	},
+	{
+		displayName: 'From Object',
+		name: 'fromObject',
+		type: 'options',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'List',
+				value: 'list',
+			},
+			{
+				name: 'Swimlane',
+				value: 'swimlane',
+			},
+		],
+		default: '',
+		description: '',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				fromObject: [
+					'list',
+				],
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Swimlane ID',
+		name: 'swimlaneId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getSwimlanes',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				fromObject: [
+					'swimlane',
+				],
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the swimlane that card belongs to.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'card',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 200,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+
+	// ----------------------------------
+	//         card:update
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the board that list belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		description: 'The ID of the card to update.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'card',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Author ID',
+				name: 'authorId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'Update the owner of the card.',
+			},
+			{
+				displayName: 'Assignees',
+				name: 'assignees',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'The new list of assignee IDs attached to the card.',
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'options',
+				options: [
+					{
+						value: 'white',
+						name: 'White',
+					},
+					{
+						value: 'green',
+						name: 'Green',
+					},
+					{
+						value: 'yellow',
+						name: 'Yellow',
+					},
+					{
+						value: 'orange',
+						name: 'Orange',
+					},
+					{
+						value: 'red',
+						name: 'Red',
+					},
+					{
+						value: 'purple',
+						name: 'Purple',
+					},
+					{
+						value: 'blue',
+						name: 'Blue',
+					},
+					{
+						value: 'sky',
+						name: 'Sky',
+					},
+					{
+						value: 'lime',
+						name: 'Lime',
+					},
+					{
+						value: 'pink',
+						name: 'Pink',
+					},
+					{
+						value: 'black',
+						name: 'Black',
+					},
+					{
+						value: 'silver',
+						name: 'Silver',
+					},
+					{
+						value: 'peachpuff',
+						name: 'Peachpuff',
+					},
+					{
+						value: 'crimson',
+						name: 'Crimson',
+					},
+					{
+						value: 'plum',
+						name: 'Plum',
+					},
+					{
+						value: 'darkgreen',
+						name: 'Darkgreen',
+					},
+					{
+						value: 'slateblue',
+						name: 'Slateblue',
+					},
+					{
+						value: 'magenta',
+						name: 'Magenta',
+					},
+					{
+						value: 'gold',
+						name: 'Gold',
+					},
+					{
+						value: 'navy',
+						name: 'Navy',
+					},
+					{
+						value: 'gray',
+						name: 'Gray',
+					},
+					{
+						value: 'saddlebrown',
+						name: 'Saddlebrown',
+					},
+					{
+						value: 'paleturquoise',
+						name: 'Paleturquoise',
+					},
+					{
+						value: 'mistyrose',
+						name: 'Mistyrose',
+					},
+					{
+						value: 'indigo',
+						name: 'Indigo',
+					},
+				],
+				default: '',
+				description: 'The new color of the card.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The new description of the card.',
+			},
+			{
+				displayName: 'Due At',
+				name: 'dueAt',
+				type: 'dateTime',
+				default: '',
+				description: 'The new due at field of the card.',
+			},
+			{
+				displayName: 'End At',
+				name: 'endAt',
+				type: 'dateTime',
+				default: '',
+				description: 'The new end at field of the card.',
+			},
+			{
+				displayName: 'Label IDs',
+				name: 'labelIds',
+				type: 'string',
+				default: '',
+				description: 'The label IDs attached to the card.',
+			},
+			{
+				displayName: 'List ID',
+				name: 'listId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getLists',
+					loadOptionsDependsOn: [
+						'boardId',
+					],
+				},
+				default: '',
+				description: 'The new list ID of the card (move operation).',
+			},
+			{
+				displayName: 'Members',
+				name: 'members',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'The new list of member IDs attached to the card.',
+			},
+			{
+				displayName: 'Over Time',
+				name: 'isOverTime',
+				type: 'boolean',
+				default: false,
+				description: 'The new over time field of the card.',
+			},
+			{
+				displayName: 'Parent ID',
+				name: 'parentId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCards',
+					loadOptionsDependsOn: [
+						'boardId',
+						'listId',
+					],
+				},
+				default: '',
+				description: 'The parent of the card.',
+			},
+			{
+				displayName: 'Received At',
+				name: 'receivedAt',
+				type: 'dateTime',
+				default: '',
+				description: 'The new received at field of the card.',
+			},
+			{
+				displayName: 'Spent Time',
+				name: 'spentTime',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: '',
+				description: 'The new spent time field of the card.',
+			},
+			{
+				displayName: 'Start At',
+				name: 'startAt',
+				type: 'dateTime',
+				default: '',
+				description: 'The new start at field of the card.',
+			},
+			{
+				displayName: 'Swimlane ID',
+				name: 'swimlaneId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getSwimlanes',
+					loadOptionsDependsOn: [
+						'boardId',
+					],
+				},
+				default: '',
+				description: 'The new swimlane ID of the card.',
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				description: 'The new title of the card.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Wekan/ChecklistDescription.ts b/packages/nodes-base/nodes/Wekan/ChecklistDescription.ts
new file mode 100644
index 000000000..390cdeefa
--- /dev/null
+++ b/packages/nodes-base/nodes/Wekan/ChecklistDescription.ts
@@ -0,0 +1,474 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const checklistOperations = [
+	// ----------------------------------
+	//         checklist
+	// ----------------------------------
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new checklist',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a checklist',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get the data of a checklist',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Returns all checklists for the card',
+			},
+		],
+		default: 'getAll',
+		description: 'The operation to perform.',
+	},
+
+] as INodeProperties[];
+
+export const checklistFields = [
+	// ----------------------------------
+	//         checklist:create
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the board where the card is in.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the card to add checklist to.',
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The title of the checklist to add.',
+	},
+	{
+		displayName: 'Items',
+		name: 'items',
+		type: 'string',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Item',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		default: [],
+		description: 'Items to be added to the checklist.',
+	},
+
+	// ----------------------------------
+	//         checklist:delete
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the card that checklist belongs to.',
+	},
+	{
+		displayName: 'Checklist ID',
+		name: 'checklistId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChecklists',
+			loadOptionsDependsOn: [
+				'boardId',
+				'cardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the checklist to delete.',
+	},
+
+	// ----------------------------------
+	//         checklist:get
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the card that checklist belongs to.',
+	},
+	{
+		displayName: 'Checklist ID',
+		name: 'checklistId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChecklists',
+			loadOptionsDependsOn: [
+				'boardId',
+				'cardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the checklist to get.',
+	},
+
+	// ----------------------------------
+	//         checklist:getAll
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the board that list belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		description: 'The ID of the card to get checklists.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'checklist',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'checklist',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 200,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Wekan/ChecklistItemDescription.ts b/packages/nodes-base/nodes/Wekan/ChecklistItemDescription.ts
new file mode 100644
index 000000000..d9170c1ae
--- /dev/null
+++ b/packages/nodes-base/nodes/Wekan/ChecklistItemDescription.ts
@@ -0,0 +1,445 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const checklistItemOperations = [
+	// ----------------------------------
+	//         checklistItem
+	// ----------------------------------
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a checklist item',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a checklist item',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a checklist item',
+			},
+		],
+		default: 'getAll',
+		description: 'The operation to perform.',
+	},
+
+] as INodeProperties[];
+
+export const checklistItemFields = [
+	// ----------------------------------
+	//         checklistItem:delete
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the card that checklistItem belongs to.',
+	},
+	{
+		displayName: 'Checklist ID',
+		name: 'checklistId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChecklists',
+			loadOptionsDependsOn: [
+				'boardId',
+				'cardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the checklistItem that card belongs to.',
+	},
+	{
+		displayName: 'Checklist Item ID',
+		name: 'checklistItemId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChecklistItems',
+			loadOptionsDependsOn: [
+				'boardId',
+				'cardId',
+				'checklistId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the checklistItem item to get.',
+	},
+
+	// ----------------------------------
+	//         checklistItem:get
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the card that checklistItem belongs to.',
+	},
+	{
+		displayName: 'Checklist ID',
+		name: 'checklistId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the checklistItem that card belongs to.',
+	},
+	{
+		displayName: 'Checklist Item ID',
+		name: 'checklistItemId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChecklistItems',
+			loadOptionsDependsOn: [
+				'boardId',
+				'cardId',
+				'checklistId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the checklistItem item to get.',
+	},
+
+	// ----------------------------------
+	//         checklistItem:update
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the board that card belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the list that card belongs to.',
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCards',
+			loadOptionsDependsOn: [
+				'boardId',
+				'listId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the card that checklistItem belongs to.',
+	},
+	{
+		displayName: 'CheckList ID',
+		name: 'checklistId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChecklists',
+			loadOptionsDependsOn: [
+				'boardId',
+				'cardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the checklistItem that card belongs to.',
+	},
+	{
+		displayName: 'Checklist Item ID',
+		name: 'checklistItemId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getChecklistItems',
+			loadOptionsDependsOn: [
+				'boardId',
+				'cardId',
+				'checklistId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		description: 'The ID of the checklistItem item to update.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'checklistItem',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				description: 'The new title for the checklistItem item.',
+			},
+			{
+				displayName: 'Finished',
+				name: 'isFinished',
+				type: 'boolean',
+				default: false,
+				description: 'Item is checked',
+			},
+		],
+	},
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Wekan/GenericFunctions.ts b/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
new file mode 100644
index 000000000..e771b1e59
--- /dev/null
+++ b/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
@@ -0,0 +1,78 @@
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+} from 'n8n-core';
+
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	ICredentialDataDecryptedObject,
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function getAuthorization(
+	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	credentials?: ICredentialDataDecryptedObject,
+): Promise<IDataObject> {
+	if (credentials === undefined) {
+		throw new Error('No credentials got returned!');
+	}
+
+	const { password, username } = credentials;
+	const options: OptionsWithUri = {
+		method: 'POST',
+		form: {
+			username,
+			password,
+		},
+		uri: `${credentials.url}/users/login`,
+		json: true,
+	};
+
+	try {
+		const response = await this.helpers.request!(options);
+
+		return { token: response.token, userId: response.id };
+	} catch (error) {
+		throw new Error('Wekan Error: ' + error.error.reason);
+	}
+}
+
+export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: object, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
+	const credentials = this.getCredentials('wekanApi');
+
+	if (credentials === undefined) {
+		throw new Error('No credentials got returned!');
+	}
+
+	query = query || {};
+
+	const { token } = await getAuthorization.call(this, credentials);
+
+	const options: OptionsWithUri = {
+		headers: {
+			'Accept':'application/json',
+			'Authorization': `Bearer ${token}`,
+		},
+		method,
+		body,
+		qs: query,
+		uri: `${credentials.url}/api/${endpoint}`,
+		json: true,
+	};
+
+	try {
+		return await this.helpers.request!(options);
+	} catch (error) {
+		if (error.statusCode === 401) {
+			throw new Error('The Wekan credentials are not valid!');
+		}
+
+		throw error;
+	}
+}
diff --git a/packages/nodes-base/nodes/Wekan/ListDescription.ts b/packages/nodes-base/nodes/Wekan/ListDescription.ts
new file mode 100644
index 000000000..aa28f3661
--- /dev/null
+++ b/packages/nodes-base/nodes/Wekan/ListDescription.ts
@@ -0,0 +1,250 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const listOperations = [
+	// ----------------------------------
+	//         list
+	// ----------------------------------
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'list',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new list',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a list',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get the data of a list',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all board lists',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const listFields = [
+	// ----------------------------------
+	//         list:create
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		description: 'The ID of the board the list should be created in',
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		placeholder: 'My list',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		description: 'The title of the list.',
+	},
+
+	// ----------------------------------
+	//         list:delete
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		description: 'The ID of the board that list belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getLists',
+			loadOptionsDependsOn: [
+				'boardId',
+			],
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		description: 'The ID of the list to delete.',
+	},
+
+	// ----------------------------------
+	//         list:get
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		description: 'The ID of the board that list belongs to.',
+	},
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		description: 'The ID of the list to get.',
+	},
+
+	// ----------------------------------
+	//         list:getAll
+	// ----------------------------------
+	{
+		displayName: 'Board ID',
+		name: 'boardId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getBoards',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		description: 'ID of the board where the lists are in.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'list',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 200,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
new file mode 100644
index 000000000..168ed6593
--- /dev/null
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -0,0 +1,687 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	apiRequest,
+} from './GenericFunctions';
+
+import {
+	boardFields,
+	boardOperations,
+} from './BoardDescription';
+
+import {
+	cardFields,
+	cardOperations,
+} from './CardDescription';
+
+import {
+	cardCommentFields,
+	cardCommentOperations,
+} from './CardCommentDescription';
+
+import {
+	checklistFields,
+	checklistOperations,
+} from './ChecklistDescription';
+
+import {
+	checklistItemFields,
+	checklistItemOperations,
+} from './ChecklistItemDescription';
+
+import {
+	listFields,
+	listOperations,
+} from './ListDescription';
+
+// https://wekan.github.io/api/v4.41/
+
+export class Wekan implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Wekan',
+		name: 'wekan',
+		icon: 'file:wekan.png',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Open-Source Kanban',
+		defaults: {
+			name: 'Wekan',
+			color: '#006581',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'wekanApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Board',
+						value: 'board',
+					},
+					{
+						name: 'Card',
+						value: 'card',
+					},
+					{
+						name: 'Card Comment',
+						value: 'cardComment',
+					},
+					{
+						name: 'Checklist',
+						value: 'checklist',
+					},
+					{
+						name: 'Checklist Item',
+						value: 'checklistItem',
+					},
+					{
+						name: 'List',
+						value: 'list',
+					},
+				],
+				default: 'card',
+				description: 'The resource to operate on.',
+			},
+
+			// ----------------------------------
+			//         operations
+			// ----------------------------------
+			...boardOperations,
+			...cardOperations,
+			...cardCommentOperations,
+			...checklistOperations,
+			...checklistItemOperations,
+			...listOperations,
+
+			// ----------------------------------
+			//         fields
+			// ----------------------------------
+			...boardFields,
+			...cardFields,
+			...cardCommentFields,
+			...checklistFields,
+			...checklistItemFields,
+			...listFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const users = await apiRequest.call(this, 'GET', 'users', {}, {});
+				for (const user of users) {
+					returnData.push({
+						name: user.username,
+						value: user._id,
+					});
+				}
+				return returnData;
+			},
+			async getBoards(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const user = await apiRequest.call(this, 'GET', `user`, {}, {});
+				const boards = await apiRequest.call(this, 'GET', `users/${user._id}/boards`, {}, {});
+				for (const board of boards) {
+					returnData.push({
+						name: board.title,
+						value: board._id,
+					});
+				}
+				return returnData;
+			},
+			async getLists(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const boardId = this.getCurrentNodeParameter('boardId') as string;
+				const lists = await apiRequest.call(this, 'GET', `boards/${boardId}/lists`, {}, {});
+				for (const list of lists) {
+					returnData.push({
+						name: list.title,
+						value: list._id,
+					});
+				}
+				return returnData;
+			},
+			async getSwimlanes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const boardId = this.getCurrentNodeParameter('boardId') as string;
+				const swimlanes = await apiRequest.call(this, 'GET', `boards/${boardId}/swimlanes`, {}, {});
+				for (const swimlane of swimlanes) {
+					returnData.push({
+						name: swimlane.title,
+						value: swimlane._id,
+					});
+				}
+				return returnData;
+			},
+			async getCards(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const boardId = this.getCurrentNodeParameter('boardId') as string;
+				const listId = this.getCurrentNodeParameter('listId') as string;
+				const cards = await apiRequest.call(this, 'GET', `boards/${boardId}/lists/${listId}/cards`, {}, {});
+				for (const card of cards) {
+					returnData.push({
+						name: card.title,
+						value: card._id,
+					});
+				}
+				return returnData;
+			},
+			async getChecklists(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const boardId = this.getCurrentNodeParameter('boardId') as string;
+				const cardId = this.getCurrentNodeParameter('cardId') as string;
+				const checklists = await apiRequest.call(this, 'GET', `boards/${boardId}/cards/${cardId}/checklists`, {}, {});
+				for (const checklist of checklists) {
+					returnData.push({
+						name: checklist.title,
+						value: checklist._id,
+					});
+				}
+				return returnData;
+			},
+			async getChecklistItems(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const boardId = this.getCurrentNodeParameter('boardId') as string;
+				const cardId = this.getCurrentNodeParameter('cardId') as string;
+				const checklistId = this.getCurrentNodeParameter('checklistId') as string;
+				const checklist = await apiRequest.call(this, 'GET', `boards/${boardId}/cards/${cardId}/checklists/${checklistId}`, {}, {});
+				for (const item of checklist.items) {
+					returnData.push({
+						name: item.title,
+						value: item._id,
+					});
+				}
+				return returnData;
+			},
+			async getComments(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const boardId = this.getCurrentNodeParameter('boardId') as string;
+				const cardId = this.getCurrentNodeParameter('cardId') as string;
+				const comments = await apiRequest.call(this, 'GET', `boards/${boardId}/cards/${cardId}/comments`, {}, {});
+				for (const comment of comments) {
+					returnData.push({
+						name: comment.comment,
+						value: comment._id,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		let returnAll;
+		let limit;
+
+		const operation = this.getNodeParameter('operation', 0) as string;
+		const resource = this.getNodeParameter('resource', 0) as string;
+
+		// For Post
+		let body: IDataObject;
+		// For Query string
+		let qs: IDataObject;
+
+		let requestMethod: string;
+		let endpoint: string;
+
+		for (let i = 0; i < items.length; i++) {
+			requestMethod = 'GET';
+			endpoint = '';
+			body = {};
+			qs = {};
+
+			if (resource === 'board') {
+
+				if (operation === 'create') {
+					// ----------------------------------
+					//         create
+					// ----------------------------------
+
+					requestMethod = 'POST';
+					endpoint = 'boards';
+
+					body.title = this.getNodeParameter('title', i) as string;
+					body.owner = this.getNodeParameter('owner', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					Object.assign(body, additionalFields);
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+
+					endpoint = `boards/${boardId}`;
+
+				} else if (operation === 'get') {
+					// ----------------------------------
+					//         get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+
+					endpoint = `boards/${boardId}`;
+
+				} else if (operation === 'getAll') {
+					// ----------------------------------
+					//         getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const userId = this.getNodeParameter('IdUser', i) as string;
+
+					returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					endpoint = `users/${userId}/boards`;
+
+				} else {
+					throw new Error(`The operation "${operation}" is not known!`);
+				}
+
+			} else if (resource === 'card') {
+
+				if (operation === 'create') {
+					// ----------------------------------
+					//         create
+					// ----------------------------------
+
+					requestMethod = 'POST';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					endpoint = `boards/${boardId}/lists/${listId}/cards`;
+
+					body.title = this.getNodeParameter('title', i) as string;
+					body.swimlaneId = this.getNodeParameter('swimlaneId', i) as string;
+					body.authorId = this.getNodeParameter('authorId', i) as string;
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					Object.assign(body, additionalFields);
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const listId = this.getNodeParameter('listId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+
+					endpoint = `boards/${boardId}/lists/${listId}/cards/${cardId}`;
+
+				} else if (operation === 'get') {
+					// ----------------------------------
+					//         get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const listId = this.getNodeParameter('listId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+
+					endpoint = `boards/${boardId}/lists/${listId}/cards/${cardId}`;
+
+				} else if (operation === 'getAll') {
+					// ----------------------------------
+					//         getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const fromObject = this.getNodeParameter('fromObject', i) as string;
+					returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					if (fromObject === 'list') {
+						const listId = this.getNodeParameter('listId', i) as string;
+
+						endpoint = `boards/${boardId}/lists/${listId}/cards`;
+					}
+
+					if (fromObject === 'swimlane') {
+						const swimlaneId = this.getNodeParameter('swimlaneId', i) as string;
+
+						endpoint = `boards/${boardId}/swimlanes/${swimlaneId}/cards`;
+					}
+
+				} else if (operation === 'update') {
+					// ----------------------------------
+					//         update
+					// ----------------------------------
+
+					requestMethod = 'PUT';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const listId = this.getNodeParameter('listId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+
+					endpoint = `boards/${boardId}/lists/${listId}/cards/${cardId}`;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					Object.assign(body, updateFields);
+
+				} else {
+					throw new Error(`The operation "${operation}" is not known!`);
+				}
+
+			} else if (resource === 'cardComment') {
+
+				if (operation === 'create') {
+					// ----------------------------------
+					//         create
+					// ----------------------------------
+
+					requestMethod = 'POST';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/comments`;
+
+					body.authorId = this.getNodeParameter('authorId', i) as string;
+					body.comment = this.getNodeParameter('comment', i) as string;
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const commentId = this.getNodeParameter('commentId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/comments/${commentId}`;
+
+				} else if (operation === 'get') {
+					// ----------------------------------
+					//         get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const commentId = this.getNodeParameter('commentId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/comments/${commentId}`;
+
+				} else if (operation === 'getAll') {
+					// ----------------------------------
+					//         getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/comments`;
+
+				} else {
+					throw new Error(`The operation "${operation}" is not known!`);
+				}
+
+			} else if (resource === 'list') {
+
+				if (operation === 'create') {
+					// ----------------------------------
+					//         create
+					// ----------------------------------
+
+					requestMethod = 'POST';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+
+					endpoint = `boards/${boardId}/lists`;
+
+					body.title = this.getNodeParameter('title', i) as string;
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					endpoint = `boards/${boardId}/lists/${listId}`;
+
+				} else if (operation === 'get') {
+					// ----------------------------------
+					//         get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const listId = this.getNodeParameter('listId', i) as string;
+
+					endpoint = `boards/${boardId}/lists/${listId}`;
+
+				} else if (operation === 'getAll') {
+					// ----------------------------------
+					//         getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+					endpoint = `boards/${boardId}/lists`;
+
+				} else {
+					throw new Error(`The operation "${operation}" is not known!`);
+				}
+
+			} else if (resource === 'checklist') {
+
+				if (operation === 'create') {
+					// ----------------------------------
+					//         create
+					// ----------------------------------
+
+					requestMethod = 'POST';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists`;
+
+					body.title = this.getNodeParameter('title', i) as string;
+
+					body.items = this.getNodeParameter('items', i) as string[];
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const checklistId = this.getNodeParameter('checklistId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists/${checklistId}`;
+
+				} else if (operation === 'get') {
+					// ----------------------------------
+					//         get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const checklistId = this.getNodeParameter('checklistId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists/${checklistId}`;
+
+				} else if (operation === 'getAll') {
+					// ----------------------------------
+					//         getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists`;
+
+				} else if (operation === 'getCheckItem') {
+					// ----------------------------------
+					//         getCheckItem
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const checklistId = this.getNodeParameter('checklistId', i) as string;
+					const itemId = this.getNodeParameter('itemId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists/${checklistId}/items/${itemId}`;
+
+				} else if (operation === 'deleteCheckItem') {
+					// ----------------------------------
+					//         deleteCheckItem
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const checklistId = this.getNodeParameter('checklistId', i) as string;
+					const itemId = this.getNodeParameter('itemId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists/${checklistId}/items/${itemId}`;
+
+				} else if (operation === 'updateCheckItem') {
+					// ----------------------------------
+					//         updateCheckItem
+					// ----------------------------------
+
+					requestMethod = 'PUT';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const checklistId = this.getNodeParameter('checklistId', i) as string;
+					const itemId = this.getNodeParameter('itemId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists/${checklistId}/items/${itemId}`;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					Object.assign(body, updateFields);
+
+
+
+				} else {
+					throw new Error(`The operation "${operation}" is not known!`);
+				}
+			} else if (resource === 'checklistItem') {
+
+				if (operation === 'get') {
+					// ----------------------------------
+					//         get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const checklistId = this.getNodeParameter('checklistId', i) as string;
+					const itemId = this.getNodeParameter('checklistItemId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists/${checklistId}/items/${itemId}`;
+
+				} else if (operation === 'delete') {
+					// ----------------------------------
+					//         delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const checklistId = this.getNodeParameter('checklistId', i) as string;
+					const itemId = this.getNodeParameter('checklistItemId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists/${checklistId}/items/${itemId}`;
+
+				} else if (operation === 'update') {
+					// ----------------------------------
+					//         update
+					// ----------------------------------
+
+					requestMethod = 'PUT';
+
+					const boardId = this.getNodeParameter('boardId', i) as string;
+					const cardId = this.getNodeParameter('cardId', i) as string;
+					const checklistId = this.getNodeParameter('checklistId', i) as string;
+					const itemId = this.getNodeParameter('checklistItemId', i) as string;
+
+					endpoint = `boards/${boardId}/cards/${cardId}/checklists/${checklistId}/items/${itemId}`;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					Object.assign(body, updateFields);
+				}
+			}
+			let responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+			if (returnAll === false) {
+				limit = this.getNodeParameter('limit', i) as number;
+				responseData = responseData.splice(0, limit);
+			}
+
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+			} else {
+				returnData.push(responseData as IDataObject);
+			}
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Wekan/wekan.png b/packages/nodes-base/nodes/Wekan/wekan.png
new file mode 100644
index 000000000..8849da129
Binary files /dev/null and b/packages/nodes-base/nodes/Wekan/wekan.png differ
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index 804392fea..d96bbff10 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -10,14 +10,14 @@ import {
 	IWebhookFunctions,
 } from 'n8n-core';
 import {
+	ICredentialDataDecryptedObject,
 	IDataObject,
-	ICredentialDataDecryptedObject
 } from 'n8n-workflow';
 import {
-	 IShoppingLine,
-	 IFeeLine,
-	 ILineItem,
-	 ICouponLine
+	ICouponLine,
+	IFeeLine,
+	ILineItem,
+	IShoppingLine,
 } from './OrderInterface';
 
 export async function woocommerceApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -33,8 +33,8 @@ export async function woocommerceApiRequest(this: IHookFunctions | IExecuteFunct
 		method,
 		qs,
 		body,
-		uri: uri ||`${credentials.url}/wp-json/wc/v3${resource}`,
-		json: true
+		uri: uri || `${credentials.url}/wp-json/wc/v3${resource}`,
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.form;
@@ -67,7 +67,7 @@ export async function woocommerceApiRequestAllItems(this: IExecuteFunctions | IL
 	query.per_page = 100;
 	do {
 		responseData = await woocommerceApiRequest.call(this, method, endpoint, body, query, uri, { resolveWithFullResponse: true });
-		uri = responseData.headers['link'].split(';')[0].replace('<', '').replace('>','');
+		uri = responseData.headers['link'].split(';')[0].replace('<', '').replace('>', '');
 		returnData.push.apply(returnData, responseData.body);
 	} while (
 		responseData.headers['link'] !== undefined &&
diff --git a/packages/nodes-base/nodes/WooCommerce/OrderDescription.ts b/packages/nodes-base/nodes/WooCommerce/OrderDescription.ts
index eda9c1339..52647b0d2 100644
--- a/packages/nodes-base/nodes/WooCommerce/OrderDescription.ts
+++ b/packages/nodes-base/nodes/WooCommerce/OrderDescription.ts
@@ -184,7 +184,7 @@ export const orderFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Billing address',
@@ -274,7 +274,7 @@ export const orderFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Coupons line data',
@@ -343,7 +343,7 @@ export const orderFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Fee line data',
@@ -443,7 +443,7 @@ export const orderFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Line item data',
@@ -554,7 +554,7 @@ export const orderFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Meta data',
@@ -597,7 +597,7 @@ export const orderFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Shipping address',
@@ -675,7 +675,7 @@ export const orderFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Shipping line data',
@@ -890,7 +890,7 @@ export const orderFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Billing address',
@@ -980,7 +980,7 @@ export const orderFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Coupons line data',
@@ -1049,7 +1049,7 @@ export const orderFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Fee line data',
@@ -1149,7 +1149,7 @@ export const orderFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Line item data',
@@ -1260,7 +1260,7 @@ export const orderFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Meta data',
@@ -1303,7 +1303,7 @@ export const orderFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Shipping address',
@@ -1381,7 +1381,7 @@ export const orderFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Shipping line data',
@@ -1666,7 +1666,7 @@ export const orderFields = [
 				default: 'any',
 				description: 'Limit result set to orders assigned a specific status.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                   order:delete                           */
diff --git a/packages/nodes-base/nodes/WooCommerce/ProductDescription.ts b/packages/nodes-base/nodes/WooCommerce/ProductDescription.ts
index a22b394ed..d486b978d 100644
--- a/packages/nodes-base/nodes/WooCommerce/ProductDescription.ts
+++ b/packages/nodes-base/nodes/WooCommerce/ProductDescription.ts
@@ -62,7 +62,7 @@ export const productFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Product name.',
@@ -420,7 +420,7 @@ export const productFields = [
 				default: '',
 				description: 'Product weight.',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Dimensions',
@@ -438,7 +438,7 @@ export const productFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Product dimensions',
@@ -488,7 +488,7 @@ export const productFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Product Image',
@@ -538,7 +538,7 @@ export const productFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Meta data',
@@ -945,7 +945,7 @@ export const productFields = [
 				default: '',
 				description: 'Product weight.',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Dimensions',
@@ -963,7 +963,7 @@ export const productFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Product dimensions',
@@ -1013,7 +1013,7 @@ export const productFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Product Image',
@@ -1063,7 +1063,7 @@ export const productFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Meta data',
@@ -1410,7 +1410,7 @@ export const productFields = [
 				default: 'simple',
 				description: 'Product type',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                   product:delete                           */
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
index bbb3d8668..04c76fd4d 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -4,10 +4,10 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
-	INodeTypeDescription,
 	INodeExecutionData,
-	INodeType,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	setMetadata,
@@ -56,7 +56,7 @@ export class WooCommerce implements INodeType {
 			{
 				name: 'wooCommerceApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
index 6a09e525d..e947792f5 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
@@ -5,14 +5,14 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeType,
+	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
-	woocommerceApiRequest,
 	getAutomaticSecret,
+	woocommerceApiRequest,
 } from './GenericFunctions';
 
 import { createHmac } from 'crypto';
@@ -35,7 +35,7 @@ export class WooCommerceTrigger implements INodeType {
 			{
 				name: 'wooCommerceApi',
 				required: true,
-			}
+			},
 		],
 		webhooks: [
 			{
diff --git a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
index e526017b5..61302655c 100644
--- a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
@@ -1,10 +1,16 @@
-import { OptionsWithUri } from 'request';
+import {
+	OptionsWithUri,
+} from 'request';
+
 import {
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
 
 export async function wordpressApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('wordpressApi');
@@ -24,8 +30,8 @@ export async function wordpressApiRequest(this: IExecuteFunctions | IExecuteSing
 		method,
 		qs,
 		body,
-		uri: uri ||`${credentials!.url}/wp-json/wp/v2${resource}`,
-		json: true
+		uri: uri || `${credentials!.url}/wp-json/wp/v2${resource}`,
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(options.body).length === 0) {
@@ -35,7 +41,7 @@ export async function wordpressApiRequest(this: IExecuteFunctions | IExecuteSing
 		return await this.helpers.request!(options);
 	} catch (error) {
 		let errorMessage = error.message;
-		if (error.response.body) {
+		if (error.response && error.response.body) {
 			errorMessage = error.response.body.message || error.response.body.Message || error.message;
 		}
 
diff --git a/packages/nodes-base/nodes/Wordpress/PostDescription.ts b/packages/nodes-base/nodes/Wordpress/PostDescription.ts
index d14f3b329..3e2f26154 100644
--- a/packages/nodes-base/nodes/Wordpress/PostDescription.ts
+++ b/packages/nodes-base/nodes/Wordpress/PostDescription.ts
@@ -62,7 +62,7 @@ export const postFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'The title for the post',
@@ -84,6 +84,16 @@ export const postFields = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Author ID',
+				name: 'authorId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getAuthors',
+				},
+				default: '',
+				description: 'The ID for the author of the object.',
+			},
 			{
 				displayName: 'Content',
 				name: 'content',
@@ -247,7 +257,7 @@ export const postFields = [
 				default: [],
 				description: 'The terms assigned to the object in the post_tag taxonomy.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 post:update                                */
@@ -265,7 +275,7 @@ export const postFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the object.',
@@ -287,6 +297,16 @@ export const postFields = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Author ID',
+				name: 'authorId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getAuthors',
+				},
+				default: '',
+				description: 'The ID for the author of the object.',
+			},
 			{
 				displayName: 'Title',
 				name: 'title',
@@ -457,7 +477,7 @@ export const postFields = [
 				default: [],
 				description: 'The terms assigned to the object in the post_tag taxonomy.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                  post:get                                  */
@@ -475,7 +495,7 @@ export const postFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the object.',
@@ -525,7 +545,7 @@ export const postFields = [
 				default: 'view',
 				description: 'Scope under which the request is made; determines fields present in response.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                   post:getAll                              */
@@ -754,7 +774,7 @@ export const postFields = [
 				description: 'Limit result set to items that are sticky.',
 			},
 
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 post:delete                                */
@@ -772,7 +792,7 @@ export const postFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the object.',
@@ -801,6 +821,6 @@ export const postFields = [
 				default: false,
 				description: 'Whether to bypass trash and force deletion.',
 			},
-		]
+		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Wordpress/PostInterface.ts b/packages/nodes-base/nodes/Wordpress/PostInterface.ts
index ad4b378a1..e810c11cf 100644
--- a/packages/nodes-base/nodes/Wordpress/PostInterface.ts
+++ b/packages/nodes-base/nodes/Wordpress/PostInterface.ts
@@ -1,5 +1,6 @@
 
 export interface IPost {
+	author?: number;
 	id?: number;
 	title?: string;
 	content?: string;
diff --git a/packages/nodes-base/nodes/Wordpress/UserDescription.ts b/packages/nodes-base/nodes/Wordpress/UserDescription.ts
index a9d413bf1..c9d64643d 100644
--- a/packages/nodes-base/nodes/Wordpress/UserDescription.ts
+++ b/packages/nodes-base/nodes/Wordpress/UserDescription.ts
@@ -62,7 +62,7 @@ export const userFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Login name for the user.',
@@ -80,7 +80,7 @@ export const userFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Display name for the user.',
@@ -98,7 +98,7 @@ export const userFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'First name for the user.',
@@ -116,7 +116,7 @@ export const userFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Last name for the user.',
@@ -134,7 +134,7 @@ export const userFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'The email address for the user.',
@@ -152,7 +152,7 @@ export const userFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Password for the user (never included)',
@@ -205,7 +205,7 @@ export const userFields = [
 				default: '',
 				description: 'An alphanumeric identifier for the user.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 user:update                                */
@@ -223,7 +223,7 @@ export const userFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the user.',
@@ -318,7 +318,7 @@ export const userFields = [
 				default: '',
 				description: 'An alphanumeric identifier for the user.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 user:get                                   */
@@ -336,7 +336,7 @@ export const userFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the user.',
@@ -379,7 +379,7 @@ export const userFields = [
 				default: 'view',
 				description: 'Scope under which the request is made; determines fields present in response.',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 user:getAll                                */
@@ -541,7 +541,7 @@ export const userFields = [
 			default: 'authors',
 			description: 'Limit result set to users who are considered authors.',
 		},
-	]
+	],
 },
 /* -------------------------------------------------------------------------- */
 /*                                 user:delete                                */
@@ -559,7 +559,7 @@ export const userFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: `Reassign the deleted user's posts and links to this user ID.`,
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
index 93d4df9de..36f845325 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -4,10 +4,10 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
-	INodeTypeDescription,
 	INodeExecutionData,
-	INodeType,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	wordpressApiRequest,
@@ -47,7 +47,7 @@ export class Wordpress implements INodeType {
 			{
 				name: 'wordpressApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -147,6 +147,9 @@ export class Wordpress implements INodeType {
 					const body: IPost = {
 						title,
 					};
+					if (additionalFields.authorId) {
+						body.author = additionalFields.authorId as number;
+					}
 					if (additionalFields.content) {
 						body.content = additionalFields.content as string;
 					}
@@ -186,6 +189,9 @@ export class Wordpress implements INodeType {
 					const body: IPost = {
 						id: parseInt(postId, 10),
 					};
+					if (updateFields.authorId) {
+						body.author = updateFields.authorId as number;
+					}
 					if (updateFields.title) {
 						body.title = updateFields.title as string;
 					}
@@ -231,7 +237,7 @@ export class Wordpress implements INodeType {
 					if (options.context) {
 						qs.context = options.context as string;
 					}
-					responseData = await wordpressApiRequest.call(this,'GET', `/posts/${postId}`, {}, qs);
+					responseData = await wordpressApiRequest.call(this, 'GET', `/posts/${postId}`, {}, qs);
 				}
 				//https://developer.wordpress.org/rest-api/reference/posts/#list-posts
 				if (operation === 'getAll') {
@@ -365,7 +371,7 @@ export class Wordpress implements INodeType {
 					if (options.context) {
 						qs.context = options.context as string;
 					}
-					responseData = await wordpressApiRequest.call(this,'GET', `/users/${userId}`, {}, qs);
+					responseData = await wordpressApiRequest.call(this, 'GET', `/users/${userId}`, {}, qs);
 				}
 				//https://developer.wordpress.org/rest-api/reference/users/#list-users
 				if (operation === 'getAll') {
diff --git a/packages/nodes-base/nodes/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile.node.ts
index 2bcb8f8e9..eb56a006f 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile.node.ts
@@ -4,9 +4,9 @@ import {
 } from 'n8n-core';
 import {
 	IDataObject,
-	INodeTypeDescription,
 	INodeExecutionData,
 	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -49,7 +49,7 @@ export class WriteBinaryFile implements INodeType {
 				required: true,
 				description: 'Name of the binary property which contains<br />the data for the file to be written.',
 			},
-		]
+		],
 	};
 
 
diff --git a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
new file mode 100644
index 000000000..712a0aa63
--- /dev/null
+++ b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
@@ -0,0 +1,45 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function wufooApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+	const credentials = this.getCredentials('wufooApi');
+	if (credentials === undefined) {
+		throw new Error('No credentials got returned!');
+	}
+
+	let options: OptionsWithUri = {
+		auth: {
+			username: credentials!.apiKey as string,
+			password: '',
+		},
+		method,
+		form: body,
+		body,
+		qs,
+		uri: `https://${credentials!.subdomain}.wufoo.com/api/v3/${resource}`,
+		json: true,
+	};
+
+	options = Object.assign({}, options, option);
+	if (Object.keys(options.body).length === 0 || method === 'PUT') {
+		delete options.body;
+	}
+
+	try {
+		return await this.helpers.request!(options);
+	} catch (error) {
+		throw new Error(error.message);
+	}
+}
diff --git a/packages/nodes-base/nodes/Wufoo/Interface.ts b/packages/nodes-base/nodes/Wufoo/Interface.ts
new file mode 100644
index 000000000..88a76965b
--- /dev/null
+++ b/packages/nodes-base/nodes/Wufoo/Interface.ts
@@ -0,0 +1,27 @@
+export interface IFormQuery {
+	includeTodayCount?: boolean;
+}
+
+export interface IWebhook {
+	url: string;
+	handshakeKey?: string;
+	metadata?: boolean;
+}
+
+interface ISubField {
+	DefaultVal: string;
+	ID: string;
+	Label: string;
+}
+
+export interface IField {
+	Title: string;
+	Instructions: string;
+	IsRequired: number;
+	ClassNames: string;
+	DefaultVal: string;
+	Page: number;
+	Type: string;
+	ID: string;
+	SubFields: [ISubField];
+}
diff --git a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
new file mode 100644
index 000000000..41fb06b92
--- /dev/null
+++ b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
@@ -0,0 +1,248 @@
+import {
+	IHookFunctions,
+	IWebhookFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+
+import {
+	wufooApiRequest,
+} from './GenericFunctions';
+
+import {
+	IField,
+	IFormQuery,
+	IWebhook,
+} from './Interface';
+
+import {
+	randomBytes,
+} from 'crypto';
+
+export class WufooTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Wufoo Trigger',
+		name: 'wufooTrigger',
+		icon: 'file:wufoo.png',
+		group: ['trigger'],
+		version: 1,
+		description: 'Handle Wufoo events via webhooks',
+		defaults: {
+			name: 'Wufoo Trigger',
+			color: '#c35948',
+		},
+		inputs: [],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'wufooApi',
+				required: true,
+			},
+		],
+		webhooks: [
+			{
+				name: 'default',
+				httpMethod: 'POST',
+				responseMode: 'onReceived',
+				path: 'webhook',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Forms',
+				name: 'form',
+				type: 'options',
+				required: true,
+				default: '',
+				typeOptions: {
+					loadOptionsMethod: 'getForms',
+				},
+				description: 'The form upon which will trigger this node when a new entry is made.',
+			},
+			{
+				displayName: 'Only Answers',
+				name: 'onlyAnswers',
+				type: 'boolean',
+				default: true,
+				description: 'Returns only the answers of the form and not any of the other data.',
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getForms(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const body: IFormQuery = { includeTodayCount: true };
+				// https://wufoo.github.io/docs/#all-forms
+				const formObject = await wufooApiRequest.call(this, 'GET', 'forms.json', body);
+				for (const form of formObject.Forms) {
+					const name = form.Name;
+					const value = form.Hash;
+					returnData.push({
+						name,
+						value,
+					});
+				}
+				// Entries submitted on the same day are present in separate property in data object
+				if (formObject.EntryCountToday) {
+					for (const form of formObject.EntryCountToday) {
+						const name = form.Name;
+						const value = form.Hash;
+						returnData.push({
+							name,
+							value,
+						});
+					}
+				}
+				return returnData;
+			},
+		},
+	};
+
+	// @ts-ignore
+	webhookMethods = {
+		default: {
+			// No API endpoint to allow checking of existing webhooks.
+			// Creating new webhook will not overwrite existing one if parameters are the same.
+			// Otherwise an update occurs.
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				return false;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				const formHash = this.getNodeParameter('form') as IDataObject;
+				const endpoint = `forms/${formHash}/webhooks.json`;
+
+				// Handshake key for webhook endpoint protection
+				webhookData.handshakeKey = randomBytes(20).toString('hex') as string;
+				const body: IWebhook = {
+					url: webhookUrl as string,
+					handshakeKey: webhookData.handshakeKey as string,
+					metadata: true,
+				};
+
+				const result = await wufooApiRequest.call(this, 'PUT', endpoint, body);
+				webhookData.webhookId = result.WebHookPutResult.Hash;
+
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const formHash = this.getNodeParameter('form') as IDataObject;
+				const endpoint = `forms/${formHash}/webhooks/${webhookData.webhookId}.json`;
+				try {
+					await wufooApiRequest.call(this, 'DELETE', endpoint);
+				} catch (error) {
+					return false;
+				}
+				delete webhookData.webhookId;
+				delete webhookData.handshakeKey;
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const req = this.getRequestObject();
+		const body = this.getBodyData();
+		const webhookData = this.getWorkflowStaticData('node');
+		const onlyAnswers = this.getNodeParameter('onlyAnswers') as boolean;
+		const entries: IDataObject = {};
+		let returnObject: IDataObject = {};
+
+		if (req.body.HandshakeKey !== webhookData.handshakeKey) {
+			return {};
+		}
+
+		const fieldsObject = JSON.parse(req.body.FieldStructure);
+
+		fieldsObject.Fields.map((field: IField) => {
+
+			// TODO
+			// Handle docusign field
+
+			if (field.Type === 'file') {
+
+				entries[field.Title] = req.body[`${field.ID}-url`];
+
+			} else if (field.Type === 'address') {
+				const address: IDataObject = {};
+
+				for (const subfield of field.SubFields) {
+					address[subfield.Label] = body[subfield.ID];
+				}
+
+				entries[field.Title] = address;
+
+			} else if (field.Type === 'checkbox') {
+
+				const responses: string[] = [];
+
+				for (const subfield of field.SubFields) {
+					if (body[subfield.ID] !== '') {
+						responses.push(body[subfield.ID] as string);
+					}
+				}
+
+				entries[field.Title] = responses;
+
+			} else if (field.Type === 'likert') {
+
+				const likert: IDataObject = {};
+
+				for (const subfield of field.SubFields) {
+					likert[subfield.Label] = body[subfield.ID];
+				}
+
+				entries[field.Title] = likert;
+
+			} else if (field.Type === 'shortname') {
+
+				const shortname: IDataObject = {};
+
+				for (const subfield of field.SubFields) {
+					shortname[subfield.Label] = body[subfield.ID];
+				}
+
+				entries[field.Title] = shortname;
+
+			} else {
+				entries[field.Title] = req.body[field.ID];
+			}
+		});
+
+		if (onlyAnswers === false) {
+			returnObject = {
+				createdBy: req.body.CreatedBy as string,
+				entryId: req.body.EntryId as number,
+				dateCreated: req.body.DateCreated as Date,
+				formId: req.body.FormId as string,
+				formStructure: JSON.parse(req.body.FormStructure),
+				fieldStructure: JSON.parse(req.body.FieldStructure),
+				entries,
+			};
+
+			return {
+				workflowData: [
+					this.helpers.returnJsonArray([returnObject as unknown as IDataObject]),
+				],
+			};
+
+		} else {
+			return {
+				workflowData: [
+					this.helpers.returnJsonArray(entries as unknown as IDataObject),
+				],
+			};
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Wufoo/wufoo.png b/packages/nodes-base/nodes/Wufoo/wufoo.png
new file mode 100644
index 000000000..75a2eba2f
Binary files /dev/null and b/packages/nodes-base/nodes/Wufoo/wufoo.png differ
diff --git a/packages/nodes-base/nodes/Xero/GenericFunctions.ts b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
index 840579bf2..2678aa8f0 100644
--- a/packages/nodes-base/nodes/Xero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
@@ -21,7 +21,7 @@ export async function xeroApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 		body,
 		qs,
 		uri: uri || `https://api.xero.com/api.xro/2.0${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		if (body.organizationId) {
diff --git a/packages/nodes-base/nodes/Xero/InvoiceDescription.ts b/packages/nodes-base/nodes/Xero/InvoiceDescription.ts
index 6591adc24..ef0ae6159 100644
--- a/packages/nodes-base/nodes/Xero/InvoiceDescription.ts
+++ b/packages/nodes-base/nodes/Xero/InvoiceDescription.ts
@@ -74,12 +74,12 @@ export const invoiceFields = [
 			{
 				name: 'Bill',
 				value: 'ACCPAY',
-				description: 'Accounts Payable or supplier invoice'
+				description: 'Accounts Payable or supplier invoice',
 			},
 			{
 				name: 'Sales Invoice',
 				value: 'ACCREC',
-				description: ' Accounts Receivable or customer invoice'
+				description: ' Accounts Receivable or customer invoice',
 			},
 		],
 		default: '',
@@ -130,7 +130,7 @@ export const invoiceFields = [
 				],
 				operation: [
 					'create',
-				]
+				],
 			},
 		},
 		description: 'Line item data',
diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
index 31a1df36e..3b5f20547 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.ts
+++ b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -4,11 +4,11 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -56,7 +56,7 @@ export class Xero implements INodeType {
 			{
 				name: 'xeroOAuth2Api',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
diff --git a/packages/nodes-base/nodes/Xero/xero.png b/packages/nodes-base/nodes/Xero/xero.png
index a9d46c10a..61b8f10c8 100644
Binary files a/packages/nodes-base/nodes/Xero/xero.png and b/packages/nodes-base/nodes/Xero/xero.png differ
diff --git a/packages/nodes-base/nodes/Xml.node.ts b/packages/nodes-base/nodes/Xml.node.ts
index f684228d5..914ed9da3 100644
--- a/packages/nodes-base/nodes/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml.node.ts
@@ -1,10 +1,10 @@
 import { Builder, Parser } from 'xml2js';
 import { IExecuteFunctions } from 'n8n-core';
 import {
+	IDataObject,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IDataObject,
 } from 'n8n-workflow';
 
 
@@ -220,7 +220,7 @@ export class Xml implements INodeType {
 					},
 				],
 			},
-		]
+		],
 	};
 
 
@@ -256,8 +256,8 @@ export class Xml implements INodeType {
 
 				items[itemIndex] = {
 					json: {
-						[dataPropertyName]: builder.buildObject(items[itemIndex].json)
-					}
+						[dataPropertyName]: builder.buildObject(items[itemIndex].json),
+					},
 				};
 			} else {
 				throw new Error(`The operation "${mode}" is not known!`);
diff --git a/packages/nodes-base/nodes/Zendesk/ConditionDescription.ts b/packages/nodes-base/nodes/Zendesk/ConditionDescription.ts
index 1fb12cff8..7b11fac70 100644
--- a/packages/nodes-base/nodes/Zendesk/ConditionDescription.ts
+++ b/packages/nodes-base/nodes/Zendesk/ConditionDescription.ts
@@ -22,9 +22,9 @@ export const conditionFields = [
 		displayOptions: {
 			show: {
 				'resource': [
-					'ticket'
-				]
-			}
+					'ticket',
+				],
+			},
 		},
 		options: [
 			{
@@ -100,8 +100,8 @@ export const conditionFields = [
 			hide: {
 				field: [
 					'assignee',
-				]
-			}
+				],
+			},
 		},
 		default: 'is',
 	},
@@ -147,8 +147,8 @@ export const conditionFields = [
 			show: {
 				field: [
 					'assignee',
-				]
-			}
+				],
+			},
 		},
 		default: 'is',
 	},
@@ -159,7 +159,7 @@ export const conditionFields = [
 		displayOptions: {
 			show: {
 				field: [
-					'status'
+					'status',
 				],
 			},
 			hide: {
@@ -173,7 +173,7 @@ export const conditionFields = [
 					'priority',
 					'type',
 				],
-			}
+			},
 		},
 		options: [
 			{
@@ -206,7 +206,7 @@ export const conditionFields = [
 		displayOptions: {
 			show: {
 				field: [
-					'type'
+					'type',
 				],
 			},
 			hide: {
@@ -220,7 +220,7 @@ export const conditionFields = [
 					'priority',
 					'status',
 				],
-			}
+			},
 		},
 		options: [
 			{
@@ -249,7 +249,7 @@ export const conditionFields = [
 		displayOptions: {
 			show: {
 				field: [
-					'priority'
+					'priority',
 				],
 			},
 			hide: {
@@ -263,7 +263,7 @@ export const conditionFields = [
 					'type',
 					'status',
 				],
-			}
+			},
 		},
 		options: [
 			{
@@ -295,7 +295,7 @@ export const conditionFields = [
 		displayOptions: {
 			show: {
 				field: [
-					'group'
+					'group',
 				],
 			},
 			hide: {
@@ -319,7 +319,7 @@ export const conditionFields = [
 		displayOptions: {
 			show: {
 				field: [
-					'assignee'
+					'assignee',
 				],
 			},
 			hide: {
diff --git a/packages/nodes-base/nodes/Zendesk/TicketDescription.ts b/packages/nodes-base/nodes/Zendesk/TicketDescription.ts
index 3bb3d4141..341a430a0 100644
--- a/packages/nodes-base/nodes/Zendesk/TicketDescription.ts
+++ b/packages/nodes-base/nodes/Zendesk/TicketDescription.ts
@@ -295,7 +295,7 @@ export const ticketFields = [
 		displayOptions: {
 			show: {
 				resource: [
-					'ticket'
+					'ticket',
 				],
 				operation: [
 					'update',
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
index 632660a34..b74812daa 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -4,11 +4,11 @@ import {
 
 import {
 	IDataObject,
-	INodeTypeDescription,
-	INodeExecutionData,
-	INodeType,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
@@ -33,8 +33,8 @@ import {
 } from './UserDescription';
 
 import {
-	ITicket,
 	IComment,
+	ITicket,
  } from './TicketInterface';
 
 export class Zendesk implements INodeType {
@@ -221,7 +221,7 @@ export class Zendesk implements INodeType {
 				}
 				return returnData;
 			},
-		}
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index c8d1a8b37..44cc34d9a 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -8,12 +8,12 @@ import {
 } from 'n8n-core';
 
 import {
-	INodeTypeDescription,
-	INodeType,
-	IWebhookResponseData,
 	IDataObject,
-	INodePropertyOptions,
 	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
 } from 'n8n-workflow';
 
 import {
@@ -97,7 +97,7 @@ export class ZendeskTrigger implements INodeType {
 					{
 						name: 'Support',
 						value: 'support',
-					}
+					},
 				],
 				default: 'support',
 				description: '',
@@ -109,7 +109,7 @@ export class ZendeskTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						service: [
-							'support'
+							'support',
 						],
 					},
 				},
@@ -150,7 +150,7 @@ export class ZendeskTrigger implements INodeType {
 							{
 								name: 'Via',
 								value: 'ticket.via',
-								description: `Ticket's source`
+								description: `Ticket's source`,
 							},
 							{
 								name: 'Status',
@@ -363,9 +363,9 @@ export class ZendeskTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						service: [
-							'support'
+							'support',
 						],
-					}
+					},
 				},
 				description: 'The condition to set.',
 				default: {},
@@ -429,7 +429,7 @@ export class ZendeskTrigger implements INodeType {
 				});
 				return returnData;
 			},
-		}
+		},
 	};
 	// @ts-ignore
 	webhookMethods = {
@@ -620,7 +620,7 @@ export class ZendeskTrigger implements INodeType {
 		const req = this.getRequestObject();
 		return {
 			workflowData: [
-				this.helpers.returnJsonArray(req.body)
+				this.helpers.returnJsonArray(req.body),
 			],
 		};
 	}
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index 13ebecd4c..f70b13bb9 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -21,7 +21,7 @@ export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 		},
 		qs,
 		uri: uri || `https://www.zohoapis.com/crm/v2${resource}`,
-		json: true
+		json: true,
 	};
 	try {
 		//@ts-ignore
diff --git a/packages/nodes-base/nodes/Zoho/LeadDescription.ts b/packages/nodes-base/nodes/Zoho/LeadDescription.ts
index 3b7777bef..d232098ca 100644
--- a/packages/nodes-base/nodes/Zoho/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Zoho/LeadDescription.ts
@@ -163,7 +163,7 @@ export const leadFields = [
 				name: 'leadStatus',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getLeadStatuses'
+					loadOptionsMethod: 'getLeadStatuses',
 				},
 				default: '',
 			},
@@ -230,7 +230,7 @@ export const leadFields = [
 				type: 'string',
 				default: '',
 			},
-		]
+		],
 	},
 	{
 		displayName: 'Address',
@@ -288,7 +288,7 @@ export const leadFields = [
 						default: '',
 					},
 				],
-			}
+			},
 		],
 	},
 /* -------------------------------------------------------------------------- */
@@ -409,7 +409,7 @@ export const leadFields = [
 					name: 'leadStatus',
 					type: 'options',
 					typeOptions: {
-						loadOptionsMethod: 'getLeadStatuses'
+						loadOptionsMethod: 'getLeadStatuses',
 					},
 					default: '',
 				},
@@ -476,7 +476,7 @@ export const leadFields = [
 					type: 'string',
 					default: '',
 				},
-			]
+			],
 	},
 	{
 		displayName: 'Address',
@@ -534,7 +534,7 @@ export const leadFields = [
 						default: '',
 					},
 				],
-			}
+			},
 		],
 	},
 /* -------------------------------------------------------------------------- */
@@ -681,7 +681,7 @@ export const leadFields = [
 				default: '',
 				description: 'To get the list of records based on the territory	',
 			},
-		]
+		],
 	},
 /* -------------------------------------------------------------------------- */
 /*                                 lead:delete                                */
diff --git a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
index 3d036f5f3..3d28b5790 100644
--- a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
@@ -19,12 +19,12 @@ export async function zoomApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 	let options: OptionsWithUri = {
 		method,
 		headers: headers || {
-			'Content-Type': 'application/json'
+			'Content-Type': 'application/json',
 		},
 		body,
 		qs: query,
 		uri: `https://api.zoom.us/v2${resource}`,
-		json: true
+		json: true,
 	};
 	options = Object.assign({}, options, option);
 	if (Object.keys(body).length === 0) {
@@ -71,7 +71,7 @@ export async function zoomApiRequestAllItems(
 	method: string,
 	endpoint: string,
 	body: IDataObject = {},
-	query: IDataObject = {}
+	query: IDataObject = {},
 ): Promise<any> {  // tslint:disable-line:no-any
 	const returnData: IDataObject[] = [];
 	let responseData;
@@ -82,7 +82,7 @@ export async function zoomApiRequestAllItems(
 			method,
 			endpoint,
 			body,
-			query
+			query,
 		);
 		query.page_number++;
 		returnData.push.apply(returnData, responseData[propertyName]);
diff --git a/packages/nodes-base/nodes/Zoom/MeetingDescription.ts b/packages/nodes-base/nodes/Zoom/MeetingDescription.ts
index a262f7eb5..294c47efe 100644
--- a/packages/nodes-base/nodes/Zoom/MeetingDescription.ts
+++ b/packages/nodes-base/nodes/Zoom/MeetingDescription.ts
@@ -422,7 +422,7 @@ export const meetingFields = [
 					{
 						name: 'Scheduled',
 						value: 'scheduled',
-						description: 'This includes all valid past meetings, live meetings and upcoming scheduled meetings'
+						description: 'This includes all valid past meetings, live meetings and upcoming scheduled meetings',
 					},
 					{
 						name: 'Live',
diff --git a/packages/nodes-base/nodes/Zoom/MeetingRegistrantDescription.ts b/packages/nodes-base/nodes/Zoom/MeetingRegistrantDescription.ts
index 5438f18fa..7419e04ed 100644
--- a/packages/nodes-base/nodes/Zoom/MeetingRegistrantDescription.ts
+++ b/packages/nodes-base/nodes/Zoom/MeetingRegistrantDescription.ts
@@ -34,7 +34,7 @@ export const meetingRegistrantOperations = [
 		],
 		default: 'create',
 		description: 'The operation to perform.',
-	}
+	},
 ] as INodeProperties[];
 
 export const meetingRegistrantFields = [
@@ -357,7 +357,7 @@ export const meetingRegistrantFields = [
 				description: `Registrant Status.`,
 			},
 
-		]
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 meetingRegistrant:update                   */
@@ -438,6 +438,6 @@ export const meetingRegistrantFields = [
 			},
 
 		],
-	}
+	},
 
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoom/WebinarDescription.ts b/packages/nodes-base/nodes/Zoom/WebinarDescription.ts
index 62d229727..648fe43c2 100644
--- a/packages/nodes-base/nodes/Zoom/WebinarDescription.ts
+++ b/packages/nodes-base/nodes/Zoom/WebinarDescription.ts
@@ -39,11 +39,11 @@ export const webinarOperations = [
 				name: 'Update',
 				value: 'update',
 				description: 'Update a webinar',
-			}
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
-	}
+	},
 ] as INodeProperties[];
 
 export const webinarFields = [
@@ -83,7 +83,7 @@ export const webinarFields = [
 				resource: [
 					'webinar',
 				],
-			}
+			},
 		},
 		options: [
 			{
@@ -657,7 +657,7 @@ export const webinarFields = [
 					},
 				],
 				default: 5,
-				description: 'Webinar type.'
+				description: 'Webinar type.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index 10c773f4c..d0661cc9d 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.ts
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
@@ -17,8 +17,8 @@ import {
 } from './GenericFunctions';
 
 import {
-	meetingOperations,
 	meetingFields,
+	meetingOperations,
 } from './MeetingDescription';
 
 // import {
@@ -61,7 +61,7 @@ export class Zoom implements INodeType {
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		defaults: {
 			name: 'Zoom',
-			color: '#0B6CF9'
+			color: '#0B6CF9',
 		},
 		icon: 'file:zoom.png',
 		inputs: ['main'],
@@ -120,7 +120,7 @@ export class Zoom implements INodeType {
 				options: [
 					{
 						name: 'Meeting',
-						value: 'meeting'
+						value: 'meeting',
 					},
 					// {
 					// 	name: 'Meeting Registrant',
@@ -132,7 +132,7 @@ export class Zoom implements INodeType {
 					// }
 				],
 				default: 'meeting',
-				description: 'The resource to operate on.'
+				description: 'The resource to operate on.',
 			},
 			//MEETINGS
 			...meetingOperations,
@@ -145,14 +145,14 @@ export class Zoom implements INodeType {
 			// 	//WEBINARS
 			// 	...webinarOperations,
 			// 	...webinarFields,
-		]
+		],
 
 	};
 	methods = {
 		loadOptions: {
 			// Get all the timezones to display them to user so that he can select them easily
 			async getTimezones(
-				this: ILoadOptionsFunctions
+				this: ILoadOptionsFunctions,
 			): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				for (const timezone of moment.tz.names()) {
@@ -160,12 +160,12 @@ export class Zoom implements INodeType {
 					const timezoneId = timezone;
 					returnData.push({
 						name: timezoneName,
-						value: timezoneId
+						value: timezoneId,
 					});
 				}
 				return returnData;
-			}
-		}
+			},
+		},
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -186,7 +186,7 @@ export class Zoom implements INodeType {
 					const meetingId = this.getNodeParameter('meetingId', i) as string;
 					const additionalFields = this.getNodeParameter(
 						'additionalFields',
-						i
+						i,
 					) as IDataObject;
 
 					if (additionalFields.showPreviousOccurrences) {
@@ -202,7 +202,7 @@ export class Zoom implements INodeType {
 						'GET',
 						`/meetings/${meetingId}`,
 						{},
-						qs
+						qs,
 					);
 				}
 				if (operation === 'getAll') {
@@ -211,7 +211,7 @@ export class Zoom implements INodeType {
 
 					const filters = this.getNodeParameter(
 						'filters',
-						i
+						i,
 					) as IDataObject;
 					if (filters.type) {
 						qs.type = filters.type as string;
@@ -231,7 +231,7 @@ export class Zoom implements INodeType {
 					const meetingId = this.getNodeParameter('meetingId', i) as string;
 					const additionalFields = this.getNodeParameter(
 						'additionalFields',
-						i
+						i,
 					) as IDataObject;
 					if (additionalFields.scheduleForReminder) {
 						qs.schedule_for_reminder = additionalFields.scheduleForReminder as boolean;
@@ -246,7 +246,7 @@ export class Zoom implements INodeType {
 						'DELETE',
 						`/meetings/${meetingId}`,
 						{},
-						qs
+						qs,
 					);
 					responseData = { success: true };
 				}
@@ -347,7 +347,7 @@ export class Zoom implements INodeType {
 						'POST',
 						`/users/me/meetings`,
 						body,
-						qs
+						qs,
 					);
 				}
 				if (operation === 'update') {
@@ -355,7 +355,7 @@ export class Zoom implements INodeType {
 					const meetingId = this.getNodeParameter('meetingId', i) as string;
 					const updateFields = this.getNodeParameter(
 						'updateFields',
-						i
+						i,
 					) as IDataObject;
 
 					const body: IDataObject = {};
@@ -448,7 +448,7 @@ export class Zoom implements INodeType {
 						'PATCH',
 						`/meetings/${meetingId}`,
 						body,
-						qs
+						qs,
 					);
 
 					responseData = { success: true };
diff --git a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
index 26a57a415..cf588440e 100644
--- a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
@@ -33,7 +33,7 @@ export async function zulipApiRequest(this: IExecuteFunctions | IWebhookFunction
 		form: body,
 		qs: query,
 		uri: uri || `${endpoint}${resource}`,
-		json: true
+		json: true,
 	};
 	if (!Object.keys(body).length) {
 		delete options.form;
diff --git a/packages/nodes-base/nodes/Zulip/MessageDescription.ts b/packages/nodes-base/nodes/Zulip/MessageDescription.ts
index d22df2107..883928a7c 100644
--- a/packages/nodes-base/nodes/Zulip/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Zulip/MessageDescription.ts
@@ -91,7 +91,7 @@ export const messageFields = [
 				],
 				operation: [
 					'sendPrivate',
-				]
+				],
 			},
 		},
 		description: 'The content of the message.',
@@ -158,7 +158,7 @@ export const messageFields = [
 				],
 				operation: [
 					'sendStream',
-				]
+				],
 			},
 		},
 		description: 'The content of the message.',
@@ -179,7 +179,7 @@ export const messageFields = [
 				],
 				operation: [
 					'update',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the message.',
@@ -239,7 +239,7 @@ export const messageFields = [
 				default: '',
 				description: 'The topic of the message. Only required for stream messages',
 			},
-		]
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 message:get                                */
@@ -257,7 +257,7 @@ export const messageFields = [
 				],
 				operation: [
 					'get',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the message.',
@@ -278,7 +278,7 @@ export const messageFields = [
 				],
 				operation: [
 					'delete',
-				]
+				],
 			},
 		},
 		description: 'Unique identifier for the message.',
@@ -299,7 +299,7 @@ export const messageFields = [
 				],
 				operation: [
 					'updateFile',
-				]
+				],
 			},
 		},
 		description: 'Name of the binary property to which to<br />write the data of the read file.',
diff --git a/packages/nodes-base/nodes/Zulip/StreamDescription.ts b/packages/nodes-base/nodes/Zulip/StreamDescription.ts
index 27c9c1044..a0d4e74ff 100644
--- a/packages/nodes-base/nodes/Zulip/StreamDescription.ts
+++ b/packages/nodes-base/nodes/Zulip/StreamDescription.ts
@@ -131,7 +131,7 @@ export const streamFields = [
 						required: true,
 						default: '',
 						description: 'Description of Subscription.',
-					}
+					},
 				],
 			},
 		],
@@ -205,7 +205,7 @@ export const streamFields = [
 								required: true,
 								default: '',
 								description: 'Principal email address.',
-							}
+							},
 						],
 					},
 				],
@@ -220,21 +220,21 @@ export const streamFields = [
 					{
 						name: '1',
 						value: 1,
-						description: 'Any user can post.'
+						description: 'Any user can post.',
 					},
 					{
 						name: '2',
 						value: 2,
-						description: 'Only administrators can post.'
+						description: 'Only administrators can post.',
 					},
 					{
 						name: '3',
 						value: 3,
-						description: 'Only new members can post.'
+						description: 'Only new members can post.',
 					},
 				],
-			}
-		]
+			},
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -292,7 +292,7 @@ export const streamFields = [
 				default: true,
 				description: 'Include all streams that the user is subscribed to.',
 			},
-		]
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -321,8 +321,8 @@ export const streamFields = [
 				type: 'boolean',
 				default: true,
 				description: 'Whether each returned stream object should include a subscribers field containing a list of the user IDs of its subscribers.',
-			}
-		]
+			},
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -421,7 +421,7 @@ export const streamFields = [
 				type: 'string',
 				default: '',
 				description: 'The new description for the stream.',
-				placeholder: 'Place of discussion'
+				placeholder: 'Place of discussion',
 			},
 			{
 				displayName: 'Is Private',
@@ -443,7 +443,7 @@ export const streamFields = [
 				type: 'string',
 				default: '',
 				description: 'The new name for the stream.',
-				placeholder: 'Italy'
+				placeholder: 'Italy',
 			},
 			{
 				displayName: 'Stream Post Policy',
@@ -455,21 +455,21 @@ export const streamFields = [
 					{
 						name: '1',
 						value: 1,
-						description: 'Any user can post.'
+						description: 'Any user can post.',
 					},
 					{
 						name: '2',
 						value: 2,
-						description: 'Only administrators can post.'
+						description: 'Only administrators can post.',
 					},
 					{
 						name: '3',
 						value: 3,
-						description: 'Only new members can post.'
+						description: 'Only new members can post.',
 					},
 				],
 			},
-		]
+		],
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                stream:delete                               */
diff --git a/packages/nodes-base/nodes/Zulip/UserDescription.ts b/packages/nodes-base/nodes/Zulip/UserDescription.ts
index 8ca33bad1..82bda3755 100644
--- a/packages/nodes-base/nodes/Zulip/UserDescription.ts
+++ b/packages/nodes-base/nodes/Zulip/UserDescription.ts
@@ -154,7 +154,7 @@ export const userFields = [
 					'user',
 				],
 				operation: [
-					'get', 'getAll'
+					'get', 'getAll',
 				],
 			},
 		},
@@ -173,7 +173,7 @@ export const userFields = [
 				default: false,
 				description: 'Whether the client wants custom profile field data to be included in the response.',
 			},
-		]
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -209,7 +209,7 @@ export const userFields = [
 					'user',
 				],
 				operation: [
-					'update'
+					'update',
 				],
 			},
 		},
@@ -263,12 +263,12 @@ export const userFields = [
 								type: 'string',
 								default: '',
 								description: 'Value of custom profile data.',
-							}
+							},
 						],
 					},
 				],
 			},
-		]
+		],
 	},
 
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index 3c6261a37..4c6a5d400 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -5,10 +5,10 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
-	INodeTypeDescription,
 	INodeExecutionData,
-	INodeType,
 	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
 } from 'n8n-workflow';
 import {
 	zulipApiRequest,
@@ -21,9 +21,18 @@ import {
 	IMessage,
 } from './MessageInterface';
 import { snakeCase } from 'change-case';
-import { streamFields, streamOperations } from './StreamDescription';
-import { userOperations, userFields } from './UserDescription';
-import { IStream, IPrincipal } from './StreamInterface';
+import {
+	streamFields,
+	streamOperations,
+} from './StreamDescription';
+import {
+	userFields,
+	userOperations,
+} from './UserDescription';
+import {
+	IPrincipal,
+	IStream,
+} from './StreamInterface';
 import { validateJSON } from './GenericFunctions';
 import { IUser } from './UserInterface';
 
@@ -46,7 +55,7 @@ export class Zulip implements INodeType {
 			{
 				name: 'zulipApi',
 				required: true,
-			}
+			},
 		],
 		properties: [
 			{
@@ -80,7 +89,7 @@ export class Zulip implements INodeType {
 
 			// USER
 			...userOperations,
-			...userFields
+			...userFields,
 
 		],
 	};
@@ -216,8 +225,8 @@ export class Zulip implements INodeType {
 								filename: items[i].binary[binaryProperty].fileName,
 								//@ts-ignore
 								contentType: items[i].binary[binaryProperty].mimeType,
-							}
-						}
+							},
+						},
 					};
 					responseData = await zulipApiRequest.call(this, 'POST', '/user_uploads', {}, {}, undefined, { formData });
 					responseData.uri = `${credentials!.url}${responseData.uri}`;
diff --git a/packages/nodes-base/nodes/Zulip/zulip.png b/packages/nodes-base/nodes/Zulip/zulip.png
index e40d60988..77b3d0411 100644
Binary files a/packages/nodes-base/nodes/Zulip/zulip.png and b/packages/nodes-base/nodes/Zulip/zulip.png differ
diff --git a/packages/nodes-base/nodes/utils/allCurrencies.ts b/packages/nodes-base/nodes/utils/allCurrencies.ts
index 2924edc32..0486ff32c 100644
--- a/packages/nodes-base/nodes/utils/allCurrencies.ts
+++ b/packages/nodes-base/nodes/utils/allCurrencies.ts
@@ -1,174 +1,174 @@
-const allCurrencies = [		
-    { name: 'Euro', value: 'eur' },
-    { name: 'United States Dollar', value: 'usd' },
-    { name: 'British Pound Sterling', value: 'gbp' },
-    { name: 'Swiss Franc', value: 'chf' },
-    { name: 'Renminbi', value: 'cny' },
-    { name: '--------', value: '' },
-    { name: 'United Arab Emirates Dirham', value: 'aed' },
-    { name: 'Afghan Afghani', value: 'afn' },
-    { name: 'Albanian Lek', value: 'all' },
-    { name: 'Armenian Dram', value: 'amd' },
-    { name: 'Netherlands Antillean Guilder', value: 'ang' },
-    { name: 'Angolan Kwanza', value: 'aoa' },
-    { name: 'Argentine Peso', value: 'ars' },
-    { name: 'Australian Dollar', value: 'aud' },
-    { name: 'Aruban Florin', value: 'awg' },
-    { name: 'Azerbaijani Manat', value: 'azn' },
-    { name: 'Bosnia-Herzegovina Convertible Mark', value: 'bam' },
-    { name: 'Barbadian Dollar', value: 'bbd' },
-    { name: 'Bangladeshi Taka', value: 'bdt' },
-    { name: 'Bulgarian Lev', value: 'bgn' },
-    { name: 'Bahraini Dinar', value: 'bhd' },
-    { name: 'Burundian Franc', value: 'bif' },
-    { name: 'Bermudan Dollar', value: 'bmd' },
-    { name: 'Brunei Dollar', value: 'bnd' },
-    { name: 'Bolivian Boliviano', value: 'bob' },
-    { name: 'Brazilian Real', value: 'brl' },
-    { name: 'Bahamian Dollar', value: 'bsd' },
-    { name: 'Bitcoin', value: 'btc' },
-    { name: 'Bhutanese Ngultrum', value: 'btn' },
-    { name: 'Botswanan Pula', value: 'bwp' },
-    { name: 'Belarusian Ruble', value: 'byn' },
-    { name: 'Belize Dollar', value: 'bzd' },
-    { name: 'Canadian Dollar', value: 'cad' },
-    { name: 'Congolese Franc', value: 'cdf' },
-    { name: 'Chilean Unit of Account (UF)', value: 'clf' },
-    { name: 'Chilean Peso', value: 'clp' },
-    { name: 'Chinese Yuan (Offshore)', value: 'cnh' },
-    { name: 'Colombian Peso', value: 'cop' },
-    { name: 'Costa Rican Colón', value: 'crc' },
-    { name: 'Cuban Convertible Peso', value: 'cuc' },
-    { name: 'Cuban Peso', value: 'cup' },
-    { name: 'Cape Verdean Escudo', value: 'cve' },
-    { name: 'Czech Republic Koruna', value: 'czk' },
-    { name: 'Djiboutian Franc', value: 'djf' },
-    { name: 'Danish Krone', value: 'dkk' },
-    { name: 'Dominican Peso', value: 'dop' },
-    { name: 'Algerian Dinar', value: 'dzd' },
-    { name: 'Egyptian Pound', value: 'egp' },
-    { name: 'Eritrean Nakfa', value: 'ern' },
-    { name: 'Ethiopian Birr', value: 'etb' },
-    { name: 'Fijian Dollar', value: 'fjd' },
-    { name: 'Falkland Islands Pound', value: 'fkp' },
-    { name: 'Georgian Lari', value: 'gel' },
-    { name: 'Guernsey Pound', value: 'ggp' },
-    { name: 'Ghanaian Cedi', value: 'ghs' },
-    { name: 'Gibraltar Pound', value: 'gip' },
-    { name: 'Gambian Dalasi', value: 'gmd' },
-    { name: 'Guinean Franc', value: 'gnf' },
-    { name: 'Guatemalan Quetzal', value: 'gtq' },
-    { name: 'Guyanaese Dollar', value: 'gyd' },
-    { name: 'Hong Kong Dollar', value: 'hkd' },
-    { name: 'Honduran Lempira', value: 'hnl' },
-    { name: 'Croatian Kuna', value: 'hrk' },
-    { name: 'Haitian Gourde', value: 'htg' },
-    { name: 'Hungarian Forint', value: 'huf' },
-    { name: 'Indonesian Rupiah', value: 'idr' },
-    { name: 'Israeli New Sheqel', value: 'ils' },
-    { name: 'Manx pound', value: 'imp' },
-    { name: 'Indian Rupee', value: 'inr' },
-    { name: 'Iraqi Dinar', value: 'iqd' },
-    { name: 'Iranian Rial', value: 'irr' },
-    { name: 'Icelandic Króna', value: 'isk' },
-    { name: 'Jersey Pound', value: 'jep' },
-    { name: 'Jamaican Dollar', value: 'jmd' },
-    { name: 'Jordanian Dinar', value: 'jod' },
-    { name: 'Japanese Yen', value: 'jpy' },
-    { name: 'Kenyan Shilling', value: 'kes' },
-    { name: 'Kyrgystani Som', value: 'kgs' },
-    { name: 'Cambodian Riel', value: 'khr' },
-    { name: 'Comorian Franc', value: 'kmf' },
-    { name: 'North Korean Won', value: 'kpw' },
-    { name: 'South Korean Won', value: 'krw' },
-    { name: 'Kuwaiti Dinar', value: 'kwd' },
-    { name: 'Cayman Islands Dollar', value: 'kyd' },
-    { name: 'Kazakhstani Tenge', value: 'kzt' },
-    { name: 'Laotian Kip', value: 'lak' },
-    { name: 'Lebanese Pound', value: 'lbp' },
-    { name: 'Sri Lankan Rupee', value: 'lkr' },
-    { name: 'Liberian Dollar', value: 'lrd' },
-    { name: 'Lesotho Loti', value: 'lsl' },
-    { name: 'Libyan Dinar', value: 'lyd' },
-    { name: 'Moroccan Dirham', value: 'mad' },
-    { name: 'Moldovan Leu', value: 'mdl' },
-    { name: 'Malagasy Ariary', value: 'mga' },
-    { name: 'Macedonian Denar', value: 'mkd' },
-    { name: 'Myanma Kyat', value: 'mmk' },
-    { name: 'Mongolian Tugrik', value: 'mnt' },
-    { name: 'Macanese Pataca', value: 'mop' },
-    { name: 'Mauritanian Ouguiya (pre-2018)', value: 'mro' },
-    { name: 'Mauritanian Ouguiya', value: 'mru' },
-    { name: 'Mauritian Rupee', value: 'mur' },
-    { name: 'Maldivian Rufiyaa', value: 'mvr' },
-    { name: 'Malawian Kwacha', value: 'mwk' },
-    { name: 'Mexican Peso', value: 'mxn' },
-    { name: 'Malaysian Ringgit', value: 'myr' },
-    { name: 'Mozambican Metical', value: 'mzn' },
-    { name: 'Namibian Dollar', value: 'nad' },
-    { name: 'Nigerian Naira', value: 'ngn' },
-    { name: 'Nicaraguan Córdoba', value: 'nio' },
-    { name: 'Norwegian Krone', value: 'nok' },
-    { name: 'Nepalese Rupee', value: 'npr' },
-    { name: 'New Zealand Dollar', value: 'nzd' },
-    { name: 'Omani Rial', value: 'omr' },
-    { name: 'Panamanian Balboa', value: 'pab' },
-    { name: 'Peruvian Nuevo Sol', value: 'pen' },
-    { name: 'Papua New Guinean Kina', value: 'pgk' },
-    { name: 'Philippine Peso', value: 'php' },
-    { name: 'Pakistani Rupee', value: 'pkr' },
-    { name: 'Polish Zloty', value: 'pln' },
-    { name: 'Paraguayan Guarani', value: 'pyg' },
-    { name: 'Qatari Rial', value: 'qar' },
-    { name: 'Romanian Leu', value: 'ron' },
-    { name: 'Serbian Dinar', value: 'rsd' },
-    { name: 'Russian Ruble', value: 'rub' },
-    { name: 'Rwandan Franc', value: 'rwf' },
-    { name: 'Saudi Riyal', value: 'sar' },
-    { name: 'Solomon Islands Dollar', value: 'sbd' },
-    { name: 'Seychellois Rupee', value: 'scr' },
-    { name: 'Sudanese Pound', value: 'sdg' },
-    { name: 'Swedish Krona', value: 'sek' },
-    { name: 'Singapore Dollar', value: 'sgd' },
-    { name: 'Saint Helena Pound', value: 'shp' },
-    { name: 'Sierra Leonean Leone', value: 'sll' },
-    { name: 'Somali Shilling', value: 'sos' },
-    { name: 'Surinamese Dollar', value: 'srd' },
-    { name: 'South Sudanese Pound', value: 'ssp' },
-    { name: 'São Tomé and Príncipe Dobra (pre-2018)', value: 'std' },
-    { name: 'São Tomé and Príncipe Dobra', value: 'stn' },
-    { name: 'Salvadoran Colón', value: 'svc' },
-    { name: 'Syrian Pound', value: 'syp' },
-    { name: 'Swazi Lilangeni', value: 'szl' },
-    { name: 'Thai Baht', value: 'thb' },
-    { name: 'Tajikistani Somoni', value: 'tjs' },
-    { name: 'Turkmenistani Manat', value: 'tmt' },
-    { name: 'Tunisian Dinar', value: 'tnd' },
-    { name: "Tongan Pa'anga", value: 'top' },
-    { name: 'Turkish Lira', value: 'try' },
-    { name: 'Trinidad and Tobago Dollar', value: 'ttd' },
-    { name: 'New Taiwan Dollar', value: 'twd' },
-    { name: 'Tanzanian Shilling', value: 'tzs' },
-    { name: 'Ukrainian Hryvnia', value: 'uah' },
-    { name: 'Ugandan Shilling', value: 'ugx' },
-    { name: 'Uruguayan Peso', value: 'uyu' },
-    { name: 'Uzbekistan Som', value: 'uzs' },
-    { name: 'Venezuelan Bolívar Fuerte', value: 'vef' },
-    { name: 'Vietnamese Dong', value: 'vnd' },
-    { name: 'Vanuatu Vatu', value: 'vuv' },
-    { name: 'Samoan Tala', value: 'wst' },
-    { name: 'CFA Franc BEAC', value: 'xaf' },
-    { name: 'Silver Ounce', value: 'xag' },
-    { name: 'Gold Ounce', value: 'xau' },
-    { name: 'East Caribbean Dollar', value: 'xcd' },
-    { name: 'Special Drawing Rights', value: 'xdr' },
-    { name: 'CFA Franc BCEAO', value: 'xof' },
-    { name: 'Palladium Ounce', value: 'xpd' },
-    { name: 'CFP Franc', value: 'xpf' },
-    { name: 'Platinum Ounce', value: 'xpt' },
-    { name: 'Yemeni Rial', value: 'yer' },
-    { name: 'South African Rand', value: 'zar' },
-    { name: 'Zambian Kwacha', value: 'zmw' },
-    { name: 'Zimbabwean Dollar', value: 'zwl' }
-// tslint:disable-next-line: semicolon
-]
\ No newline at end of file
+const allCurrencies = [
+	{ name: 'Euro', value: 'eur' },
+	{ name: 'United States Dollar', value: 'usd' },
+	{ name: 'British Pound Sterling', value: 'gbp' },
+	{ name: 'Swiss Franc', value: 'chf' },
+	{ name: 'Renminbi', value: 'cny' },
+	{ name: '--------', value: '' },
+	{ name: 'United Arab Emirates Dirham', value: 'aed' },
+	{ name: 'Afghan Afghani', value: 'afn' },
+	{ name: 'Albanian Lek', value: 'all' },
+	{ name: 'Armenian Dram', value: 'amd' },
+	{ name: 'Netherlands Antillean Guilder', value: 'ang' },
+	{ name: 'Angolan Kwanza', value: 'aoa' },
+	{ name: 'Argentine Peso', value: 'ars' },
+	{ name: 'Australian Dollar', value: 'aud' },
+	{ name: 'Aruban Florin', value: 'awg' },
+	{ name: 'Azerbaijani Manat', value: 'azn' },
+	{ name: 'Bosnia-Herzegovina Convertible Mark', value: 'bam' },
+	{ name: 'Barbadian Dollar', value: 'bbd' },
+	{ name: 'Bangladeshi Taka', value: 'bdt' },
+	{ name: 'Bulgarian Lev', value: 'bgn' },
+	{ name: 'Bahraini Dinar', value: 'bhd' },
+	{ name: 'Burundian Franc', value: 'bif' },
+	{ name: 'Bermudan Dollar', value: 'bmd' },
+	{ name: 'Brunei Dollar', value: 'bnd' },
+	{ name: 'Bolivian Boliviano', value: 'bob' },
+	{ name: 'Brazilian Real', value: 'brl' },
+	{ name: 'Bahamian Dollar', value: 'bsd' },
+	{ name: 'Bitcoin', value: 'btc' },
+	{ name: 'Bhutanese Ngultrum', value: 'btn' },
+	{ name: 'Botswanan Pula', value: 'bwp' },
+	{ name: 'Belarusian Ruble', value: 'byn' },
+	{ name: 'Belize Dollar', value: 'bzd' },
+	{ name: 'Canadian Dollar', value: 'cad' },
+	{ name: 'Congolese Franc', value: 'cdf' },
+	{ name: 'Chilean Unit of Account (UF)', value: 'clf' },
+	{ name: 'Chilean Peso', value: 'clp' },
+	{ name: 'Chinese Yuan (Offshore)', value: 'cnh' },
+	{ name: 'Colombian Peso', value: 'cop' },
+	{ name: 'Costa Rican Colón', value: 'crc' },
+	{ name: 'Cuban Convertible Peso', value: 'cuc' },
+	{ name: 'Cuban Peso', value: 'cup' },
+	{ name: 'Cape Verdean Escudo', value: 'cve' },
+	{ name: 'Czech Republic Koruna', value: 'czk' },
+	{ name: 'Djiboutian Franc', value: 'djf' },
+	{ name: 'Danish Krone', value: 'dkk' },
+	{ name: 'Dominican Peso', value: 'dop' },
+	{ name: 'Algerian Dinar', value: 'dzd' },
+	{ name: 'Egyptian Pound', value: 'egp' },
+	{ name: 'Eritrean Nakfa', value: 'ern' },
+	{ name: 'Ethiopian Birr', value: 'etb' },
+	{ name: 'Fijian Dollar', value: 'fjd' },
+	{ name: 'Falkland Islands Pound', value: 'fkp' },
+	{ name: 'Georgian Lari', value: 'gel' },
+	{ name: 'Guernsey Pound', value: 'ggp' },
+	{ name: 'Ghanaian Cedi', value: 'ghs' },
+	{ name: 'Gibraltar Pound', value: 'gip' },
+	{ name: 'Gambian Dalasi', value: 'gmd' },
+	{ name: 'Guinean Franc', value: 'gnf' },
+	{ name: 'Guatemalan Quetzal', value: 'gtq' },
+	{ name: 'Guyanaese Dollar', value: 'gyd' },
+	{ name: 'Hong Kong Dollar', value: 'hkd' },
+	{ name: 'Honduran Lempira', value: 'hnl' },
+	{ name: 'Croatian Kuna', value: 'hrk' },
+	{ name: 'Haitian Gourde', value: 'htg' },
+	{ name: 'Hungarian Forint', value: 'huf' },
+	{ name: 'Indonesian Rupiah', value: 'idr' },
+	{ name: 'Israeli New Sheqel', value: 'ils' },
+	{ name: 'Manx pound', value: 'imp' },
+	{ name: 'Indian Rupee', value: 'inr' },
+	{ name: 'Iraqi Dinar', value: 'iqd' },
+	{ name: 'Iranian Rial', value: 'irr' },
+	{ name: 'Icelandic Króna', value: 'isk' },
+	{ name: 'Jersey Pound', value: 'jep' },
+	{ name: 'Jamaican Dollar', value: 'jmd' },
+	{ name: 'Jordanian Dinar', value: 'jod' },
+	{ name: 'Japanese Yen', value: 'jpy' },
+	{ name: 'Kenyan Shilling', value: 'kes' },
+	{ name: 'Kyrgystani Som', value: 'kgs' },
+	{ name: 'Cambodian Riel', value: 'khr' },
+	{ name: 'Comorian Franc', value: 'kmf' },
+	{ name: 'North Korean Won', value: 'kpw' },
+	{ name: 'South Korean Won', value: 'krw' },
+	{ name: 'Kuwaiti Dinar', value: 'kwd' },
+	{ name: 'Cayman Islands Dollar', value: 'kyd' },
+	{ name: 'Kazakhstani Tenge', value: 'kzt' },
+	{ name: 'Laotian Kip', value: 'lak' },
+	{ name: 'Lebanese Pound', value: 'lbp' },
+	{ name: 'Sri Lankan Rupee', value: 'lkr' },
+	{ name: 'Liberian Dollar', value: 'lrd' },
+	{ name: 'Lesotho Loti', value: 'lsl' },
+	{ name: 'Libyan Dinar', value: 'lyd' },
+	{ name: 'Moroccan Dirham', value: 'mad' },
+	{ name: 'Moldovan Leu', value: 'mdl' },
+	{ name: 'Malagasy Ariary', value: 'mga' },
+	{ name: 'Macedonian Denar', value: 'mkd' },
+	{ name: 'Myanma Kyat', value: 'mmk' },
+	{ name: 'Mongolian Tugrik', value: 'mnt' },
+	{ name: 'Macanese Pataca', value: 'mop' },
+	{ name: 'Mauritanian Ouguiya (pre-2018)', value: 'mro' },
+	{ name: 'Mauritanian Ouguiya', value: 'mru' },
+	{ name: 'Mauritian Rupee', value: 'mur' },
+	{ name: 'Maldivian Rufiyaa', value: 'mvr' },
+	{ name: 'Malawian Kwacha', value: 'mwk' },
+	{ name: 'Mexican Peso', value: 'mxn' },
+	{ name: 'Malaysian Ringgit', value: 'myr' },
+	{ name: 'Mozambican Metical', value: 'mzn' },
+	{ name: 'Namibian Dollar', value: 'nad' },
+	{ name: 'Nigerian Naira', value: 'ngn' },
+	{ name: 'Nicaraguan Córdoba', value: 'nio' },
+	{ name: 'Norwegian Krone', value: 'nok' },
+	{ name: 'Nepalese Rupee', value: 'npr' },
+	{ name: 'New Zealand Dollar', value: 'nzd' },
+	{ name: 'Omani Rial', value: 'omr' },
+	{ name: 'Panamanian Balboa', value: 'pab' },
+	{ name: 'Peruvian Nuevo Sol', value: 'pen' },
+	{ name: 'Papua New Guinean Kina', value: 'pgk' },
+	{ name: 'Philippine Peso', value: 'php' },
+	{ name: 'Pakistani Rupee', value: 'pkr' },
+	{ name: 'Polish Zloty', value: 'pln' },
+	{ name: 'Paraguayan Guarani', value: 'pyg' },
+	{ name: 'Qatari Rial', value: 'qar' },
+	{ name: 'Romanian Leu', value: 'ron' },
+	{ name: 'Serbian Dinar', value: 'rsd' },
+	{ name: 'Russian Ruble', value: 'rub' },
+	{ name: 'Rwandan Franc', value: 'rwf' },
+	{ name: 'Saudi Riyal', value: 'sar' },
+	{ name: 'Solomon Islands Dollar', value: 'sbd' },
+	{ name: 'Seychellois Rupee', value: 'scr' },
+	{ name: 'Sudanese Pound', value: 'sdg' },
+	{ name: 'Swedish Krona', value: 'sek' },
+	{ name: 'Singapore Dollar', value: 'sgd' },
+	{ name: 'Saint Helena Pound', value: 'shp' },
+	{ name: 'Sierra Leonean Leone', value: 'sll' },
+	{ name: 'Somali Shilling', value: 'sos' },
+	{ name: 'Surinamese Dollar', value: 'srd' },
+	{ name: 'South Sudanese Pound', value: 'ssp' },
+	{ name: 'São Tomé and Príncipe Dobra (pre-2018)', value: 'std' },
+	{ name: 'São Tomé and Príncipe Dobra', value: 'stn' },
+	{ name: 'Salvadoran Colón', value: 'svc' },
+	{ name: 'Syrian Pound', value: 'syp' },
+	{ name: 'Swazi Lilangeni', value: 'szl' },
+	{ name: 'Thai Baht', value: 'thb' },
+	{ name: 'Tajikistani Somoni', value: 'tjs' },
+	{ name: 'Turkmenistani Manat', value: 'tmt' },
+	{ name: 'Tunisian Dinar', value: 'tnd' },
+	{ name: "Tongan Pa'anga", value: 'top' },
+	{ name: 'Turkish Lira', value: 'try' },
+	{ name: 'Trinidad and Tobago Dollar', value: 'ttd' },
+	{ name: 'New Taiwan Dollar', value: 'twd' },
+	{ name: 'Tanzanian Shilling', value: 'tzs' },
+	{ name: 'Ukrainian Hryvnia', value: 'uah' },
+	{ name: 'Ugandan Shilling', value: 'ugx' },
+	{ name: 'Uruguayan Peso', value: 'uyu' },
+	{ name: 'Uzbekistan Som', value: 'uzs' },
+	{ name: 'Venezuelan Bolívar Fuerte', value: 'vef' },
+	{ name: 'Vietnamese Dong', value: 'vnd' },
+	{ name: 'Vanuatu Vatu', value: 'vuv' },
+	{ name: 'Samoan Tala', value: 'wst' },
+	{ name: 'CFA Franc BEAC', value: 'xaf' },
+	{ name: 'Silver Ounce', value: 'xag' },
+	{ name: 'Gold Ounce', value: 'xau' },
+	{ name: 'East Caribbean Dollar', value: 'xcd' },
+	{ name: 'Special Drawing Rights', value: 'xdr' },
+	{ name: 'CFA Franc BCEAO', value: 'xof' },
+	{ name: 'Palladium Ounce', value: 'xpd' },
+	{ name: 'CFP Franc', value: 'xpf' },
+	{ name: 'Platinum Ounce', value: 'xpt' },
+	{ name: 'Yemeni Rial', value: 'yer' },
+	{ name: 'South African Rand', value: 'zar' },
+	{ name: 'Zambian Kwacha', value: 'zmw' },
+	{ name: 'Zimbabwean Dollar', value: 'zwl' },
+	// tslint:disable-next-line: semicolon
+]
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index e545e02f5..6bd69d62e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.75.0",
+  "version": "0.85.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -18,6 +18,7 @@
     "dev": "npm run watch",
     "build": "tsc && gulp",
     "tslint": "tslint -p tsconfig.json -c tslint.json",
+    "tslintfix": "tslint --fix -p tsconfig.json -c tslint.json",
     "watch": "tsc --watch",
     "test": "jest"
   },
@@ -33,6 +34,8 @@
       "dist/credentials/AirtableApi.credentials.js",
       "dist/credentials/Amqp.credentials.js",
       "dist/credentials/AsanaApi.credentials.js",
+      "dist/credentials/AsanaOAuth2Api.credentials.js",
+      "dist/credentials/AutomizyApi.credentials.js",
       "dist/credentials/Aws.credentials.js",
       "dist/credentials/AffinityApi.credentials.js",
       "dist/credentials/BannerbearApi.credentials.js",
@@ -44,6 +47,7 @@
       "dist/credentials/CircleCiApi.credentials.js",
       "dist/credentials/ClearbitApi.credentials.js",
       "dist/credentials/ClickUpApi.credentials.js",
+      "dist/credentials/ClickUpOAuth2Api.credentials.js",
       "dist/credentials/ClockifyApi.credentials.js",
       "dist/credentials/CockpitApi.credentials.js",
       "dist/credentials/CodaApi.credentials.js",
@@ -77,7 +81,9 @@
       "dist/credentials/GoogleDriveOAuth2Api.credentials.js",
       "dist/credentials/GoogleOAuth2Api.credentials.js",
       "dist/credentials/GoogleSheetsOAuth2Api.credentials.js",
+      "dist/credentials/GSuiteAdminOAuth2Api.credentials.js",
       "dist/credentials/GoogleTasksOAuth2Api.credentials.js",
+      "dist/credentials/GoogleTranslateOAuth2Api.credentials.js",
       "dist/credentials/YouTubeOAuth2Api.credentials.js",
       "dist/credentials/GumroadApi.credentials.js",
       "dist/credentials/HarvestApi.credentials.js",
@@ -96,13 +102,14 @@
       "dist/credentials/JiraSoftwareServerApi.credentials.js",
       "dist/credentials/JotFormApi.credentials.js",
       "dist/credentials/KeapOAuth2Api.credentials.js",
-      "dist/credentials/LinkFishApi.credentials.js",
+      "dist/credentials/LinkedInOAuth2Api.credentials.js",
       "dist/credentials/MailchimpApi.credentials.js",
       "dist/credentials/MailchimpOAuth2Api.credentials.js",
       "dist/credentials/MailgunApi.credentials.js",
       "dist/credentials/MailjetEmailApi.credentials.js",
       "dist/credentials/MailjetSmsApi.credentials.js",
       "dist/credentials/MandrillApi.credentials.js",
+      "dist/credentials/MatrixApi.credentials.js",
       "dist/credentials/MattermostApi.credentials.js",
       "dist/credentials/MauticApi.credentials.js",
       "dist/credentials/MauticOAuth2Api.credentials.js",
@@ -113,6 +120,9 @@
       "dist/credentials/MicrosoftOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftOneDriveOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftSql.credentials.js",
+      "dist/credentials/MicrosoftTeamsOAuth2Api.credentials.js",
+      "dist/credentials/MindeeReceiptApi.credentials.js",
+      "dist/credentials/MindeeInvoiceApi.credentials.js",
       "dist/credentials/MoceanApi.credentials.js",
       "dist/credentials/MondayComApi.credentials.js",
       "dist/credentials/MongoDb.credentials.js",
@@ -133,6 +143,7 @@
       "dist/credentials/PhilipsHueOAuth2Api.credentials.js",
       "dist/credentials/Postgres.credentials.js",
       "dist/credentials/PostmarkApi.credentials.js",
+      "dist/credentials/PushoverApi.credentials.js",
       "dist/credentials/QuestDb.credentials.js",
       "dist/credentials/Redis.credentials.js",
       "dist/credentials/RocketchatApi.credentials.js",
@@ -140,19 +151,24 @@
       "dist/credentials/ShopifyApi.credentials.js",
       "dist/credentials/SalesforceOAuth2Api.credentials.js",
       "dist/credentials/SentryIoApi.credentials.js",
+      "dist/credentials/SentryIoServerApi.credentials.js",
       "dist/credentials/SentryIoOAuth2Api.credentials.js",
       "dist/credentials/SlackApi.credentials.js",
       "dist/credentials/SlackOAuth2Api.credentials.js",
       "dist/credentials/Sms77Api.credentials.js",
       "dist/credentials/Smtp.credentials.js",
+      "dist/credentials/StravaOAuth2Api.credentials.js",
       "dist/credentials/StripeApi.credentials.js",
       "dist/credentials/SalesmateApi.credentials.js",
       "dist/credentials/SegmentApi.credentials.js",
+      "dist/credentials/SendyApi.credentials.js",
       "dist/credentials/Sftp.credentials.js",
       "dist/credentials/Signl4Api.credentials.js",
       "dist/credentials/SpotifyOAuth2Api.credentials.js",
       "dist/credentials/SurveyMonkeyApi.credentials.js",
       "dist/credentials/SurveyMonkeyOAuth2Api.credentials.js",
+      "dist/credentials/TaigaCloudApi.credentials.js",
+      "dist/credentials/TaigaServerApi.credentials.js",
       "dist/credentials/TelegramApi.credentials.js",
       "dist/credentials/TodoistApi.credentials.js",
       "dist/credentials/TodoistOAuth2Api.credentials.js",
@@ -168,10 +184,13 @@
       "dist/credentials/UnleashedSoftwareApi.credentials.js",
       "dist/credentials/UpleadApi.credentials.js",
       "dist/credentials/VeroApi.credentials.js",
+      "dist/credentials/VonageApi.credentials.js",
       "dist/credentials/WebflowApi.credentials.js",
       "dist/credentials/WebflowOAuth2Api.credentials.js",
+      "dist/credentials/WekanApi.credentials.js",
       "dist/credentials/WooCommerceApi.credentials.js",
       "dist/credentials/WordpressApi.credentials.js",
+      "dist/credentials/WufooApi.credentials.js",
       "dist/credentials/XeroOAuth2Api.credentials.js",
       "dist/credentials/ZendeskApi.credentials.js",
       "dist/credentials/ZendeskOAuth2Api.credentials.js",
@@ -192,9 +211,11 @@
       "dist/nodes/Asana/AsanaTrigger.node.js",
       "dist/nodes/Affinity/Affinity.node.js",
       "dist/nodes/Affinity/AffinityTrigger.node.js",
+      "dist/nodes/Automizy/Automizy.node.js",
       "dist/nodes/Aws/AwsLambda.node.js",
+      "dist/nodes/Aws/Rekognition/AwsRekognition.node.js",
       "dist/nodes/Aws/S3/AwsS3.node.js",
-      "dist/nodes/Aws/AwsSes.node.js",
+      "dist/nodes/Aws/SES/AwsSes.node.js",
       "dist/nodes/Aws/AwsSns.node.js",
       "dist/nodes/Aws/AwsSnsTrigger.node.js",
       "dist/nodes/Bannerbear/Bannerbear.node.js",
@@ -210,8 +231,10 @@
       "dist/nodes/ClickUp/ClickUp.node.js",
       "dist/nodes/ClickUp/ClickUpTrigger.node.js",
       "dist/nodes/Clockify/ClockifyTrigger.node.js",
+      "dist/nodes/Clockify/Clockify.node.js",
       "dist/nodes/Cockpit/Cockpit.node.js",
       "dist/nodes/Coda/Coda.node.js",
+      "dist/nodes/CoinGecko/CoinGecko.node.js",
       "dist/nodes/Contentful/Contentful.node.js",
       "dist/nodes/ConvertKit/ConvertKit.node.js",
       "dist/nodes/ConvertKit/ConvertKitTrigger.node.js",
@@ -249,8 +272,10 @@
       "dist/nodes/Google/Contacts/GoogleContacts.node.js",
       "dist/nodes/Google/Drive/GoogleDrive.node.js",
       "dist/nodes/Google/Gmail/Gmail.node.js",
+      "dist/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.js",
       "dist/nodes/Google/Sheet/GoogleSheets.node.js",
       "dist/nodes/Google/Task/GoogleTasks.node.js",
+      "dist/nodes/Google/Translate/GoogleTranslate.node.js",
       "dist/nodes/Google/YouTube/YouTube.node.js",
       "dist/nodes/GraphQL/GraphQL.node.js",
       "dist/nodes/Gumroad/GumroadTrigger.node.js",
@@ -273,13 +298,14 @@
       "dist/nodes/JotForm/JotFormTrigger.node.js",
       "dist/nodes/Keap/Keap.node.js",
       "dist/nodes/Keap/KeapTrigger.node.js",
-      "dist/nodes/LinkFish/LinkFish.node.js",
+      "dist/nodes/LinkedIn/LinkedIn.node.js",
       "dist/nodes/Mailchimp/Mailchimp.node.js",
       "dist/nodes/Mailchimp/MailchimpTrigger.node.js",
       "dist/nodes/Mailgun/Mailgun.node.js",
       "dist/nodes/Mailjet/Mailjet.node.js",
       "dist/nodes/Mailjet/MailjetTrigger.node.js",
       "dist/nodes/Mandrill/Mandrill.node.js",
+      "dist/nodes/Matrix/Matrix.node.js",
       "dist/nodes/Mattermost/Mattermost.node.js",
       "dist/nodes/Mautic/Mautic.node.js",
       "dist/nodes/Mautic/MauticTrigger.node.js",
@@ -289,6 +315,8 @@
       "dist/nodes/Microsoft/Excel/MicrosoftExcel.node.js",
       "dist/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.js",
       "dist/nodes/Microsoft/Sql/MicrosoftSql.node.js",
+      "dist/nodes/Microsoft/Teams/MicrosoftTeams.node.js",
+      "dist/nodes/Mindee/Mindee.node.js",
       "dist/nodes/MoveBinaryData.node.js",
       "dist/nodes/Mocean/Mocean.node.js",
       "dist/nodes/MondayCom/MondayCom.node.js",
@@ -308,6 +336,7 @@
       "dist/nodes/Pipedrive/PipedriveTrigger.node.js",
       "dist/nodes/Postgres/Postgres.node.js",
       "dist/nodes/Postmark/PostmarkTrigger.node.js",
+      "dist/nodes/Pushover/Pushover.node.js",
       "dist/nodes/PhilipsHue/PhilipsHue.node.js",
       "dist/nodes/QuestDb/QuestDb.node.js",
       "dist/nodes/ReadBinaryFile.node.js",
@@ -332,11 +361,16 @@
       "dist/nodes/SpreadsheetFile.node.js",
       "dist/nodes/SseTrigger.node.js",
       "dist/nodes/Start.node.js",
+      "dist/nodes/Strava/Strava.node.js",
+      "dist/nodes/Strava/StravaTrigger.node.js",
       "dist/nodes/Stripe/StripeTrigger.node.js",
       "dist/nodes/Switch.node.js",
       "dist/nodes/Salesmate/Salesmate.node.js",
       "dist/nodes/Segment/Segment.node.js",
+      "dist/nodes/Sendy/Sendy.node.js",
       "dist/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.js",
+      "dist/nodes/Taiga/Taiga.node.js",
+      "dist/nodes/Taiga/TaigaTrigger.node.js",
       "dist/nodes/Telegram/Telegram.node.js",
       "dist/nodes/Telegram/TelegramTrigger.node.js",
       "dist/nodes/Todoist/Todoist.node.js",
@@ -351,12 +385,15 @@
       "dist/nodes/UnleashedSoftware/UnleashedSoftware.node.js",
       "dist/nodes/Uplead/Uplead.node.js",
       "dist/nodes/Vero/Vero.node.js",
+      "dist/nodes/Vonage/Vonage.node.js",
       "dist/nodes/Webflow/WebflowTrigger.node.js",
       "dist/nodes/Webhook.node.js",
+      "dist/nodes/Wekan/Wekan.node.js",
       "dist/nodes/Wordpress/Wordpress.node.js",
       "dist/nodes/WooCommerce/WooCommerce.node.js",
       "dist/nodes/WooCommerce/WooCommerceTrigger.node.js",
       "dist/nodes/WriteBinaryFile.node.js",
+      "dist/nodes/Wufoo/WufooTrigger.node.js",
       "dist/nodes/Xero/Xero.node.js",
       "dist/nodes/Xml.node.js",
       "dist/nodes/Zendesk/Zendesk.node.js",
@@ -376,14 +413,14 @@
     "@types/formidable": "^1.0.31",
     "@types/gm": "^1.18.2",
     "@types/imap-simple": "^4.2.0",
-    "@types/jest": "^25.2.1",
+    "@types/jest": "^26.0.13",
     "@types/lodash.set": "^4.3.6",
     "@types/mailparser": "^2.7.3",
     "@types/moment-timezone": "^0.5.12",
     "@types/mongodb": "^3.5.4",
     "@types/mqtt": "^2.5.0",
     "@types/mssql": "^6.0.2",
-    "@types/node": "^14.0.27",
+    "@types/node": "14.0.27",
     "@types/nodemailer": "^6.4.0",
     "@types/redis": "^2.8.11",
     "@types/request-promise-native": "~1.0.15",
@@ -391,11 +428,11 @@
     "@types/uuid": "^3.4.6",
     "@types/xml2js": "^0.4.3",
     "gulp": "^4.0.0",
-    "jest": "^24.9.0",
-    "n8n-workflow": "~0.39.0",
-    "ts-jest": "^25.4.0",
+    "jest": "^26.4.2",
+    "n8n-workflow": "~0.42.0",
+    "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
-    "typescript": "~3.7.4"
+    "typescript": "~3.9.7"
   },
   "dependencies": {
     "@types/promise-ftp": "^1.3.4",
@@ -415,13 +452,13 @@
     "lodash.set": "^4.3.2",
     "lodash.unset": "^4.5.2",
     "mailparser": "^2.8.1",
-    "moment": "2.24.0",
+    "moment": "2.28.0",
     "moment-timezone": "^0.5.28",
     "mongodb": "^3.5.5",
     "mqtt": "^4.2.0",
     "mssql": "^6.2.0",
-    "mysql2": "^2.0.1",
-    "n8n-core": "~0.44.0",
+    "mysql2": "~2.1.0",
+    "n8n-core": "~0.48.0",
     "nodemailer": "^6.4.6",
     "pdf-parse": "^1.1.1",
     "pg": "^8.3.0",
@@ -434,7 +471,7 @@
     "ssh2-sftp-client": "^5.2.1",
     "uuid": "^3.4.0",
     "vm2": "^3.6.10",
-    "xlsx": "^0.14.3",
+    "xlsx": "^0.16.7",
     "xml2js": "^0.4.22"
   },
   "jest": {
diff --git a/packages/nodes-base/tslint.json b/packages/nodes-base/tslint.json
index 7eb9d0110..a255e6b0f 100644
--- a/packages/nodes-base/tslint.json
+++ b/packages/nodes-base/tslint.json
@@ -46,6 +46,7 @@
 		"forin": true,
 		"jsdoc-format": true,
 		"label-position": true,
+		"indent": [true, "tabs", 2],
 		"member-access": [
 			true,
 			"no-public"
@@ -60,6 +61,10 @@
 		"no-default-export": true,
 		"no-duplicate-variable": true,
 		"no-inferrable-types": true,
+		"ordered-imports": [true, {
+			"import-sources-order": "any",
+			"named-imports-order": "case-insensitive"
+		  }],
 		"no-namespace": [
 			true,
 			"allow-declarations"
@@ -82,6 +87,18 @@
 			"ignore-bound-class-methods"
 		],
 		"switch-default": true,
+		"trailing-comma": [
+			true,
+			{
+			"multiline": {
+				"objects": "always",
+				"arrays": "always",
+				"functions": "always",
+				"typeLiterals": "ignore"
+			},
+			"esSpecCompliant": true
+			}
+		],
 		"triple-equals": [
 			true,
 			"allow-null-check"
diff --git a/packages/workflow/LICENSE.md b/packages/workflow/LICENSE.md
index 24a7d38fc..3dd835dee 100644
--- a/packages/workflow/LICENSE.md
+++ b/packages/workflow/LICENSE.md
@@ -19,7 +19,7 @@ Condition notice.
 
 Software: n8n
 
-License: Apache 2.0
+License: Apache 2.0 with Commons Clause
 
 Licensor: n8n GmbH
 
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 2a4cca848..d8dbbba97 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
     "name": "n8n-workflow",
-    "version": "0.39.0",
+    "version": "0.42.0",
     "description": "Workflow base code of n8n",
     "license": "SEE LICENSE IN LICENSE.md",
     "homepage": "https://n8n.io",
@@ -18,6 +18,7 @@
         "dev": "npm run watch",
         "build": "tsc",
         "tslint": "tslint -p tsconfig.json -c tslint.json",
+        "tslintfix": "tslint --fix -p tsconfig.json -c tslint.json",
         "watch": "tsc --watch",
         "test": "jest"
     },
@@ -26,13 +27,13 @@
     ],
     "devDependencies": {
         "@types/express": "^4.17.6",
-        "@types/jest": "^25.2.1",
+        "@types/jest": "^26.0.13",
         "@types/lodash.get": "^4.4.6",
-        "@types/node": "^14.0.27",
-        "jest": "^24.9.0",
-        "ts-jest": "^25.4.0",
+        "@types/node": "14.0.27",
+        "jest": "^26.4.2",
+        "ts-jest": "^26.3.0",
         "tslint": "^6.1.2",
-        "typescript": "~3.7.4"
+        "typescript": "~3.9.7"
     },
     "dependencies": {
         "lodash.get": "^4.4.2",
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
new file mode 100644
index 000000000..6026c3eee
--- /dev/null
+++ b/packages/workflow/src/Expression.ts
@@ -0,0 +1,223 @@
+
+import {
+	INode,
+	INodeExecutionData,
+	INodeParameters,
+	IRunExecutionData,
+	NodeParameterValue,
+	Workflow,
+	WorkflowDataProxy,
+} from './';
+
+// @ts-ignore
+import * as tmpl from 'riot-tmpl';
+
+// Set it to use double curly brackets instead of single ones
+tmpl.brackets.set('{{ }}');
+
+// Make sure that it does not always print an error when it could not resolve
+// a variable
+tmpl.tmpl.errorHandler = () => { };
+
+
+export class Expression {
+
+	workflow: Workflow;
+
+	constructor(workflow: Workflow) {
+		this.workflow = workflow;
+	}
+
+
+	/**
+	 * Converts an object to a string in a way to make it clear that
+	 * the value comes from an object
+	 *
+	 * @param {object} value
+	 * @returns {string}
+	 * @memberof Workflow
+	 */
+	convertObjectValueToString(value: object): string {
+		const typeName = Array.isArray(value) ? 'Array' : 'Object';
+		return `[${typeName}: ${JSON.stringify(value)}]`;
+	}
+
+
+
+	/**
+	 * Resolves the paramter value.  If it is an expression it will execute it and
+	 * return the result. For everything simply the supplied value will be returned.
+	 *
+	 * @param {NodeParameterValue} parameterValue
+	 * @param {(IRunExecutionData | null)} runExecutionData
+	 * @param {number} runIndex
+	 * @param {number} itemIndex
+	 * @param {string} activeNodeName
+	 * @param {INodeExecutionData[]} connectionInputData
+	 * @param {boolean} [returnObjectAsString=false]
+	 * @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])}
+	 * @memberof Workflow
+	 */
+	resolveSimpleParameterValue(parameterValue: NodeParameterValue, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], returnObjectAsString = false): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] {
+		// Check if it is an expression
+		if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') {
+			// Is no expression so return value
+			return parameterValue;
+		}
+
+		// Is an expression
+
+		// Remove the equal sign
+		parameterValue = parameterValue.substr(1);
+
+		// Generate a data proxy which allows to query workflow data
+		const dataProxy = new WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData);
+		const data = dataProxy.getDataProxy();
+
+		// Execute the expression
+		try {
+			const returnValue = tmpl.tmpl(parameterValue, data);
+			if (typeof returnValue === 'function') {
+				throw new Error('Expression resolved to a function. Please add "()"');
+			} else if (returnValue !== null && typeof returnValue === 'object') {
+				if (returnObjectAsString === true) {
+					return this.convertObjectValueToString(returnValue);
+				}
+			}
+			return returnValue;
+		} catch (e) {
+			throw new Error(`Expression is not valid: ${e.message}`);
+		}
+	}
+
+
+
+	/**
+	 * Resolves value of parameter. But does not work for workflow-data.
+	 *
+	 * @param {INode} node
+	 * @param {(string | undefined)} parameterValue
+	 * @param {string} [defaultValue]
+	 * @returns {(string | undefined)}
+	 * @memberof Workflow
+	 */
+	getSimpleParameterValue(node: INode, parameterValue: string | boolean | undefined, defaultValue?: boolean | number | string): boolean | number | string | undefined {
+		if (parameterValue === undefined) {
+			// Value is not set so return the default
+			return defaultValue;
+		}
+
+		// Get the value of the node (can be an expression)
+		const runIndex = 0;
+		const itemIndex = 0;
+		const connectionInputData: INodeExecutionData[] = [];
+		const runData: IRunExecutionData = {
+			resultData: {
+				runData: {},
+			},
+		};
+
+		return this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData) as boolean | number | string | undefined;
+	}
+
+
+
+	/**
+	 * Resolves value of complex parameter. But does not work for workflow-data.
+	 *
+	 * @param {INode} node
+	 * @param {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])} parameterValue
+	 * @param {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined)} [defaultValue]
+	 * @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined)}
+	 * @memberof Workflow
+	 */
+	getComplexParameterValue(node: INode, parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], defaultValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined = undefined): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined {
+		if (parameterValue === undefined) {
+			// Value is not set so return the default
+			return defaultValue;
+		}
+
+		// Get the value of the node (can be an expression)
+		const runIndex = 0;
+		const itemIndex = 0;
+		const connectionInputData: INodeExecutionData[] = [];
+		const runData: IRunExecutionData = {
+			resultData: {
+				runData: {},
+			},
+		};
+
+		// Resolve the "outer" main values
+		const returnData = this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData);
+
+		// Resolve the "inner" values
+		return this.getParameterValue(returnData, runData, runIndex, itemIndex, node.name, connectionInputData);
+	}
+
+
+
+	/**
+	 * Returns the resolved node parameter value. If it is an expression it will execute it and
+	 * return the result. If the value to resolve is an array or object it will do the same
+	 * for all of the items and values.
+	 *
+	 * @param {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])} parameterValue
+	 * @param {(IRunExecutionData | null)} runExecutionData
+	 * @param {number} runIndex
+	 * @param {number} itemIndex
+	 * @param {string} activeNodeName
+	 * @param {INodeExecutionData[]} connectionInputData
+	 * @param {boolean} [returnObjectAsString=false]
+	 * @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])}
+	 * @memberof Workflow
+	 */
+	getParameterValue(parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], returnObjectAsString = false): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] {
+		// Helper function which returns true when the parameter is a complex one or array
+		const isComplexParameter = (value: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]) => {
+			return typeof value === 'object';
+		};
+
+		// Helper function which resolves a parameter value depending on if it is simply or not
+		const resolveParameterValue = (value: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]) => {
+			if (isComplexParameter(value)) {
+				return this.getParameterValue(value, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, returnObjectAsString);
+			} else {
+				return this.resolveSimpleParameterValue(value as NodeParameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, returnObjectAsString);
+			}
+		};
+
+		// Check if it value is a simple one that we can get it resolved directly
+		if (!isComplexParameter(parameterValue)) {
+			return this.resolveSimpleParameterValue(parameterValue as NodeParameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, returnObjectAsString);
+		}
+
+		// The parameter value is complex so resolve depending on type
+
+		if (Array.isArray(parameterValue)) {
+			// Data is an array
+			const returnData = [];
+			for (const item of parameterValue) {
+				returnData.push(resolveParameterValue(item));
+			}
+
+			if (returnObjectAsString === true && typeof returnData === 'object') {
+				return this.convertObjectValueToString(returnData);
+			}
+
+			return returnData as NodeParameterValue[] | INodeParameters[];
+		} else if (parameterValue === null) {
+			return parameterValue;
+		} else {
+			// Data is an object
+			const returnData: INodeParameters = {};
+			for (const key of Object.keys(parameterValue)) {
+				returnData[key] = resolveParameterValue((parameterValue as INodeParameters)[key]);
+			}
+
+			if (returnObjectAsString === true && typeof returnData === 'object') {
+				return this.convertObjectValueToString(returnData);
+			}
+			return returnData;
+		}
+	}
+}
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index af62220d8..7f1deea37 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -16,6 +16,7 @@ export interface IOAuth2Options {
 	includeCredentialsOnRefreshOnBody?: boolean;
 	property?: string;
 	tokenType?: string;
+	keepBearer?: boolean;
 }
 
 export interface IConnection {
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 3e38931ae..f91889463 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1,10 +1,10 @@
 import {
 	IContextObject,
-	INodeCredentialDescription,
 	INode,
+	INodeCredentialDescription,
 	INodeExecutionData,
-	INodeIssues,
 	INodeIssueObjectProperty,
+	INodeIssues,
 	INodeParameters,
 	INodeProperties,
 	INodePropertyCollection,
@@ -238,11 +238,11 @@ export function getSpecialNodeParameters(nodeType: INodeType) {
 								options: [
 									{
 										name: 'Minutes',
-										value: 'minutes'
+										value: 'minutes',
 									},
 									{
 										name: 'Hours',
-										value: 'hours'
+										value: 'hours',
 									},
 								],
 								default: 'hours',
@@ -755,7 +755,7 @@ export function getNodeWebhooks(workflow: Workflow, node: INode, additionalData:
 
 	const returnData: IWebhookData[] = [];
 	for (const webhookDescription of nodeType.description.webhooks) {
-		let nodeWebhookPath = workflow.getSimpleParameterValue(node, webhookDescription['path']);
+		let nodeWebhookPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['path']);
 		if (nodeWebhookPath === undefined) {
 			// TODO: Use a proper logger
 			console.error(`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`);
@@ -768,10 +768,10 @@ export function getNodeWebhooks(workflow: Workflow, node: INode, additionalData:
 			nodeWebhookPath = nodeWebhookPath.slice(1);
 		}
 
-		const isFullPath: boolean = workflow.getSimpleParameterValue(node, webhookDescription['isFullPath'], false) as boolean;
+		const isFullPath: boolean = workflow.expression.getSimpleParameterValue(node, webhookDescription['isFullPath'], false) as boolean;
 		const path = getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath);
 
-		const httpMethod = workflow.getSimpleParameterValue(node, webhookDescription['httpMethod'], 'GET');
+		const httpMethod = workflow.expression.getSimpleParameterValue(node, webhookDescription['httpMethod'], 'GET');
 
 		if (httpMethod === undefined) {
 			// TODO: Use a proper logger
@@ -809,7 +809,7 @@ export function getNodeWebhooksBasic(workflow: Workflow, node: INode): IWebhookD
 
 	const returnData: IWebhookData[] = [];
 	for (const webhookDescription of nodeType.description.webhooks) {
-		let nodeWebhookPath = workflow.getSimpleParameterValue(node, webhookDescription['path']);
+		let nodeWebhookPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['path']);
 		if (nodeWebhookPath === undefined) {
 			// TODO: Use a proper logger
 			console.error(`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`);
@@ -822,11 +822,11 @@ export function getNodeWebhooksBasic(workflow: Workflow, node: INode): IWebhookD
 			nodeWebhookPath = nodeWebhookPath.slice(1);
 		}
 
-		const isFullPath: boolean = workflow.getSimpleParameterValue(node, webhookDescription['isFullPath'], false) as boolean;
+		const isFullPath: boolean = workflow.expression.getSimpleParameterValue(node, webhookDescription['isFullPath'], false) as boolean;
 
 		const path = getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath);
 
-		const httpMethod = workflow.getSimpleParameterValue(node, webhookDescription['httpMethod']);
+		const httpMethod = workflow.expression.getSimpleParameterValue(node, webhookDescription['httpMethod']);
 
 		if (httpMethod === undefined) {
 			// TODO: Use a proper logger
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index 501e7f0de..6386786a8 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -1,13 +1,14 @@
 
 import {
+	Expression,
 	IConnections,
 	IGetExecuteTriggerFunctions,
 	INode,
-	INodes,
 	INodeExecuteFunctions,
 	INodeExecutionData,
 	INodeIssues,
 	INodeParameters,
+	INodes,
 	INodeType,
 	INodeTypes,
 	IPollFunctions,
@@ -23,21 +24,11 @@ import {
 	NodeParameterValue,
 	ObservableObject,
 	WebhookSetupMethodNames,
-	WorkflowDataProxy,
 	WorkflowExecuteMode,
 } from './';
 
-// @ts-ignore
-import * as tmpl from 'riot-tmpl';
 import { IConnection, IDataObject, IObservableObject } from './Interfaces';
 
-// Set it to use double curly brackets instead of single ones
-tmpl.brackets.set('{{ }}');
-
-// Make sure that it does not always print an error when it could not resolve
-// a variable
-tmpl.tmpl.errorHandler = () => { };
-
 
 export class Workflow {
 	id: string | undefined;
@@ -46,6 +37,7 @@ export class Workflow {
 	connectionsBySourceNode: IConnections;
 	connectionsByDestinationNode: IConnections;
 	nodeTypes: INodeTypes;
+	expression: Expression;
 	active: boolean;
 	settings: IWorkflowSettings;
 
@@ -90,6 +82,8 @@ export class Workflow {
 		this.staticData = ObservableObject.create(parameters.staticData || {}, undefined, { ignoreEmptyOnFirstChild: true });
 
 		this.settings = parameters.settings || {};
+
+		this.expression = new Expression(this);
 	}
 
 
@@ -135,7 +129,7 @@ export class Workflow {
 						returnConnection[connectionInfo.node][connectionInfo.type][connectionInfo.index].push({
 							node: sourceNode,
 							type,
-							index: parseInt(inputIndex, 10)
+							index: parseInt(inputIndex, 10),
 						});
 					}
 				}
@@ -147,21 +141,6 @@ export class Workflow {
 
 
 
-	/**
-	 * Converts an object to a string in a way to make it clear that
-	 * the value comes from an object
-	 *
-	 * @param {object} value
-	 * @returns {string}
-	 * @memberof Workflow
-	 */
-	convertObjectValueToString(value: object): string {
-		const typeName = Array.isArray(value) ? 'Array' : 'Object';
-		return `[${typeName}: ${JSON.stringify(value)}]`;
-	}
-
-
-
 	/**
 	 * A workflow can only be activated if it has a node which has either triggers
 	 * or webhooks defined.
@@ -236,7 +215,7 @@ export class Workflow {
 					typeUnknown: true,
 				};
 			} else {
-				nodeIssues = NodeHelpers.getNodeParametersIssues(nodeType.description.properties, node);
+				nodeIssues = NodeHelpers.getNodeParametersIssues(nodeType.description.properties!, node);
 			}
 
 			if (nodeIssues !== null) {
@@ -706,65 +685,6 @@ export class Workflow {
 
 
 
-	/**
-	 * Resolves value of parameter. But does not work for workflow-data.
-	 *
-	 * @param {INode} node
-	 * @param {(string | undefined)} parameterValue
-	 * @param {string} [defaultValue]
-	 * @returns {(string | undefined)}
-	 * @memberof Workflow
-	 */
-	getSimpleParameterValue(node: INode, parameterValue: string | boolean | undefined, defaultValue?: boolean | number | string): boolean | number | string | undefined {
-		if (parameterValue === undefined) {
-			// Value is not set so return the default
-			return defaultValue;
-		}
-
-		// Get the value of the node (can be an expression)
-		const runIndex = 0;
-		const itemIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
-		const runData: IRunExecutionData = {
-			resultData: {
-				runData: {},
-			}
-		};
-
-		return this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData) as boolean | number | string | undefined;
-	}
-
-	/**
-	 * Resolves value of complex parameter. But does not work for workflow-data.
-	 *
-	 * @param {INode} node
-	 * @param {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])} parameterValue
-	 * @param {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined)} [defaultValue]
-	 * @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined)}
-	 * @memberof Workflow
-	 */
-	getComplexParameterValue(node: INode, parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], defaultValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined = undefined): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined {
-		if (parameterValue === undefined) {
-			// Value is not set so return the default
-			return defaultValue;
-		}
-
-		// Get the value of the node (can be an expression)
-		const runIndex = 0;
-		const itemIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
-		const runData: IRunExecutionData = {
-			resultData: {
-				runData: {},
-			}
-		};
-
-		// Resolve the "outer" main values
-		const returnData = this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData);
-
-		// Resolve the "inner" values
-		return this.getParameterValue(returnData, runData, runIndex, itemIndex, node.name, connectionInputData);
-	}
 
 	/**
 	 * Returns from which of the given nodes the workflow should get started from
@@ -839,119 +759,6 @@ export class Workflow {
 
 
 
-	/**
-	 * Returns the resolved node parameter value. If it is an expression it will execute it and
-	 * return the result. If the value to resolve is an array or object it will do the same
-	 * for all of the items and values.
-	 *
-	 * @param {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])} parameterValue
-	 * @param {(IRunExecutionData | null)} runExecutionData
-	 * @param {number} runIndex
-	 * @param {number} itemIndex
-	 * @param {string} activeNodeName
-	 * @param {INodeExecutionData[]} connectionInputData
-	 * @param {boolean} [returnObjectAsString=false]
-	 * @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])}
-	 * @memberof Workflow
-	 */
-	getParameterValue(parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], returnObjectAsString = false): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] {
-		// Helper function which returns true when the parameter is a complex one or array
-		const isComplexParameter = (value: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]) => {
-			return typeof value === 'object';
-		};
-
-		// Helper function which resolves a parameter value depending on if it is simply or not
-		const resolveParameterValue = (value: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]) => {
-			if (isComplexParameter(value)) {
-				return this.getParameterValue(value, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, returnObjectAsString);
-			} else {
-				return this.resolveSimpleParameterValue(value as NodeParameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, returnObjectAsString);
-			}
-		};
-
-		// Check if it value is a simple one that we can get it resolved directly
-		if (!isComplexParameter(parameterValue)) {
-			return this.resolveSimpleParameterValue(parameterValue as NodeParameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, returnObjectAsString);
-		}
-
-		// The parameter value is complex so resolve depending on type
-
-		if (Array.isArray(parameterValue)) {
-			// Data is an array
-			const returnData = [];
-			for (const item of parameterValue) {
-				returnData.push(resolveParameterValue(item));
-			}
-
-			if (returnObjectAsString === true && typeof returnData === 'object') {
-				return this.convertObjectValueToString(returnData);
-			}
-
-			return returnData as NodeParameterValue[] | INodeParameters[];
-		} else {
-			// Data is an object
-			const returnData: INodeParameters = {};
-			for (const key of Object.keys(parameterValue)) {
-				returnData[key] = resolveParameterValue((parameterValue as INodeParameters)[key]);
-			}
-
-			if (returnObjectAsString === true && typeof returnData === 'object') {
-				return this.convertObjectValueToString(returnData);
-			}
-			return returnData;
-		}
-	}
-
-
-
-	/**
-	 * Resolves the paramter value.  If it is an expression it will execute it and
-	 * return the result. For everything simply the supplied value will be returned.
-	 *
-	 * @param {NodeParameterValue} parameterValue
-	 * @param {(IRunExecutionData | null)} runExecutionData
-	 * @param {number} runIndex
-	 * @param {number} itemIndex
-	 * @param {string} activeNodeName
-	 * @param {INodeExecutionData[]} connectionInputData
-	 * @param {boolean} [returnObjectAsString=false]
-	 * @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])}
-	 * @memberof Workflow
-	 */
-	resolveSimpleParameterValue(parameterValue: NodeParameterValue, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], returnObjectAsString = false): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] {
-		// Check if it is an expression
-		if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') {
-			// Is no expression so return value
-			return parameterValue;
-		}
-
-		// Is an expression
-
-		// Remove the equal sign
-		parameterValue = parameterValue.substr(1);
-
-		// Generate a data proxy which allows to query workflow data
-		const dataProxy = new WorkflowDataProxy(this, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData);
-		const data = dataProxy.getDataProxy();
-
-		// Execute the expression
-		try {
-			const returnValue = tmpl.tmpl(parameterValue, data);
-			if (typeof returnValue === 'function') {
-				throw new Error('Expression resolved to a function. Please add "()"');
-			} else if (returnValue !== null && typeof returnValue === 'object') {
-				if (returnObjectAsString === true)  {
-					return this.convertObjectValueToString(returnValue);
-				}
-			}
-			return returnValue;
-		} catch (e) {
-			throw new Error(`Expression is not valid: ${e.message}`);
-		}
-	}
-
-
-
 	/**
 	 * Executes the Webhooks method of the node
 	 *
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index 8094991f3..6ba756e02 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -63,7 +63,7 @@ export class WorkflowDataProxy {
 				}
 
 				return contextData[name];
-			}
+			},
 		});
 	}
 
@@ -97,11 +97,11 @@ export class WorkflowDataProxy {
 
 				if (typeof returnValue === 'string' && returnValue.charAt(0) === '=') {
 					// The found value is an expression so resolve it
-					return that.workflow.getParameterValue(returnValue, that.runExecutionData, that.runIndex, that.itemIndex, that.activeNodeName, that.connectionInputData);
+					return that.workflow.expression.getParameterValue(returnValue, that.runExecutionData, that.runIndex, that.itemIndex, that.activeNodeName, that.connectionInputData);
 				}
 
 				return returnValue;
-			}
+			},
 		});
 	}
 
@@ -252,7 +252,7 @@ export class WorkflowDataProxy {
 				}
 
 				return Reflect.get(target, name, receiver);
-			}
+			},
 		});
 	}
 
@@ -269,7 +269,7 @@ export class WorkflowDataProxy {
 		return new Proxy({}, {
 			get(target, name, receiver) {
 				return process.env[name.toString()];
-			}
+			},
 		});
 	}
 
@@ -298,7 +298,7 @@ export class WorkflowDataProxy {
 
 				// @ts-ignore
 				return that.workflow[name.toString()];
-			}
+			},
 		});
 	}
 
@@ -316,7 +316,7 @@ export class WorkflowDataProxy {
 		return new Proxy({}, {
 			get(target, name, receiver) {
 				return that.nodeDataGetter(name.toString());
-			}
+			},
 		});
 	}
 
@@ -337,7 +337,7 @@ export class WorkflowDataProxy {
 			$env: this.envGetter(),
 			$evaluateExpression: (expression: string, itemIndex?: number) => {
 				itemIndex = itemIndex || that.itemIndex;
-				return that.workflow.getParameterValue('=' + expression, that.runExecutionData, that.runIndex, itemIndex, that.activeNodeName, that.connectionInputData);
+				return that.workflow.expression.getParameterValue('=' + expression, that.runExecutionData, that.runIndex, itemIndex, that.activeNodeName, that.connectionInputData);
 			},
 			$item: (itemIndex: number, runIndex?: number) => {
 				const defaultReturnRunIndex = runIndex === undefined ? -1 : runIndex;
@@ -375,7 +375,7 @@ export class WorkflowDataProxy {
 				}
 
 				return Reflect.get(target, name, receiver);
-			}
+			},
 		});
 	}
 }
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 89d01313d..b2c24d55f 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -1,4 +1,5 @@
 export * from './Interfaces';
+export * from './Expression';
 export * from './Workflow';
 export * from './WorkflowDataProxy';
 export * from './WorkflowHooks';
diff --git a/packages/workflow/test/Helpers.ts b/packages/workflow/test/Helpers.ts
index 8b5cb3d2a..39e151b02 100644
--- a/packages/workflow/test/Helpers.ts
+++ b/packages/workflow/test/Helpers.ts
@@ -1,7 +1,7 @@
 import {
 	INodeType,
-	INodeTypes,
 	INodeTypeData,
+	INodeTypes,
 } from '../src';
 
 export interface INodeTypesObject {
@@ -38,10 +38,10 @@ class NodeTypesClass implements INodeTypes {
 							name: 'value2',
 							type: 'string',
 							default: 'default-value2',
-						}
-					]
-				}
-			}
+						},
+					],
+				},
+			},
 		},
 		'test.setMulti': {
 			sourcePath: '',
@@ -86,13 +86,13 @@ class NodeTypesClass implements INodeTypes {
 											default: '',
 											placeholder: 'The string value to write in the property.',
 										},
-									]
+									],
 								},
 							],
 						},
-					]
-				}
-			}
+					],
+				},
+			},
 		},
 	};
 
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 207a06e62..0e0c01c18 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -1,8 +1,8 @@
 
 import {
-	NodeHelpers,
 	INodeParameters,
 	INodeProperties,
+	NodeHelpers,
 } from '../src';
 
 describe('Workflow', () => {
@@ -178,7 +178,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										boolean1: [
-											true
+											true,
 										],
 									},
 								},
@@ -230,7 +230,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									hide: {
 										boolean1: [
-											true
+											true,
 										],
 									},
 								},
@@ -278,7 +278,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										boolean1: [
-											true
+											true,
 										],
 									},
 								},
@@ -327,7 +327,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										mode: [
-											'mode1'
+											'mode1',
 										],
 									},
 								},
@@ -373,7 +373,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										string1: [
-											'default string1'
+											'default string1',
 										],
 									},
 								},
@@ -386,7 +386,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										boolean1: [
-											true
+											true,
 										],
 									},
 								},
@@ -437,7 +437,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										string1: [
-											'default string1'
+											'default string1',
 										],
 									},
 								},
@@ -450,7 +450,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										boolean1: [
-											true
+											true,
 										],
 									},
 								},
@@ -498,7 +498,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										mode: [
-											'mode1'
+											'mode1',
 										],
 									},
 								},
@@ -546,7 +546,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										mode: [
-											'mode2'
+											'mode2',
 										],
 									},
 								},
@@ -591,7 +591,7 @@ describe('Workflow', () => {
 								displayOptions: {
 									show: {
 										mode: [
-											'mode2'
+											'mode2',
 										],
 									},
 								},
@@ -711,7 +711,7 @@ describe('Workflow', () => {
 								values: {
 									number: [
 										{
-											number1: 1
+											number1: 1,
 										},
 									],
 								},
@@ -794,7 +794,7 @@ describe('Workflow', () => {
 							values: {
 								number: {
 									number1: 1,
-								}
+								},
 							},
 						},
 					},
@@ -902,8 +902,8 @@ describe('Workflow', () => {
 									number1: 1,
 								},
 								singleString: {
-									string1: 'value1'
-								}
+									string1: 'value1',
+								},
 							},
 						},
 					},
@@ -915,7 +915,7 @@ describe('Workflow', () => {
 										number1: 1,
 									},
 									singleString: {
-										string1: 'value1'
+										string1: 'value1',
 									},
 								},
 							},
@@ -926,7 +926,7 @@ describe('Workflow', () => {
 										number1: 1,
 									},
 									singleString: {
-										string1: 'value1'
+										string1: 'value1',
 									},
 								},
 							},
@@ -938,7 +938,7 @@ describe('Workflow', () => {
 										number1: 1,
 									},
 									singleString: {
-										string1: 'value1'
+										string1: 'value1',
 									},
 								},
 							},
@@ -949,7 +949,7 @@ describe('Workflow', () => {
 										number1: 1,
 									},
 									singleString: {
-										string1: 'value1'
+										string1: 'value1',
 									},
 								},
 							},
@@ -1040,8 +1040,8 @@ describe('Workflow', () => {
 										number1: 1,
 										collection1: [
 											{
-												string1: 'value1'
-											}
+												string1: 'value1',
+											},
 										],
 									},
 								],
@@ -1057,8 +1057,8 @@ describe('Workflow', () => {
 											number1: 1,
 											collection1: [
 												{
-													string1: 'value1'
-												}
+													string1: 'value1',
+												},
 											],
 										},
 									],
@@ -1072,8 +1072,8 @@ describe('Workflow', () => {
 											number1: 1,
 											collection1: [
 												{
-													string1: 'value1'
-												}
+													string1: 'value1',
+												},
 											],
 										},
 									],
@@ -1088,8 +1088,8 @@ describe('Workflow', () => {
 											number1: 1,
 											collection1: [
 												{
-													string1: 'value1'
-												}
+													string1: 'value1',
+												},
 											],
 										},
 									],
@@ -1103,8 +1103,8 @@ describe('Workflow', () => {
 											number1: 1,
 											collection1: [
 												{
-													string1: 'value1'
-												}
+													string1: 'value1',
+												},
 											],
 										},
 									],
@@ -1140,7 +1140,7 @@ describe('Workflow', () => {
 												displayOptions: {
 													show: {
 														mode: [
-															'mode1'
+															'mode1',
 														],
 													},
 												},
@@ -1231,7 +1231,7 @@ describe('Workflow', () => {
 												displayOptions: {
 													show: {
 														'/mode': [
-															'mode1'
+															'mode1',
 														],
 													},
 												},
@@ -1322,7 +1322,7 @@ describe('Workflow', () => {
 												displayOptions: {
 													show: {
 														'/mode': [
-															'mode2'
+															'mode2',
 														],
 													},
 												},
@@ -1405,7 +1405,7 @@ describe('Workflow', () => {
 										displayOptions: {
 											show: {
 												'/mode': [
-													'mode1'
+													'mode1',
 												],
 											},
 										},
@@ -1481,7 +1481,7 @@ describe('Workflow', () => {
 										displayOptions: {
 											show: {
 												'/mode': [
-													'mode2'
+													'mode2',
 												],
 											},
 										},
@@ -1558,7 +1558,7 @@ describe('Workflow', () => {
 										displayOptions: {
 											show: {
 												'/mode': [
-													'mode1'
+													'mode1',
 												],
 											},
 										},
@@ -1577,7 +1577,7 @@ describe('Workflow', () => {
 							values: [
 								{
 									string1: 'own string1',
-								}
+								},
 							],
 						},
 					},
@@ -1587,7 +1587,7 @@ describe('Workflow', () => {
 								values: [
 									{
 										string1: 'own string1',
-									}
+									},
 								],
 							},
 							defaultsTrue: {
@@ -1595,7 +1595,7 @@ describe('Workflow', () => {
 								values: [
 									{
 										string1: 'own string1',
-									}
+									},
 								],
 							},
 						},
@@ -1604,7 +1604,7 @@ describe('Workflow', () => {
 								values: [
 									{
 										string1: 'own string1',
-									}
+									},
 								],
 							},
 							defaultsTrue: {
@@ -1612,7 +1612,7 @@ describe('Workflow', () => {
 								values: [
 									{
 										string1: 'own string1',
-									}
+									},
 								],
 							},
 						},
@@ -1648,7 +1648,7 @@ describe('Workflow', () => {
 										displayOptions: {
 											show: {
 												'/mode': [
-													'mode2'
+													'mode2',
 												],
 											},
 										},
@@ -1668,7 +1668,7 @@ describe('Workflow', () => {
 								{
 									string1: 'own string1',
 									number1: 0,
-								}
+								},
 							],
 						},
 					},
@@ -1740,7 +1740,7 @@ describe('Workflow', () => {
 												displayOptions: {
 													show: {
 														mode: [
-															'mode1'
+															'mode1',
 														],
 													},
 												},
@@ -1838,8 +1838,8 @@ describe('Workflow', () => {
 						nodeValues: {
 							collection1: [
 								{
-									string1: 'value1'
-								}
+									string1: 'value1',
+								},
 							],
 						},
 					},
@@ -1848,15 +1848,15 @@ describe('Workflow', () => {
 							defaultsFalse: {
 								collection1: [
 									{
-										string1: 'value1'
-									}
+										string1: 'value1',
+									},
 								],
 							},
 							defaultsTrue: {
 								collection1: [
 									{
-										string1: 'value1'
-									}
+										string1: 'value1',
+									},
 								],
 							},
 						},
@@ -1864,15 +1864,15 @@ describe('Workflow', () => {
 							defaultsFalse: {
 								collection1: [
 									{
-										string1: 'value1'
-									}
+										string1: 'value1',
+									},
 								],
 							},
 							defaultsTrue: {
 								collection1: [
 									{
-										string1: 'value1'
-									}
+										string1: 'value1',
+									},
 								],
 							},
 						},
@@ -1912,8 +1912,8 @@ describe('Workflow', () => {
 						nodeValues: {
 							collection1: [
 								{
-									string1: 'default string1'
-								}
+									string1: 'default string1',
+								},
 							],
 						},
 					},
@@ -1923,14 +1923,14 @@ describe('Workflow', () => {
 								collection1: [
 									{
 										string1: 'default string1',
-									}
+									},
 								],
 							},
 							defaultsTrue: {
 								collection1: [
 									{
 										string1: 'default string1',
-									}
+									},
 								],
 							},
 						},
@@ -1939,14 +1939,14 @@ describe('Workflow', () => {
 								collection1: [
 									{
 										string1: 'default string1',
-									}
+									},
 								],
 							},
 							defaultsTrue: {
 								collection1: [
 									{
 										string1: 'default string1',
-									}
+									},
 								],
 							},
 						},
@@ -2650,7 +2650,7 @@ describe('Workflow', () => {
 							},
 						],
 						nodeValues: {
-							mainOption: 'option2'
+							mainOption: 'option2',
 						},
 					},
 					output: {
diff --git a/packages/workflow/test/Workflow.test.ts b/packages/workflow/test/Workflow.test.ts
index 51b092bef..7de298348 100644
--- a/packages/workflow/test/Workflow.test.ts
+++ b/packages/workflow/test/Workflow.test.ts
@@ -30,7 +30,7 @@ describe('Workflow', () => {
 					parameters: {
 						value1: 'value1Node1',
 						value2: 'value2Node1',
-					}
+					},
 				},
 				output: {
 					value1: 'value1Node1',
@@ -93,7 +93,7 @@ describe('Workflow', () => {
 							{
 								value2a: '={{$node.Node1.data.value1 + \'Node1\'}}',
 								value2b: '={{$node.Node1.data.value1 + \'Node1\'}}',
-							}
+							},
 						],
 						level1c: {
 							value2a: {
@@ -105,10 +105,10 @@ describe('Workflow', () => {
 											value5a: '={{$node.Node1.data.value1 + \'Node1\'}}',
 											value5b: '={{$node.Node1.data.value1 + \'Node1\'}}',
 										},
-									}
-								]
+									},
+								],
 							},
-						}
+						},
 					} as INodeParameters,
 				},
 				output: {
@@ -117,7 +117,7 @@ describe('Workflow', () => {
 						{
 							value2a: '={{$node.NewName.data.value1 + \'Node1\'}}',
 							value2b: '={{$node.NewName.data.value1 + \'Node1\'}}',
-						}
+						},
 					],
 					level1c: {
 						value2a: {
@@ -129,10 +129,10 @@ describe('Workflow', () => {
 										value5a: '={{$node.NewName.data.value1 + \'Node1\'}}',
 										value5b: '={{$node.NewName.data.value1 + \'Node1\'}}',
 									},
-								}
-							]
+								},
+							],
 						},
-					}
+					},
 				},
 			},
 		];
@@ -164,9 +164,9 @@ describe('Workflow', () => {
 								value1: 'value1Node1',
 								value2: 'value2Node1',
 							},
-						}
+						},
 					],
-					connections: {}
+					connections: {},
 				},
 				output: {
 					nodes: [
@@ -176,9 +176,9 @@ describe('Workflow', () => {
 								value1: 'value1Node1',
 								value2: 'value2Node1',
 							},
-						}
+						},
 					],
-					connections: {}
+					connections: {},
 				},
 			},
 			{
@@ -381,9 +381,9 @@ describe('Workflow', () => {
 										node: 'Node5',
 										type: 'main',
 										index: 0,
-									}
-								]
-							]
+									},
+								],
+							],
 						},
 						Node3: {
 							main: [
@@ -510,9 +510,9 @@ describe('Workflow', () => {
 								value1: '={{$node.Node1.data.value1 + \'Node1\'}}',
 								value2: '={{$node.Node1.data.value2 + \' - \' + $node.Node1.data.value2}}',
 							},
-						}
+						},
 					],
-					connections: {}
+					connections: {},
 				},
 				output: {
 					nodes: [
@@ -529,9 +529,9 @@ describe('Workflow', () => {
 								value1: '={{$node.Node1New.data.value1 + \'Node1\'}}',
 								value2: '={{$node.Node1New.data.value2 + \' - \' + $node.Node1New.data.value2}}',
 							},
-						}
+						},
 					],
-					connections: {}
+					connections: {},
 				},
 			},
 		];
@@ -590,16 +590,16 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
 							value1: 'valueNode2',
 						},
-					}
+					},
 				},
 				output: {
-					value1: 'valueNode2'
+					value1: 'valueNode2',
 				},
 			},
 			{
@@ -608,16 +608,16 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: '',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
 							value1: '={{1+2}}',
 						},
-					}
+					},
 				},
 				output: {
-					value1: 3
+					value1: 3,
 				},
 			},
 			{
@@ -626,16 +626,16 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
 							value1: '={{$node.Node1.data.value1}}',
 						},
-					}
+					},
 				},
 				output: {
-					value1: 'valueNode1'
+					value1: 'valueNode1',
 				},
 			},
 			{
@@ -644,16 +644,16 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 1,
-						}
+						},
 					},
 					Node2: {
 						parameters: {
 							value1: '={{$node.Node1.data.value1 + 2}} asdf',
 						},
-					}
+					},
 				},
 				output: {
-					value1: '3 asdf'
+					value1: '3 asdf',
 				},
 			},
 			{
@@ -688,13 +688,13 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
-							value1: '={{$data.value1}}'
+							value1: '={{$data.value1}}',
 						},
-					}
+					},
 				},
 				output: {
 					value1: 'valueNode1',
@@ -765,8 +765,8 @@ describe('Workflow', () => {
 								data: '',
 								type: '',
 								fileName: 'test-file1.jpg',
-							}
-						}
+							},
+						},
 					},
 					Node2: {
 						parameters: {
@@ -791,8 +791,8 @@ describe('Workflow', () => {
 								data: '',
 								type: '',
 								fileName: 'test-file1.jpg',
-							}
-						}
+							},
+						},
 					},
 					Node2: {
 						parameters: {
@@ -810,13 +810,13 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
-							value1: '={{$node.Node1.parameter.value1}}'
+							value1: '={{$node.Node1.parameter.value1}}',
 						},
-					}
+					},
 				},
 				output: {
 					value1: 'valueNode1',
@@ -828,13 +828,13 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
-							value1: '={{$env.TEST_VARIABLE_1}}'
+							value1: '={{$env.TEST_VARIABLE_1}}',
 						},
-					}
+					},
 				},
 				output: {
 					value1: 'valueEnvVariable1',
@@ -846,13 +846,13 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
-							value1: '={{$env.DOES_NOT_EXIST}}'
+							value1: '={{$env.DOES_NOT_EXIST}}',
 						},
-					}
+					},
 				},
 				output: {
 					value1: undefined,
@@ -864,14 +864,14 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
 							value1: 'valueNode2',
 							value2: '={{$parameter.value1}}',
 						},
-					}
+					},
 				},
 				output: {
 					value1: 'valueNode2',
@@ -884,14 +884,14 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
 							value1: '={{$node.Node1.data.value1}}',
 							value2: '={{$parameter.value1}}',
 						},
-					}
+					},
 				},
 				output: {
 					value1: 'valueNode1',
@@ -904,14 +904,14 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
 							value1: '={{$data.value1}}',
 							value2: '={{$parameter.value1}}',
 						},
-					}
+					},
 				},
 				output: {
 					value1: 'valueNode1',
@@ -924,13 +924,13 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
 							value1: '={{$node["Node 4 with spaces"].parameter.value1}}',
 						},
-					}
+					},
 				},
 				output: {
 					value1: 'default-value1',
@@ -942,7 +942,7 @@ describe('Workflow', () => {
 					Node1: {
 						parameters: {
 							value1: 'valueNode1',
-						}
+						},
 					},
 					Node2: {
 						parameters: {
@@ -953,7 +953,7 @@ describe('Workflow', () => {
 						parameters: {
 							value1: '={{$node["Node2"].parameter.value1}}b',
 						},
-					}
+					},
 				},
 				output: {
 					value1: 'valueNode1ab',
@@ -1035,7 +1035,7 @@ describe('Workflow', () => {
 							100,
 							400,
 						],
-					}
+					},
 				];
 				const connections: IConnections = {
 					"Node1": {
@@ -1044,10 +1044,10 @@ describe('Workflow', () => {
 								{
 									"node": "Node2",
 									"type": "main",
-									"index": 0
-								}
-							]
-						]
+									"index": 0,
+								},
+							],
+						],
 					},
 					"Node2": {
 						"main": [
@@ -1055,11 +1055,11 @@ describe('Workflow', () => {
 								{
 									"node": "Node3",
 									"type": "main",
-									"index": 0
-								}
-							]
-						]
-					}
+									"index": 0,
+								},
+							],
+						],
+					},
 				};
 
 				const workflow = new Workflow({ nodes, connections, active: false, nodeTypes });
@@ -1080,15 +1080,15 @@ describe('Workflow', () => {
 													// @ts-ignore
 													json: testData.input.Node1.outputJson || testData.input.Node1.parameters,
 													// @ts-ignore
-													binary: testData.input.Node1.outputBinary
-												}
-											]
-										]
-									}
-								}
-							]
-						}
-					}
+													binary: testData.input.Node1.outputBinary,
+												},
+											],
+										],
+									},
+								},
+							],
+						},
+					},
 				};
 
 				const itemIndex = 0;
@@ -1097,7 +1097,7 @@ describe('Workflow', () => {
 
 				for (const parameterName of Object.keys(testData.output)) {
 					const parameterValue = nodes.find((node) => node.name === activeNodeName)!.parameters[parameterName];
-					const result = workflow.getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData);
+					const result = workflow.expression.getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData);
 					// @ts-ignore
 					expect(result).toEqual(testData.output[parameterName]);
 				}
@@ -1197,14 +1197,14 @@ describe('Workflow', () => {
 							"string": [
 								{
 									"name": "name1",
-									"value": "value1"
+									"value": "value1",
 								},
 								{
 									"name": "name2",
-									"value": "={{$parameter.values.string[0].value}}A"
-								}
-							]
-						}
+									"value": "={{$parameter.values.string[0].value}}A",
+								},
+							],
+						},
 					},
 					"type": "test.setMulti",
 					"typeVersion": 1,
@@ -1231,14 +1231,14 @@ describe('Workflow', () => {
 										[
 											{
 												json: {},
-											}
-										]
-									]
-								}
-							}
-						]
-					}
-				}
+											},
+										],
+									],
+								},
+							},
+						],
+					},
+				},
 			};
 
 			const itemIndex = 0;
@@ -1247,7 +1247,7 @@ describe('Workflow', () => {
 			const parameterName = 'values';
 
 			const parameterValue = nodes.find((node) => node.name === activeNodeName)!.parameters[parameterName];
-			const result = workflow.getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData);
+			const result = workflow.expression.getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData);
 
 			expect(result).toEqual({
 				string: [
@@ -1259,7 +1259,7 @@ describe('Workflow', () => {
 						name: 'name2',
 						value: 'value1A',
 					},
-				]
+				],
 			});
 
 		});
diff --git a/packages/workflow/tslint.json b/packages/workflow/tslint.json
index 7eb9d0110..f03bbfee3 100644
--- a/packages/workflow/tslint.json
+++ b/packages/workflow/tslint.json
@@ -46,6 +46,11 @@
 		"forin": true,
 		"jsdoc-format": true,
 		"label-position": true,
+		"indent": [
+			true,
+			"tabs",
+			2
+		],
 		"member-access": [
 			true,
 			"no-public"
@@ -60,6 +65,13 @@
 		"no-default-export": true,
 		"no-duplicate-variable": true,
 		"no-inferrable-types": true,
+		"ordered-imports": [
+			true,
+			{
+				"import-sources-order": "any",
+				"named-imports-order": "case-insensitive"
+			}
+		],
 		"no-namespace": [
 			true,
 			"allow-declarations"
@@ -82,6 +94,18 @@
 			"ignore-bound-class-methods"
 		],
 		"switch-default": true,
+		"trailing-comma": [
+			true,
+			{
+				"multiline": {
+					"objects": "always",
+					"arrays": "always",
+					"functions": "always",
+					"typeLiterals": "ignore"
+				},
+				"esSpecCompliant": true
+			}
+		],
 		"triple-equals": [
 			true,
 			"allow-null-check"