diff --git a/webapp/packages/core-administration/package.json b/webapp/packages/core-administration/package.json
index 354683b744..23bb679dda 100644
--- a/webapp/packages/core-administration/package.json
+++ b/webapp/packages/core-administration/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-administration/tsconfig.json b/webapp/packages/core-administration/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/core-administration/tsconfig.json
+++ b/webapp/packages/core-administration/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-app/package.json b/webapp/packages/core-app/package.json
index 2d6ceaddc8..1662b95424 100644
--- a/webapp/packages/core-app/package.json
+++ b/webapp/packages/core-app/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-app/tsconfig.json b/webapp/packages/core-app/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/core-app/tsconfig.json
+++ b/webapp/packages/core-app/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-authentication/package.json b/webapp/packages/core-authentication/package.json
index 8c5350318e..d16d152b4b 100644
--- a/webapp/packages/core-authentication/package.json
+++ b/webapp/packages/core-authentication/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-authentication/tsconfig.json b/webapp/packages/core-authentication/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/core-authentication/tsconfig.json
+++ b/webapp/packages/core-authentication/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json
index d66fa9fcc3..85b9944eff 100644
--- a/webapp/packages/core-blocks/package.json
+++ b/webapp/packages/core-blocks/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-blocks/tsconfig.json b/webapp/packages/core-blocks/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-blocks/tsconfig.json
+++ b/webapp/packages/core-blocks/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-bootstrap/package.json b/webapp/packages/core-bootstrap/package.json
index 0ba9946b99..f0cfdbd0a3 100644
--- a/webapp/packages/core-bootstrap/package.json
+++ b/webapp/packages/core-bootstrap/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-bootstrap/tsconfig.json b/webapp/packages/core-bootstrap/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-bootstrap/tsconfig.json
+++ b/webapp/packages/core-bootstrap/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-connections/package.json b/webapp/packages/core-connections/package.json
index 19a865c328..f27a3f5b20 100644
--- a/webapp/packages/core-connections/package.json
+++ b/webapp/packages/core-connections/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-connections/tsconfig.json b/webapp/packages/core-connections/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-connections/tsconfig.json
+++ b/webapp/packages/core-connections/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-di/package.json b/webapp/packages/core-di/package.json
index 4887d9f29e..4207f24545 100644
--- a/webapp/packages/core-di/package.json
+++ b/webapp/packages/core-di/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-di/tsconfig.json b/webapp/packages/core-di/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-di/tsconfig.json
+++ b/webapp/packages/core-di/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-dialogs/package.json b/webapp/packages/core-dialogs/package.json
index 8fa977ac88..15ed52ed09 100644
--- a/webapp/packages/core-dialogs/package.json
+++ b/webapp/packages/core-dialogs/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-dialogs/tsconfig.json b/webapp/packages/core-dialogs/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-dialogs/tsconfig.json
+++ b/webapp/packages/core-dialogs/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-events/package.json b/webapp/packages/core-events/package.json
index 3e8e0c62a0..cb357ca7da 100644
--- a/webapp/packages/core-events/package.json
+++ b/webapp/packages/core-events/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-events/tsconfig.json b/webapp/packages/core-events/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-events/tsconfig.json
+++ b/webapp/packages/core-events/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-executor/package.json b/webapp/packages/core-executor/package.json
index 9ec4d96474..6ed891c4ae 100644
--- a/webapp/packages/core-executor/package.json
+++ b/webapp/packages/core-executor/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-executor/tsconfig.json b/webapp/packages/core-executor/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-executor/tsconfig.json
+++ b/webapp/packages/core-executor/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-extensions/package.json b/webapp/packages/core-extensions/package.json
index 4e77810088..554b09bc09 100644
--- a/webapp/packages/core-extensions/package.json
+++ b/webapp/packages/core-extensions/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-extensions/tsconfig.json b/webapp/packages/core-extensions/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-extensions/tsconfig.json
+++ b/webapp/packages/core-extensions/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-localization/package.json b/webapp/packages/core-localization/package.json
index a8d1663b61..53efa8f5f0 100644
--- a/webapp/packages/core-localization/package.json
+++ b/webapp/packages/core-localization/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-localization/tsconfig.json b/webapp/packages/core-localization/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-localization/tsconfig.json
+++ b/webapp/packages/core-localization/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-notifications/package.json b/webapp/packages/core-notifications/package.json
index 4c2f823dbe..7cdc5a4309 100644
--- a/webapp/packages/core-notifications/package.json
+++ b/webapp/packages/core-notifications/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-notifications/tsconfig.json b/webapp/packages/core-notifications/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-notifications/tsconfig.json
+++ b/webapp/packages/core-notifications/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-plugin/package.json b/webapp/packages/core-plugin/package.json
index 45a3d69f75..b5e4b86f6a 100644
--- a/webapp/packages/core-plugin/package.json
+++ b/webapp/packages/core-plugin/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-plugin/tsconfig.json b/webapp/packages/core-plugin/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-plugin/tsconfig.json
+++ b/webapp/packages/core-plugin/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-product/package.json b/webapp/packages/core-product/package.json
index 4341ad1cbe..4cbad0f483 100644
--- a/webapp/packages/core-product/package.json
+++ b/webapp/packages/core-product/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-product/tsconfig.json b/webapp/packages/core-product/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-product/tsconfig.json
+++ b/webapp/packages/core-product/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-root/package.json b/webapp/packages/core-root/package.json
index c9ef21a249..5b49e5c447 100644
--- a/webapp/packages/core-root/package.json
+++ b/webapp/packages/core-root/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-root/tsconfig.json b/webapp/packages/core-root/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-root/tsconfig.json
+++ b/webapp/packages/core-root/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-routing/package.json b/webapp/packages/core-routing/package.json
index 8c6727df74..bd6e88fbe9 100644
--- a/webapp/packages/core-routing/package.json
+++ b/webapp/packages/core-routing/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-routing/tsconfig.json b/webapp/packages/core-routing/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/core-routing/tsconfig.json
+++ b/webapp/packages/core-routing/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-sdk/package.json b/webapp/packages/core-sdk/package.json
index 0574304c40..df354a188f 100644
--- a/webapp/packages/core-sdk/package.json
+++ b/webapp/packages/core-sdk/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-sdk/tsconfig.json b/webapp/packages/core-sdk/tsconfig.json
index 057c46aabe..39aa1b0e0e 100644
--- a/webapp/packages/core-sdk/tsconfig.json
+++ b/webapp/packages/core-sdk/tsconfig.json
@@ -4,11 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": [
-    "src/**/*",
-    "src/types.d.ts"
-  ]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-settings/package.json b/webapp/packages/core-settings/package.json
index a19dc14a67..f2417676dd 100644
--- a/webapp/packages/core-settings/package.json
+++ b/webapp/packages/core-settings/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-settings/tsconfig.json b/webapp/packages/core-settings/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-settings/tsconfig.json
+++ b/webapp/packages/core-settings/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-theming/package.json b/webapp/packages/core-theming/package.json
index 264588f6c0..64be2cf4d6 100644
--- a/webapp/packages/core-theming/package.json
+++ b/webapp/packages/core-theming/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-theming/tsconfig.json b/webapp/packages/core-theming/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-theming/tsconfig.json
+++ b/webapp/packages/core-theming/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-utils/package.json b/webapp/packages/core-utils/package.json
index 9927e459b8..0547bad1fe 100644
--- a/webapp/packages/core-utils/package.json
+++ b/webapp/packages/core-utils/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-utils/tsconfig.json b/webapp/packages/core-utils/tsconfig.json
index b352fb539e..39aa1b0e0e 100644
--- a/webapp/packages/core-utils/tsconfig.json
+++ b/webapp/packages/core-utils/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    // "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/core-view/package.json b/webapp/packages/core-view/package.json
index 8231993794..7eef7c544f 100644
--- a/webapp/packages/core-view/package.json
+++ b/webapp/packages/core-view/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/core-view/tsconfig.json b/webapp/packages/core-view/tsconfig.json
index 4422c9f539..39aa1b0e0e 100644
--- a/webapp/packages/core-view/tsconfig.json
+++ b/webapp/packages/core-view/tsconfig.json
@@ -6,7 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": [
-    "src/**/*"
-  ]
-}
\ No newline at end of file
+  "include": ["src"]
+}
diff --git a/webapp/packages/plugin-authentication/package.json b/webapp/packages/plugin-authentication/package.json
index 69d54179c8..db3d5c6c17 100644
--- a/webapp/packages/plugin-authentication/package.json
+++ b/webapp/packages/plugin-authentication/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministration.tsx b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministration.tsx
index 736d0831c7..ca6eea6e25 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministration.tsx
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministration.tsx
@@ -16,6 +16,7 @@ import { useStyles, composes } from '@cloudbeaver/core-theming';
 
 import { CreateUser } from './CreateUser';
 import { UsersAdministrationController } from './UsersAdministrationController';
