diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
index 5ca711678b..ac154189aa 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -26,7 +26,6 @@
 import io.cloudbeaver.server.jetty.CBJettyServer;
 import io.cloudbeaver.service.DBWServiceInitializer;
 import io.cloudbeaver.service.DBWServiceServerConfigurator;
-import io.cloudbeaver.service.security.CBEmbeddedSecurityController;
 import io.cloudbeaver.service.security.SMControllerConfiguration;
 import io.cloudbeaver.service.session.WebSessionManager;
 import io.cloudbeaver.utils.WebDataSourceUtils;
@@ -95,7 +94,8 @@ public abstract class CBApplication<T extends CBServerConfig> extends BaseWebApp
     public static CBApplication getInstance() {
         return (CBApplication) BaseApplicationImpl.getInstance();
     }
-    private File homeDirectory;
+
+    private final File homeDirectory;
 
     // Persistence
     protected SMAdminController securityController;
@@ -109,6 +109,7 @@ public static CBApplication getInstance() {
     private WebSessionManager sessionManager;
 
     public CBApplication() {
+        this.homeDirectory = new File(initHomeFolder());
     }
 
     public String getServerURL() {
@@ -185,7 +186,7 @@ public Map<String, Object> getProductConfiguration() {
     }
 
     public SMControllerConfiguration getSecurityManagerConfiguration() {
-        return getServerConfigurationController().getSecurityManagerConfiguration();
+        return getServerConfiguration().getSecurityManagerConfiguration();
     }
 
     public SMAdminController getSecurityController() {
@@ -195,7 +196,6 @@ public SMAdminController getSecurityController() {
     @Override
     protected void startServer() {
         CBPlatform.setApplication(this);
-        initHomeFolder();
         try {
             if (!loadServerConfiguration()) {
                 return;
@@ -466,14 +466,9 @@ protected String initHomeFolder() {
         if (CommonUtils.isEmpty(homeFolder)) {
             homeFolder = ".";
         }
-        homeDirectory = new File(homeFolder);
         return homeFolder;
     }
 
-    protected void validateConfiguration(Map<String, Object> appConfig) throws DBException {
-
-    }
-
     private void runWebServer() {
         log.debug(
             String.format("Starting Jetty server (%d on %s) ",
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplicationCE.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplicationCE.java
index 0e732b3b2d..7a00e3474c 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplicationCE.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplicationCE.java
@@ -42,34 +42,35 @@ public class CBApplicationCE extends CBApplication<CBServerConfig> {
     private final CBServerConfigurationControllerEmbedded<CBServerConfig> serverConfigController;
 
     public CBApplicationCE() {
-        serverConfigController = new CBServerConfigurationControllerEmbedded<>(new CBServerConfig());
+        super();
+        this.serverConfigController = new CBServerConfigurationControllerEmbedded<>(new CBServerConfig(), getHomeDirectory());
     }
 
     @Override
     public SMController createSecurityController(@NotNull SMCredentialsProvider credentialsProvider) throws DBException {
-        return new EmbeddedSecurityControllerFactory().createSecurityService(
+        return new EmbeddedSecurityControllerFactory<>().createSecurityService(
             this,
             getServerConfiguration().getDatabaseConfiguration(),
             credentialsProvider,
-            getServerConfigurationController().getSecurityManagerConfiguration()
+            getServerConfiguration().getSecurityManagerConfiguration()
         );
     }
     @Override
     public SMAdminController getAdminSecurityController(@NotNull SMCredentialsProvider credentialsProvider) throws DBException {
-        return new EmbeddedSecurityControllerFactory().createSecurityService(
+        return new EmbeddedSecurityControllerFactory<>().createSecurityService(
             this,
             getServerConfiguration().getDatabaseConfiguration(),
             credentialsProvider,
-            getServerConfigurationController().getSecurityManagerConfiguration()
+            getServerConfiguration().getSecurityManagerConfiguration()
         );
     }
 
     protected SMAdminController createGlobalSecurityController() throws DBException {
-        return new EmbeddedSecurityControllerFactory().createSecurityService(
+        return new EmbeddedSecurityControllerFactory<>().createSecurityService(
             this,
             getServerConfiguration().getDatabaseConfiguration(),
             new NoAuthCredentialsProvider(),
-            getServerConfigurationController().getSecurityManagerConfiguration()
+            getServerConfiguration().getSecurityManagerConfiguration()
         );
     }
 
@@ -94,8 +95,8 @@ public CBServerConfigurationControllerEmbedded<CBServerConfig> getServerConfigur
 
     protected void shutdown() {
         try {
-            if (securityController instanceof CBEmbeddedSecurityController) {
-                ((CBEmbeddedSecurityController) securityController).shutdown();
+            if (securityController instanceof CBEmbeddedSecurityController<?> embeddedSecurityController) {
+                embeddedSecurityController.shutdown();
             }
         } catch (Exception e) {
             log.error(e);
@@ -108,8 +109,8 @@ protected void finishSecurityServiceConfiguration(
         @Nullable String adminPassword,
         @NotNull List<AuthInfo> authInfoList
     ) throws DBException {
-        if (securityController instanceof CBEmbeddedSecurityController) {
-            ((CBEmbeddedSecurityController) securityController).finishConfiguration(adminName, adminPassword, authInfoList);
+        if (securityController instanceof CBEmbeddedSecurityController<?> embeddedSecurityController) {
+            embeddedSecurityController.finishConfiguration(adminName, adminPassword, authInfoList);
         }
     }
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfig.java
index 2b0b6d0bf7..d914fa08dd 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfig.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfig.java
@@ -19,6 +19,7 @@
 import com.google.gson.annotations.SerializedName;
 import io.cloudbeaver.auth.CBAuthConstants;
 import io.cloudbeaver.model.app.WebServerConfiguration;
+import io.cloudbeaver.service.security.SMControllerConfiguration;
 import io.cloudbeaver.service.security.db.WebDatabaseConfig;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
@@ -50,6 +51,8 @@ public class CBServerConfig implements WebServerConfiguration {
     private boolean enableSecurityManager = false;
     private final Map<String, Object> productSettings = new HashMap<>();
 
+    @SerializedName("sm")
+    protected final SMControllerConfiguration securityManagerConfiguration = new SMControllerConfiguration();
     @SerializedName("database")
     private WebDatabaseConfig databaseConfiguration = new WebDatabaseConfig();
     private String staticContent = "";
@@ -191,4 +194,8 @@ public boolean isEnableSecurityManager() {
     public Map<String, Object> getProductSettings() {
         return productSettings;
     }
+
+    public SMControllerConfiguration getSecurityManagerConfiguration() {
+        return securityManagerConfiguration;
+    }
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
index ab8ea29ad9..9dfbab44c1 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
@@ -56,14 +56,17 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
     private static final Log log = Log.getLog(CBServerConfigurationController.class);
 
     // Configurations
-    protected final SMControllerConfiguration securityManagerConfiguration = new SMControllerConfiguration();
+    @NotNull
     private final T serverConfiguration;
     private final CBAppConfig appConfiguration = new CBAppConfig();
-    private Map<String, String> externalProperties = new LinkedHashMap<>();
-    private Map<String, Object> originalConfigurationProperties = new LinkedHashMap<>();
+    @NotNull
+    protected final Path homeDirectory;
+    private final Map<String, String> externalProperties = new LinkedHashMap<>();
+    private final Map<String, Object> originalConfigurationProperties = new LinkedHashMap<>();
 
-    protected CBServerConfigurationController(T serverConfiguration) {
+    protected CBServerConfigurationController(@NotNull T serverConfiguration, @NotNull Path homeDirectory) {
         this.serverConfiguration = serverConfiguration;
+        this.homeDirectory = homeDirectory;
     }
 
     public String getAuthServiceURL() {
@@ -159,7 +162,7 @@ public T parseServerConfiguration() {
             }
             config.setServerURL("http://" + hostName + ":" + config.getServerPort());
         }
-        var homeDirectory = CBApplication.getInstance().getHomeDirectory().toString();
+
         config.setContentRoot(WebAppUtils.getRelativePath(config.getContentRoot(), homeDirectory));
         config.setRootURI(readRootUri(config.getRootURI()));
         config.setDriversLocation(WebAppUtils.getRelativePath(config.getDriversLocation(), homeDirectory));
@@ -223,7 +226,7 @@ protected void readProductConfiguration(Map<String, Object> serverConfig, Gson g
                     CBConstants.PARAM_PRODUCT_CONFIGURATION,
                     CBConstants.DEFAULT_PRODUCT_CONFIGURATION
                 ),
-                CBApplication.getInstance().getHomeDirectory().toString()
+                homeDirectory
             );
             if (!CommonUtils.isEmpty(productConfigPath)) {
                 File productConfigFile = new File(productConfigPath);
@@ -300,6 +303,7 @@ protected GsonBuilder getGsonBuilder() {
         // Stupid way to populate existing objects but ok google (https://github.com/google/gson/issues/431)
         InstanceCreator<CBAppConfig> appConfigCreator = type -> appConfiguration;
         InstanceCreator<DataSourceNavigatorSettings> navSettingsCreator = type -> (DataSourceNavigatorSettings) appConfiguration.getDefaultNavigatorSettings();
+        var securityManagerConfiguration = getServerConfiguration().getSecurityManagerConfiguration();
         InstanceCreator<SMControllerConfiguration> smConfigCreator = type -> securityManagerConfiguration;
         InstanceCreator<T> serverConfigCreator = type -> serverConfiguration;
         InstanceCreator<PasswordPolicyConfiguration> smPasswordPoliceConfigCreator =
@@ -602,10 +606,6 @@ public Map<String, Object> getProductConfiguration() {
         return getServerConfiguration().getProductSettings();
     }
 
-    public SMControllerConfiguration getSecurityManagerConfiguration() {
-        return securityManagerConfiguration;
-    }
-
     private String readRootUri(String uri) {
         //slashes are needed to correctly display static resources on ui
         if (!uri.endsWith("/")) {
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java
index c15ef7c49d..6c6ed695a6 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java
@@ -25,6 +25,7 @@
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.utils.CommonUtils;
 
+import java.nio.file.Path;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -35,8 +36,8 @@ public class CBServerConfigurationControllerEmbedded<T extends CBServerConfig> e
 
     private static final Log log = Log.getLog(CBServerConfigurationControllerEmbedded.class);
 
-    public CBServerConfigurationControllerEmbedded(T serverConfig) {
-        super(serverConfig);
+    public CBServerConfigurationControllerEmbedded(@NotNull T serverConfig, @NotNull Path homeDirectory) {
+        super(serverConfig, homeDirectory);
     }
 
     @NotNull
@@ -79,7 +80,7 @@ private void savePasswordPolicyConfig(Map<String, Object> originServerConfig, Ma
         );
         Gson gson = getGson();
         Map<String, Object> passwordPolicyConfig = gson.fromJson(
-            gson.toJsonTree(securityManagerConfiguration.getPasswordPolicyConfiguration()),
+            gson.toJsonTree(getServerConfiguration().getSecurityManagerConfiguration().getPasswordPolicyConfiguration()),
             JSONUtils.MAP_TYPE_TOKEN
         );
         if (!CommonUtils.isEmpty(passwordPolicyConfig)) {
@@ -98,10 +99,8 @@ protected GsonBuilder getGsonBuilder() {
         GsonBuilder gsonBuilder = super.getGsonBuilder();
         var databaseConfiguration = getServerConfiguration().getDatabaseConfiguration();
         InstanceCreator<WebDatabaseConfig> dbConfigCreator = type -> databaseConfiguration;
-        InstanceCreator<WebDatabaseConfig.Pool> dbPoolConfigCreator = type -> databaseConfiguration.getPool();
         return gsonBuilder
-            .registerTypeAdapter(WebDatabaseConfig.class, dbConfigCreator)
-            .registerTypeAdapter(WebDatabaseConfig.Pool.class, dbPoolConfigCreator);
+            .registerTypeAdapter(WebDatabaseConfig.class, dbConfigCreator);
     }
 
 
diff --git a/webapp/packages/core-blocks/public/icons/timer.svg b/webapp/packages/core-blocks/public/icons/timer.svg
index ddc6e7703c..e958ee947f 100644
--- a/webapp/packages/core-blocks/public/icons/timer.svg
+++ b/webapp/packages/core-blocks/public/icons/timer.svg
@@ -1,7 +1,6 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g id="root">
 <g clip-path="url(#clip0_3855_1023)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5 8H14.5V16L18.7426 20.2426L20.864 18.1213L17.5 14.7574V8Z" fill="#C4C4C4"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M5.65685 -0.000488281L0 5.65637L2.12132 7.77769L7.77817 2.12083L5.65685 -0.000488281ZM16 0.999733C17.1888 0.999733 18.3453 1.13803 19.4543 1.39942C18.8689 2.2308 18.4379 3.17872 18.203 4.2015C17.4888 4.069 16.7525 3.99973 16 3.99973C9.37258 3.99973 4 9.37232 4 15.9997C4 22.6271 9.37258 27.9997 16 27.9997C22.6274 27.9997 28 22.6271 28 15.9997C28 15.2473 27.9308 14.5111 27.7983 13.7971C28.8211 13.5621 29.769 13.1311 30.6004 12.5457C30.8617 13.6546 31 14.811 31 15.9997C31 24.284 24.2843 30.9997 16 30.9997C7.71573 30.9997 1 24.284 1 15.9997C1 7.71546 7.71573 0.999733 16 0.999733Z" fill="#338ECC"/>
 </g>
 <defs>
diff --git a/webapp/packages/core-blocks/public/icons/timer_m.svg b/webapp/packages/core-blocks/public/icons/timer_m.svg
index 619f55d315..32d1a40037 100644
--- a/webapp/packages/core-blocks/public/icons/timer_m.svg
+++ b/webapp/packages/core-blocks/public/icons/timer_m.svg
@@ -1,7 +1,6 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g id="root">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6831 9.3681C22.8902 10.2114 23 11.0929 23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C12.9071 1 13.7886 1.10981 14.6319 1.31685C14.3363 1.90704 14.1352 2.55274 14.0484 3.23415C13.3904 3.08098 12.7047 3 12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21C16.9706 21 21 16.9706 21 12C21 11.2953 20.919 10.6096 20.7659 9.95158C21.4473 9.86477 22.093 9.66367 22.6831 9.3681Z" fill="#338ECC"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 7H11V13H11.0139L14.578 16.5641L15.9922 15.1499L13 12.1577V7Z" fill="#C4C4C4"/>
 <rect y="4.24268" width="6" height="2" transform="rotate(-45 0 4.24268)" fill="#338ECC"/>
 </g>
 </svg>
diff --git a/webapp/packages/core-blocks/public/icons/timer_sm.svg b/webapp/packages/core-blocks/public/icons/timer_sm.svg
index c5afcc280b..6fa1d70385 100644
--- a/webapp/packages/core-blocks/public/icons/timer_sm.svg
+++ b/webapp/packages/core-blocks/public/icons/timer_sm.svg
@@ -5,7 +5,6 @@
 <rect y="2.82837" width="4" height="1.5" transform="rotate(-45 0 2.82837)" fill="#338ECC"/>
 </g>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M8.73269 1.03789C8.49188 1.01284 8.24744 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15C11.866 15 15 11.866 15 8C15 7.75256 14.9872 7.50812 14.9621 7.26731C14.5219 7.55559 14.0281 7.7688 13.4989 7.88874C13.4996 7.92574 13.5 7.96283 13.5 8C13.5 11.0376 11.0376 13.5 8 13.5C4.96243 13.5 2.5 11.0376 2.5 8C2.5 4.96243 4.96243 2.5 8 2.5C8.03717 2.5 8.07426 2.50037 8.11126 2.5011C8.2312 1.97189 8.44441 1.47809 8.73269 1.03789Z" fill="#338ECC"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.60051 4.5H7.40051V8.83711L7.40039 8.83723L7.40051 8.83735V8.84H7.40316L9.52171 10.9586L10.3702 10.11L8.60051 8.3403V4.5Z" fill="#C4C4C4"/>
 </g>
 <defs>
 <clipPath id="clip0_3855_1033">