diff --git a/plugins/dbgate-plugin-mongo/src/backend/Analyser.js b/plugins/dbgate-plugin-mongo/src/backend/Analyser.js
index 5c87fb305..88843f0f8 100644
--- a/plugins/dbgate-plugin-mongo/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-mongo/src/backend/Analyser.js
@@ -1,4 +1,4 @@
-const { DatabaseAnalyser } = require('dbgate-tools');
+const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 class Analyser extends DatabaseAnalyser {
   constructor(pool, driver, version) {
diff --git a/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js b/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js
index 6be71c47b..3942b03c4 100644
--- a/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js
+++ b/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js
@@ -2,8 +2,7 @@ const fp = require('lodash/fp');
 const _ = require('lodash');
 const sql = require('./sql');
 
-const { DatabaseAnalyser } = require('dbgate-tools');
-const { isTypeString, isTypeNumeric } = require('dbgate-tools');
+const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 function objectTypeToField(type) {
   switch (type.trim()) {
diff --git a/plugins/dbgate-plugin-mssql/src/backend/createNativeBulkInsertStream.js b/plugins/dbgate-plugin-mssql/src/backend/createNativeBulkInsertStream.js
index 03930bf0f..093c05881 100644
--- a/plugins/dbgate-plugin-mssql/src/backend/createNativeBulkInsertStream.js
+++ b/plugins/dbgate-plugin-mssql/src/backend/createNativeBulkInsertStream.js
@@ -1,4 +1,4 @@
-const { createBulkInsertStreamBase } = require('dbgate-tools');
+const { createBulkInsertStreamBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 function runBulkInsertBatch(pool, tableName, writable, rows) {
   return new Promise((resolve, reject) => {
diff --git a/plugins/dbgate-plugin-mssql/src/backend/createTediousBulkInsertStream.js b/plugins/dbgate-plugin-mssql/src/backend/createTediousBulkInsertStream.js
index 6c2967378..2c2c057b0 100644
--- a/plugins/dbgate-plugin-mssql/src/backend/createTediousBulkInsertStream.js
+++ b/plugins/dbgate-plugin-mssql/src/backend/createTediousBulkInsertStream.js
@@ -1,4 +1,4 @@
-const { createBulkInsertStreamBase } = require('dbgate-tools');
+const { createBulkInsertStreamBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const tedious = require('tedious');
 const getConcreteType = require('./getConcreteType');
 const _ = require('lodash');
diff --git a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
index e87bd52b8..90a9efde4 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
@@ -2,8 +2,7 @@ const fp = require('lodash/fp');
 const _ = require('lodash');
 const sql = require('./sql');
 
-const { DatabaseAnalyser } = require('dbgate-tools');
-const { isTypeString, isTypeNumeric } = require('dbgate-tools');
+const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 function quoteDefaultValue(value) {
   if (value == null) return value;
diff --git a/plugins/dbgate-plugin-mysql/src/backend/drivers.js b/plugins/dbgate-plugin-mysql/src/backend/drivers.js
index 27e5abeb4..fafb327b9 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/drivers.js
@@ -3,9 +3,8 @@ const stream = require('stream');
 const driverBases = require('../frontend/drivers');
 const Analyser = require('./Analyser');
 const mysql2 = require('mysql2');
-const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools');
+const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];
 const { MySqlDumper } = require('antares-mysql-dumper');
-const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('mysqlDriver');
 
diff --git a/plugins/dbgate-plugin-oracle/src/backend/Analyser.js b/plugins/dbgate-plugin-oracle/src/backend/Analyser.js
index 7006877eb..c8c314bbd 100644
--- a/plugins/dbgate-plugin-oracle/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-oracle/src/backend/Analyser.js
@@ -2,8 +2,7 @@ const fp = require('lodash/fp');
 const _ = require('lodash');
 const sql = require('./sql');
 
-const { DatabaseAnalyser } = require('dbgate-tools');
-const { isTypeString, isTypeNumeric } = require('dbgate-tools');
+const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 function normalizeTypeName(dataType) {
   if (dataType == 'character varying') return 'varchar';
diff --git a/plugins/dbgate-plugin-oracle/src/backend/createOracleBulkInsertStream.js b/plugins/dbgate-plugin-oracle/src/backend/createOracleBulkInsertStream.js
index 188761861..dac1cf56d 100644
--- a/plugins/dbgate-plugin-oracle/src/backend/createOracleBulkInsertStream.js
+++ b/plugins/dbgate-plugin-oracle/src/backend/createOracleBulkInsertStream.js
@@ -1,4 +1,4 @@
-const { createBulkInsertStreamBase } = require('dbgate-tools');
+const { createBulkInsertStreamBase } = global.DBGATE_PACKAGES['dbgate-tools'];
 const _ = require('lodash');
 
 /**
diff --git a/plugins/dbgate-plugin-oracle/src/backend/driver.js b/plugins/dbgate-plugin-oracle/src/backend/driver.js
index 8d50b394e..e57e867ad 100644
--- a/plugins/dbgate-plugin-oracle/src/backend/driver.js
+++ b/plugins/dbgate-plugin-oracle/src/backend/driver.js
@@ -3,7 +3,7 @@ const stream = require('stream');
 
 const driverBase = require('../frontend/driver');
 const Analyser = require('./Analyser');
-const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools');
+const { createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];
 const createOracleBulkInsertStream = require('./createOracleBulkInsertStream');
 const { platform } = require('os');
 
diff --git a/plugins/dbgate-plugin-oracle/src/frontend/driver.js b/plugins/dbgate-plugin-oracle/src/frontend/driver.js
index 3d1025c7f..cfe388c9d 100644
--- a/plugins/dbgate-plugin-oracle/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-oracle/src/frontend/driver.js
@@ -84,6 +84,7 @@ const dialect = {
 
 /** @type {import('dbgate-types').EngineDriver} */
 const oracleDriver = {
+  ...driverBase,
   engine: 'oracle@dbgate-plugin-oracle',
   title: 'OracleDB',
   defaultPort: 1521,
diff --git a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
index 646642d53..f5153af8e 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
@@ -2,8 +2,7 @@ const fp = require('lodash/fp');
 const _ = require('lodash');
 const sql = require('./sql');
 
-const { DatabaseAnalyser } = require('dbgate-tools');
-const { isTypeString, isTypeNumeric } = require('dbgate-tools');
+const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 function normalizeTypeName(dataType) {
   if (dataType == 'character varying') return 'varchar';
diff --git a/plugins/dbgate-plugin-postgres/src/backend/drivers.js b/plugins/dbgate-plugin-postgres/src/backend/drivers.js
index fe20c196c..9fdc49f9b 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/drivers.js
@@ -4,8 +4,7 @@ const stream = require('stream');
 const driverBases = require('../frontend/drivers');
 const Analyser = require('./Analyser');
 const pg = require('pg');
-const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools');
-const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
+const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];;
 
 const logger = getLogger('postreDriver');
 
diff --git a/plugins/dbgate-plugin-redis/src/backend/Analyser.js b/plugins/dbgate-plugin-redis/src/backend/Analyser.js
index 3e176ddc2..37749ff72 100644
--- a/plugins/dbgate-plugin-redis/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-redis/src/backend/Analyser.js
@@ -1,4 +1,4 @@
-const { DatabaseAnalyser } = require('dbgate-tools');
+const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools'];;
 
 class Analyser extends DatabaseAnalyser {
   constructor(pool, driver) {
diff --git a/plugins/dbgate-plugin-redis/src/backend/driver.js b/plugins/dbgate-plugin-redis/src/backend/driver.js
index 307cc7df6..576d3c213 100644
--- a/plugins/dbgate-plugin-redis/src/backend/driver.js
+++ b/plugins/dbgate-plugin-redis/src/backend/driver.js
@@ -5,7 +5,7 @@ const driverBase = require('../frontend/driver');
 const Analyser = require('./Analyser');
 const Redis = require('ioredis');
 const RedisDump = require('node-redis-dump2');
-const { filterName } = require('dbgate-tools');
+const { filterName } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 function splitCommandLine(str) {
   let results = [];
diff --git a/plugins/dbgate-plugin-redis/src/frontend/Dumper.js b/plugins/dbgate-plugin-redis/src/frontend/Dumper.js
index afcc64731..423ac7993 100644
--- a/plugins/dbgate-plugin-redis/src/frontend/Dumper.js
+++ b/plugins/dbgate-plugin-redis/src/frontend/Dumper.js
@@ -1,4 +1,4 @@
-const { SqlDumper } = require('dbgate-tools');
+const { SqlDumper } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 class Dumper extends SqlDumper {
 }
diff --git a/plugins/dbgate-plugin-sqlite/src/backend/Analyser.js b/plugins/dbgate-plugin-sqlite/src/backend/Analyser.js
index 1aefdae92..d699b497f 100644
--- a/plugins/dbgate-plugin-sqlite/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-sqlite/src/backend/Analyser.js
@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const { DatabaseAnalyser } = require('dbgate-tools');
+const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools'];;
 
 const indexcolsQuery = `
 SELECT 
diff --git a/plugins/dbgate-plugin-sqlite/src/backend/driver.js b/plugins/dbgate-plugin-sqlite/src/backend/driver.js
index 53ffe504b..378bd2fdf 100644
--- a/plugins/dbgate-plugin-sqlite/src/backend/driver.js
+++ b/plugins/dbgate-plugin-sqlite/src/backend/driver.js
@@ -3,8 +3,7 @@ const stream = require('stream');
 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_PACKAGES['dbgate-tools'];
+const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];
 
 const logger = getLogger('sqliteDriver');