diff --git a/integration-tests/tools.js b/integration-tests/tools.js
index 821ea7eb..846c2765 100644
--- a/integration-tests/tools.js
+++ b/integration-tests/tools.js
@@ -1,4 +1,8 @@
-global.DBGATE_TOOLS = require('dbgate-tools');
+global.DBGATE_PACKAGES = {
+  'dbgate-tools': require('dbgate-tools'),
+  'dbgate-sqltree': require('dbgate-sqltree'),
+};
+
 const requireEngineDriver = require('dbgate-api/src/utility/requireEngineDriver');
 const crypto = require('crypto');
 
@@ -44,16 +48,18 @@ async function connect(engine, database) {
   }
 }
 
-const testWrapper = body => async (label, ...other) => {
-  const engine = other[other.length - 1];
-  const driver = requireEngineDriver(engine.connection);
-  const conn = await connect(engine, randomDbName());
-  try {
-    await body(conn, driver, ...other);
-  } finally {
-    await driver.close(conn);
-  }
-};
+const testWrapper =
+  body =>
+  async (label, ...other) => {
+    const engine = other[other.length - 1];
+    const driver = requireEngineDriver(engine.connection);
+    const conn = await connect(engine, randomDbName());
+    try {
+      await body(conn, driver, ...other);
+    } finally {
+      await driver.close(conn);
+    }
+  };
 
 module.exports = {
   randomDbName,
diff --git a/integration-tests/wait.js b/integration-tests/wait.js
index ae3a6f09..a61339bb 100644
--- a/integration-tests/wait.js
+++ b/integration-tests/wait.js
@@ -1,7 +1,10 @@
 const requireEngineDriver = require('dbgate-api/src/utility/requireEngineDriver');
 const engines = require('./engines');
 const { extractConnection } = require('./tools');
-global.DBGATE_TOOLS = require('dbgate-tools');
+global.DBGATE_PACKAGES = {
+  'dbgate-tools': require('dbgate-tools'),
+  'dbgate-sqltree': require('dbgate-sqltree'),
+};
 
 async function connectEngine(engine) {
   const connection = extractConnection(engine);
diff --git a/packages/api/src/index.js b/packages/api/src/index.js
index e75101be..4a9f78f2 100644
--- a/packages/api/src/index.js
+++ b/packages/api/src/index.js
@@ -97,10 +97,12 @@ if (processArgs.listenApi) {
 }
 
 const shell = require('./shell/index');
-const dbgateTools = require('dbgate-tools');
 const currentVersion = require('./currentVersion');
 
-global['DBGATE_TOOLS'] = dbgateTools;
+global.DBGATE_PACKAGES = {
+  'dbgate-tools': require('dbgate-tools'),
+  'dbgate-sqltree': require('dbgate-sqltree'),
+};
 
 if (processArgs.startProcess) {
   const proc = require('./proc');
diff --git a/packages/web/src/plugins/PluginsProvider.svelte b/packages/web/src/plugins/PluginsProvider.svelte
index 42a10bce..7524f79e 100644
--- a/packages/web/src/plugins/PluginsProvider.svelte
+++ b/packages/web/src/plugins/PluginsProvider.svelte
@@ -1,6 +1,9 @@
 <script lang="ts" context="module">
   async function loadPlugins(pluginsDict, installedPlugins) {
-    window['DBGATE_TOOLS'] = dbgateTools;
+    window['DBGATE_PACKAGES'] = {
+      'dbgate-tools': dbgateTools,
+      'dbgate-sqltree': sqlTree,
+    };
 
     const newPlugins = {};
     for (const installed of installedPlugins || []) {
@@ -55,6 +58,7 @@
   import { buildFileFormats, buildQuickExports } from './fileformats';
   import { buildThemes } from './themes';
   import * as dbgateTools from 'dbgate-tools';
+  import * as sqlTree from 'dbgate-sqltree';
   import { apiCall } from '../utility/api';
 
   let pluginsDict = {};
diff --git a/plugins/dbgate-plugin-csv/src/backend/writer.js b/plugins/dbgate-plugin-csv/src/backend/writer.js
index bd8e1007..7d62d156 100644
--- a/plugins/dbgate-plugin-csv/src/backend/writer.js
+++ b/plugins/dbgate-plugin-csv/src/backend/writer.js
@@ -2,7 +2,7 @@ const csv = require('csv');
 const fs = require('fs');
 const stream = require('stream');
 
-const { getLogger } = global.DBGATE_TOOLS;
+const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('csvWriter');
 
diff --git a/plugins/dbgate-plugin-csv/webpack-frontend.config.js b/plugins/dbgate-plugin-csv/webpack-frontend.config.js
index e3e28d00..379cb708 100644
--- a/plugins/dbgate-plugin-csv/webpack-frontend.config.js
+++ b/plugins/dbgate-plugin-csv/webpack-frontend.config.js
@@ -17,7 +17,7 @@ var config = {
 
   plugins: [
     new webpack.DefinePlugin({
-      'global.DBGATE_TOOLS': 'window.DBGATE_TOOLS',
+      'global.DBGATE_PACKAGES': 'window.DBGATE_PACKAGES',
     }),
   ],
 
diff --git a/plugins/dbgate-plugin-excel/webpack-frontend.config.js b/plugins/dbgate-plugin-excel/webpack-frontend.config.js
index e3e28d00..379cb708 100644
--- a/plugins/dbgate-plugin-excel/webpack-frontend.config.js
+++ b/plugins/dbgate-plugin-excel/webpack-frontend.config.js
@@ -17,7 +17,7 @@ var config = {
 
   plugins: [
     new webpack.DefinePlugin({
-      'global.DBGATE_TOOLS': 'window.DBGATE_TOOLS',
+      'global.DBGATE_PACKAGES': 'window.DBGATE_PACKAGES',
     }),
   ],
 
diff --git a/plugins/dbgate-plugin-mongo/src/backend/createBulkInsertStream.js b/plugins/dbgate-plugin-mongo/src/backend/createBulkInsertStream.js
index e554d9a0..bfe19cb1 100644
--- a/plugins/dbgate-plugin-mongo/src/backend/createBulkInsertStream.js
+++ b/plugins/dbgate-plugin-mongo/src/backend/createBulkInsertStream.js
@@ -1,5 +1,5 @@
 const ObjectId = require('mongodb').ObjectId;
-const { getLogger } = global.DBGATE_TOOLS;
+const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('mongoBulkInsert');
 
diff --git a/plugins/dbgate-plugin-mongo/src/frontend/Dumper.js b/plugins/dbgate-plugin-mongo/src/frontend/Dumper.js
index 4a405959..f0df62e8 100644
--- a/plugins/dbgate-plugin-mongo/src/frontend/Dumper.js
+++ b/plugins/dbgate-plugin-mongo/src/frontend/Dumper.js
@@ -1,4 +1,4 @@
-const { SqlDumper } = global.DBGATE_TOOLS;
+const { SqlDumper } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 class Dumper extends SqlDumper {}
 
diff --git a/plugins/dbgate-plugin-mongo/src/frontend/driver.js b/plugins/dbgate-plugin-mongo/src/frontend/driver.js
index 897a14ab..4c8b9541 100644
--- a/plugins/dbgate-plugin-mongo/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-mongo/src/frontend/driver.js
@@ -1,4 +1,4 @@
-const { driverBase } = global.DBGATE_TOOLS;
+const { driverBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const { convertToMongoCondition } = require('./convertToMongoCondition');
 const Dumper = require('./Dumper');
 const { mongoSplitterOptions } = require('dbgate-query-splitter/lib/options');
diff --git a/plugins/dbgate-plugin-mongo/webpack-frontend.config.js b/plugins/dbgate-plugin-mongo/webpack-frontend.config.js
index e3e28d00..379cb708 100644
--- a/plugins/dbgate-plugin-mongo/webpack-frontend.config.js
+++ b/plugins/dbgate-plugin-mongo/webpack-frontend.config.js
@@ -17,7 +17,7 @@ var config = {
 
   plugins: [
     new webpack.DefinePlugin({
-      'global.DBGATE_TOOLS': 'window.DBGATE_TOOLS',
+      'global.DBGATE_PACKAGES': 'window.DBGATE_PACKAGES',
     }),
   ],
 
diff --git a/plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js b/plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js
index 78212fc0..f152f155 100644
--- a/plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js
+++ b/plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js
@@ -1,4 +1,4 @@
-const { SqlDumper, testEqualColumns, arrayToHexString } = global.DBGATE_TOOLS;
+const { SqlDumper, testEqualColumns, arrayToHexString } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 class MsSqlDumper extends SqlDumper {
   constructor(driver, options) {
diff --git a/plugins/dbgate-plugin-mssql/src/frontend/driver.js b/plugins/dbgate-plugin-mssql/src/frontend/driver.js
index fe0ab05c..b61f9813 100644
--- a/plugins/dbgate-plugin-mssql/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-mssql/src/frontend/driver.js
@@ -1,4 +1,4 @@
-const { driverBase } = global.DBGATE_TOOLS;
+const { driverBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const MsSqlDumper = require('./MsSqlDumper');
 const { mssqlSplitterOptions } = require('dbgate-query-splitter/lib/options');
 
diff --git a/plugins/dbgate-plugin-mssql/webpack-frontend.config.js b/plugins/dbgate-plugin-mssql/webpack-frontend.config.js
index 8d3b733f..0631d6f2 100644
--- a/plugins/dbgate-plugin-mssql/webpack-frontend.config.js
+++ b/plugins/dbgate-plugin-mssql/webpack-frontend.config.js
@@ -17,7 +17,7 @@ var config = {
 
   plugins: [
     new webpack.DefinePlugin({
-      'global.DBGATE_TOOLS': 'window.DBGATE_TOOLS',
+      'global.DBGATE_PACKAGES': 'window.DBGATE_PACKAGES',
     }),
   ],
 
diff --git a/plugins/dbgate-plugin-mysql/src/backend/drivers.js b/plugins/dbgate-plugin-mysql/src/backend/drivers.js
index 22c7fe6e..27e5abeb 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/drivers.js
@@ -5,7 +5,7 @@ const Analyser = require('./Analyser');
 const mysql2 = require('mysql2');
 const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools');
 const { MySqlDumper } = require('antares-mysql-dumper');
-const { getLogger } = global.DBGATE_TOOLS;
+const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('mysqlDriver');
 
diff --git a/plugins/dbgate-plugin-mysql/src/frontend/Dumper.js b/plugins/dbgate-plugin-mysql/src/frontend/Dumper.js
index 65e870af..8b3ab83a 100644
--- a/plugins/dbgate-plugin-mysql/src/frontend/Dumper.js
+++ b/plugins/dbgate-plugin-mysql/src/frontend/Dumper.js
@@ -1,4 +1,4 @@
-const { SqlDumper, arrayToHexString } = global.DBGATE_TOOLS;
+const { SqlDumper, arrayToHexString } = global.DBGATE_PACKAGES['dbgate-tools'];
 const _isArray = require('lodash/isArray');
 
 class Dumper extends SqlDumper {
diff --git a/plugins/dbgate-plugin-mysql/src/frontend/drivers.js b/plugins/dbgate-plugin-mysql/src/frontend/drivers.js
index 8198e1ed..570e065c 100644
--- a/plugins/dbgate-plugin-mysql/src/frontend/drivers.js
+++ b/plugins/dbgate-plugin-mysql/src/frontend/drivers.js
@@ -1,4 +1,4 @@
-const { driverBase } = global.DBGATE_TOOLS;
+const { driverBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const { mysqlSplitterOptions } = require('dbgate-query-splitter/lib/options');
 const Dumper = require('./Dumper');
 
diff --git a/plugins/dbgate-plugin-mysql/webpack-frontend.config.js b/plugins/dbgate-plugin-mysql/webpack-frontend.config.js
index e3e28d00..379cb708 100644
--- a/plugins/dbgate-plugin-mysql/webpack-frontend.config.js
+++ b/plugins/dbgate-plugin-mysql/webpack-frontend.config.js
@@ -17,7 +17,7 @@ var config = {
 
   plugins: [
     new webpack.DefinePlugin({
-      'global.DBGATE_TOOLS': 'window.DBGATE_TOOLS',
+      'global.DBGATE_PACKAGES': 'window.DBGATE_PACKAGES',
     }),
   ],
 
diff --git a/plugins/dbgate-plugin-oracle/src/frontend/Dumper.js b/plugins/dbgate-plugin-oracle/src/frontend/Dumper.js
index 74b3f0ed..f5bc9c09 100644
--- a/plugins/dbgate-plugin-oracle/src/frontend/Dumper.js
+++ b/plugins/dbgate-plugin-oracle/src/frontend/Dumper.js
@@ -1,4 +1,4 @@
-const { SqlDumper, arrayToHexString, testEqualTypes } = global.DBGATE_TOOLS;
+const { SqlDumper, arrayToHexString, testEqualTypes } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 class Dumper extends SqlDumper {
   createDatabase(name) {
diff --git a/plugins/dbgate-plugin-oracle/src/frontend/driver.js b/plugins/dbgate-plugin-oracle/src/frontend/driver.js
index ebd9bfe8..3d1025c7 100644
--- a/plugins/dbgate-plugin-oracle/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-oracle/src/frontend/driver.js
@@ -1,4 +1,4 @@
-const { driverBase } = global.DBGATE_TOOLS;
+const { driverBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const Dumper = require('./Dumper');
 const { oracleSplitterOptions } = require('dbgate-query-splitter/lib/options');
 
diff --git a/plugins/dbgate-plugin-oracle/webpack-frontend.config.js b/plugins/dbgate-plugin-oracle/webpack-frontend.config.js
index e1c978dd..cbc4a0a5 100644
--- a/plugins/dbgate-plugin-oracle/webpack-frontend.config.js
+++ b/plugins/dbgate-plugin-oracle/webpack-frontend.config.js
@@ -17,7 +17,7 @@ var config = {
 
   plugins: [
     new webpack.DefinePlugin({
-      'global.DBGATE_TOOLS': 'window.DBGATE_TOOLS',
+      'global.DBGATE_PACKAGES': 'window.DBGATE_PACKAGES',
     }),
   ],
 
diff --git a/plugins/dbgate-plugin-postgres/src/backend/drivers.js b/plugins/dbgate-plugin-postgres/src/backend/drivers.js
index 69aad6a7..fe20c196 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/drivers.js
@@ -5,7 +5,7 @@ const driverBases = require('../frontend/drivers');
 const Analyser = require('./Analyser');
 const pg = require('pg');
 const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools');
-const { getLogger } = global.DBGATE_TOOLS;
+const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('postreDriver');
 
diff --git a/plugins/dbgate-plugin-postgres/src/frontend/Dumper.js b/plugins/dbgate-plugin-postgres/src/frontend/Dumper.js
index a3de4f4f..a6aa44d6 100644
--- a/plugins/dbgate-plugin-postgres/src/frontend/Dumper.js
+++ b/plugins/dbgate-plugin-postgres/src/frontend/Dumper.js
@@ -1,4 +1,4 @@
-const { SqlDumper, arrayToHexString, testEqualTypes } = global.DBGATE_TOOLS;
+const { SqlDumper, arrayToHexString, testEqualTypes } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 class Dumper extends SqlDumper {
   /** @param type {import('dbgate-types').TransformType} */
diff --git a/plugins/dbgate-plugin-postgres/src/frontend/drivers.js b/plugins/dbgate-plugin-postgres/src/frontend/drivers.js
index 2754f5ed..0354bccb 100644
--- a/plugins/dbgate-plugin-postgres/src/frontend/drivers.js
+++ b/plugins/dbgate-plugin-postgres/src/frontend/drivers.js
@@ -1,4 +1,4 @@
-const { driverBase } = global.DBGATE_TOOLS;
+const { driverBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const Dumper = require('./Dumper');
 const { postgreSplitterOptions } = require('dbgate-query-splitter/lib/options');
 
diff --git a/plugins/dbgate-plugin-postgres/webpack-frontend.config.js b/plugins/dbgate-plugin-postgres/webpack-frontend.config.js
index e1c978dd..cbc4a0a5 100644
--- a/plugins/dbgate-plugin-postgres/webpack-frontend.config.js
+++ b/plugins/dbgate-plugin-postgres/webpack-frontend.config.js
@@ -17,7 +17,7 @@ var config = {
 
   plugins: [
     new webpack.DefinePlugin({
-      'global.DBGATE_TOOLS': 'window.DBGATE_TOOLS',
+      'global.DBGATE_PACKAGES': 'window.DBGATE_PACKAGES',
     }),
   ],
 
diff --git a/plugins/dbgate-plugin-redis/src/frontend/driver.js b/plugins/dbgate-plugin-redis/src/frontend/driver.js
index a7f50526..df2f7f5f 100644
--- a/plugins/dbgate-plugin-redis/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-redis/src/frontend/driver.js
@@ -1,4 +1,4 @@
-const { driverBase } = global.DBGATE_TOOLS;
+const { driverBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const { redisSplitterOptions } = require('dbgate-query-splitter/lib/options');
 const Dumper = require('./Dumper');
 
diff --git a/plugins/dbgate-plugin-sqlite/src/backend/driver.js b/plugins/dbgate-plugin-sqlite/src/backend/driver.js
index 25b530ca..53ffe504 100644
--- a/plugins/dbgate-plugin-sqlite/src/backend/driver.js
+++ b/plugins/dbgate-plugin-sqlite/src/backend/driver.js
@@ -4,7 +4,7 @@ const driverBase = require('../frontend/driver');
 const Analyser = require('./Analyser');
 const { splitQuery, sqliteSplitterOptions } = require('dbgate-query-splitter');
 const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools');
-const { getLogger } = global.DBGATE_TOOLS;
+const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('sqliteDriver');
 
diff --git a/plugins/dbgate-plugin-sqlite/src/frontend/Dumper.js b/plugins/dbgate-plugin-sqlite/src/frontend/Dumper.js
index d2aa90e5..299e96ca 100644
--- a/plugins/dbgate-plugin-sqlite/src/frontend/Dumper.js
+++ b/plugins/dbgate-plugin-sqlite/src/frontend/Dumper.js
@@ -1,4 +1,4 @@
-const { SqlDumper, arrayToHexString } = global.DBGATE_TOOLS;
+const { SqlDumper, arrayToHexString } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 class Dumper extends SqlDumper {
   renameColumn(column, newcol) {
diff --git a/plugins/dbgate-plugin-sqlite/src/frontend/driver.js b/plugins/dbgate-plugin-sqlite/src/frontend/driver.js
index fbf78dcf..b804c664 100644
--- a/plugins/dbgate-plugin-sqlite/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-sqlite/src/frontend/driver.js
@@ -1,4 +1,4 @@
-const { driverBase } = global.DBGATE_TOOLS;
+const { driverBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const Dumper = require('./Dumper');
 const { sqliteSplitterOptions, noSplitSplitterOptions } = require('dbgate-query-splitter/lib/options');
 
diff --git a/plugins/dbgate-plugin-sqlite/webpack-frontend.config.js b/plugins/dbgate-plugin-sqlite/webpack-frontend.config.js
index e1c978dd..cbc4a0a5 100644
--- a/plugins/dbgate-plugin-sqlite/webpack-frontend.config.js
+++ b/plugins/dbgate-plugin-sqlite/webpack-frontend.config.js
@@ -17,7 +17,7 @@ var config = {
 
   plugins: [
     new webpack.DefinePlugin({
-      'global.DBGATE_TOOLS': 'window.DBGATE_TOOLS',
+      'global.DBGATE_PACKAGES': 'window.DBGATE_PACKAGES',
     }),
   ],
 
diff --git a/plugins/dbgate-plugin-xml/src/backend/reader.js b/plugins/dbgate-plugin-xml/src/backend/reader.js
index 4b035b7e..e374ea06 100644
--- a/plugins/dbgate-plugin-xml/src/backend/reader.js
+++ b/plugins/dbgate-plugin-xml/src/backend/reader.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 const stream = require('stream');
 const NodeXmlStream = require('node-xml-stream-parser');
-const { getLogger } = global.DBGATE_TOOLS;
+const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('xmlReader');
 
diff --git a/plugins/dbgate-plugin-xml/src/backend/writer.js b/plugins/dbgate-plugin-xml/src/backend/writer.js
index 29009da9..66787883 100644
--- a/plugins/dbgate-plugin-xml/src/backend/writer.js
+++ b/plugins/dbgate-plugin-xml/src/backend/writer.js
@@ -1,6 +1,6 @@
 const fs = require('fs');
 const stream = require('stream');
-const { getLogger } = global.DBGATE_TOOLS;
+const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('xmlWriter');