+import { UsersAdministrationNavigationService } from './UsersAdministrationNavigationService';
 import { UsersTable } from './UsersTable/UsersTable';
 
 const styles = composes(
@@ -61,6 +62,10 @@ export const UsersAdministration = observer(function UsersAdministration({
 }: AdministrationItemContentProps) {
   const controller = useController(UsersAdministrationController);
 
+  if (sub?.name === UsersAdministrationNavigationService.AddItemName) {
+    controller.create();
+  }
+
   return styled(useStyles(styles))(
     <layout-grid as="div">
       <layout-grid-inner as="div">
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
index 351e00765a..a11becaa35 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationController.ts
@@ -51,6 +51,10 @@ export class UsersAdministrationController {
   ) { }
 
   create = () => {
+    if (this.creatingUser) {
+      return;
+    }
+
     this.creatingUser = {
       userId: '',
       grantedRoles: [],
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationService.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationService.ts
index 9078aaa62c..33fe5b0840 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationService.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersAdministrationService.ts
@@ -32,7 +32,6 @@ export class UsersAdministrationService extends Bootstrap {
       sub: [
         {
           name: UsersAdministrationNavigationService.AddItemName,
-          onActivate: this.onCreateActivate.bind(this),
         },
       ],
       getContentComponent: () => UsersAdministration,
@@ -43,13 +42,6 @@ export class UsersAdministrationService extends Bootstrap {
 
   load(): void | Promise<void> { }
 
-  private onCreateActivate() {
-    if (!Array.from(this.usersResource.data.values())
-      .some(user => this.usersResource.isNew(user.userId))) {
-      this.usersResource.addNew();
-    }
-  }
-
   private async loadUsers() {
     try {
       await this.usersResource.loadAll();
diff --git a/webapp/packages/plugin-authentication/tsconfig.json b/webapp/packages/plugin-authentication/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/plugin-authentication/tsconfig.json
+++ b/webapp/packages/plugin-authentication/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/plugin-connection-custom/package.json b/webapp/packages/plugin-connection-custom/package.json
index 5f40c47d14..fbbca60e2e 100644
--- a/webapp/packages/plugin-connection-custom/package.json
+++ b/webapp/packages/plugin-connection-custom/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-connection-custom/tsconfig.json b/webapp/packages/plugin-connection-custom/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/plugin-connection-custom/tsconfig.json
+++ b/webapp/packages/plugin-connection-custom/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/plugin-connection-template/package.json b/webapp/packages/plugin-connection-template/package.json
index c0fd94684e..83f3f23338 100644
--- a/webapp/packages/plugin-connection-template/package.json
+++ b/webapp/packages/plugin-connection-template/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-connection-template/tsconfig.json b/webapp/packages/plugin-connection-template/tsconfig.json
index 0395a9eb91..39aa1b0e0e 100644
--- a/webapp/packages/plugin-connection-template/tsconfig.json
+++ b/webapp/packages/plugin-connection-template/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "lib"
   },
   "exclude": [
-    "node_modules",
-    "@cloudbeaver/**"
+    "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/plugin-data-export/package.json b/webapp/packages/plugin-data-export/package.json
index f7b36bec03..058ac436cd 100644
--- a/webapp/packages/plugin-data-export/package.json
+++ b/webapp/packages/plugin-data-export/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ProcessorItem.tsx b/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ProcessorItem.tsx
index 83fd32290c..96b276f9b8 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ProcessorItem.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/ExportProcessorList/ProcessorItem.tsx
@@ -8,8 +8,11 @@
 
 import { observer } from 'mobx-react';
 import { useCallback } from 'react';
+import styled, { css } from 'reshadow';
 
-import { ListItem } from '@cloudbeaver/core-blocks';
+import {
+  ListItem, ListItemIcon, StaticImage, ListItemName, ListItemDescription
+} from '@cloudbeaver/core-blocks';
 import { DataTransferProcessorInfo } from '@cloudbeaver/core-sdk';
 
 type ProcessorItemProps = {
@@ -17,10 +20,25 @@ type ProcessorItemProps = {
   onSelect(processorId: string): void;
 }
 
+const styles = css`
+    StaticImage {
+      box-sizing: border-box;
+      width: 24px;
+      max-height: 24px;
+    }
+  `;
+
 export const ProcessorItem = observer(function ProcessorItem({
   processor,
   onSelect,
 }: ProcessorItemProps) {
   const select = useCallback(() => onSelect(processor.id), [processor]);
-  return <ListItem icon={processor.icon} name={processor.name} description={processor.description} onClick={select}/>;
+
+  return styled(styles)(
+    <ListItem onClick={select}>
+      <ListItemIcon><StaticImage icon={processor.icon}/></ListItemIcon>
+      <ListItemName>{processor.name}</ListItemName>
+      <ListItemDescription title={processor.description}>{processor.description}</ListItemDescription>
+    </ListItem>
+  );
 });
diff --git a/webapp/packages/plugin-data-export/tsconfig.json b/webapp/packages/plugin-data-export/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/plugin-data-export/tsconfig.json
+++ b/webapp/packages/plugin-data-export/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/plugin-data-spreadsheet/package.json b/webapp/packages/plugin-data-spreadsheet/package.json
index 63102179fa..6b83dedabb 100644
--- a/webapp/packages/plugin-data-spreadsheet/package.json
+++ b/webapp/packages/plugin-data-spreadsheet/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-data-spreadsheet/tsconfig.json b/webapp/packages/plugin-data-spreadsheet/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/plugin-data-spreadsheet/tsconfig.json
+++ b/webapp/packages/plugin-data-spreadsheet/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/plugin-data-viewer/package.json b/webapp/packages/plugin-data-viewer/package.json
index 56dbb4aa7b..0acce05a5a 100644
--- a/webapp/packages/plugin-data-viewer/package.json
+++ b/webapp/packages/plugin-data-viewer/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
index 18550bbfed..a02de34885 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
@@ -9,13 +9,13 @@
 import {
   NavNodeManagerService,
   INodeNavigationData,
-  IContextProvider,
   ITab,
   NavigationType,
   NodeManagerUtils,
 } from '@cloudbeaver/core-app';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
+import { IContextProvider } from '@cloudbeaver/core-executor';
 import {
   DBObjectPageService, ObjectPage, ObjectViewerTabService, IObjectViewerTabState
 } from '@cloudbeaver/plugin-object-viewer';
diff --git a/webapp/packages/plugin-data-viewer/tsconfig.json b/webapp/packages/plugin-data-viewer/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/plugin-data-viewer/tsconfig.json
+++ b/webapp/packages/plugin-data-viewer/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/plugin-ddl-viewer/package.json b/webapp/packages/plugin-ddl-viewer/package.json
index d20be99358..7e27a403dd 100644
--- a/webapp/packages/plugin-ddl-viewer/package.json
+++ b/webapp/packages/plugin-ddl-viewer/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts
index 4d848daa9b..82fc26808a 100644
--- a/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts
+++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts
@@ -7,11 +7,12 @@
  */
 
 import {
-  EObjectFeature, NavNodeManagerService, IContextProvider, INodeNavigationData
+  EObjectFeature, NavNodeManagerService, INodeNavigationData
 } from '@cloudbeaver/core-app';
 import { ITab } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
+import { IContextProvider } from '@cloudbeaver/core-executor';
 import { ObjectViewerTabService } from '@cloudbeaver/plugin-object-viewer';
 
 import { ddlViewer } from './DdlViewer/DdlViewer';
diff --git a/webapp/packages/plugin-ddl-viewer/tsconfig.json b/webapp/packages/plugin-ddl-viewer/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/plugin-ddl-viewer/tsconfig.json
+++ b/webapp/packages/plugin-ddl-viewer/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/plugin-object-viewer/package.json b/webapp/packages/plugin-object-viewer/package.json
index f48e177847..385bcd130d 100644
--- a/webapp/packages/plugin-object-viewer/package.json
+++ b/webapp/packages/plugin-object-viewer/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageService.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageService.ts
index dd2743e991..f8ea4774b7 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageService.ts
@@ -7,10 +7,11 @@
  */
 
 import {
-  NavNodeManagerService, ITab, IContextProvider, INodeNavigationData
+  NavNodeManagerService, ITab, INodeNavigationData
 } from '@cloudbeaver/core-app';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
+import { IContextProvider } from '@cloudbeaver/core-executor';
 
 import { IObjectViewerTabState } from '../IObjectViewerTabState';
 import { DBObjectPageService } from '../ObjectPage/DBObjectPageService';
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
index ab7bcb77af..e31d8016a3 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
@@ -9,7 +9,6 @@
 import {
   NavigationTabsService,
   INodeNavigationData,
-  IContextProvider,
   ITab,
   TabHandler,
   NavigationType,
@@ -22,6 +21,7 @@ import {
 import { connectionProvider, ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
+import { IContextProvider } from '@cloudbeaver/core-executor';
 import { ResourceKey, resourceKeyList, isResourceKeyList } from '@cloudbeaver/core-sdk';
 
 import { IObjectViewerTabContext } from './IObjectViewerTabContext';
diff --git a/webapp/packages/plugin-object-viewer/tsconfig.json b/webapp/packages/plugin-object-viewer/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/plugin-object-viewer/tsconfig.json
+++ b/webapp/packages/plugin-object-viewer/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/plugin-sql-editor/package.json b/webapp/packages/plugin-sql-editor/package.json
index c15f5a503f..eafc083020 100644
--- a/webapp/packages/plugin-sql-editor/package.json
+++ b/webapp/packages/plugin-sql-editor/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.plugin.config",
diff --git a/webapp/packages/plugin-sql-editor/tsconfig.json b/webapp/packages/plugin-sql-editor/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/plugin-sql-editor/tsconfig.json
+++ b/webapp/packages/plugin-sql-editor/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json
index f281f20484..059320e006 100644
--- a/webapp/packages/product-default/package.json
+++ b/webapp/packages/product-default/package.json
@@ -6,6 +6,7 @@
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "lib/index.js",
+  "types": "src/index.ts",
   "scripts": {
     "prebuild": "rimraf lib/*",
     "build": "webpack --config ../../configs/webpack.product.config",
diff --git a/webapp/packages/product-default/tsconfig.json b/webapp/packages/product-default/tsconfig.json
index b0b5e9edfa..39aa1b0e0e 100644
--- a/webapp/packages/product-default/tsconfig.json
+++ b/webapp/packages/product-default/tsconfig.json
@@ -6,5 +6,5 @@
   "exclude": [
     "node_modules"
   ],
-  "include": ["src/**/*"]
+  "include": ["src"]
 }
diff --git a/webapp/tsconfig.json b/webapp/tsconfig.json
index 9815ee2809..423fdc292f 100644
--- a/webapp/tsconfig.json
+++ b/webapp/tsconfig.json
@@ -8,7 +8,6 @@
     "lib"
   ],
   "compilerOptions": {
-    "baseUrl": ".",
     "allowUnreachableCode": false,
     "allowSyntheticDefaultImports": true,
     "allowJs": true,
@@ -37,9 +36,6 @@
     "strict": true,
     "skipLibCheck": true,
     "strictNullChecks": true,
-    "paths": {
-      "@cloudbeaver/*": ["./node_modules/@cloudbeaver/*/src"]
-    },
     "types": [
       "reflect-metadata",
       "node"