You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2026/10/01 15:21:26 UTC

(streampipes) branch dev updated: refactor: Migrate static storage access to configured beans (#5055)

This is an automated email from the ASF dual-hosted git repository.

dominikriemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new 0854f49cb6 refactor: Migrate static storage access to configured beans (#5055)
0854f49cb6 is described below

commit 0854f49cb6ab81931cf66809bf562c1c09a7b34c
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Oct 1 17:21:20 2026 +0200

    refactor: Migrate static storage access to configured beans (#5055)
---
 .../management/AdapterMigrationManager.java        |   6 +-
 .../management/CompactAdapterManagement.java       |   9 +-
 .../management/DescriptionManagement.java          |  14 +--
 .../management/CompactAdapterManagementTest.java   |  63 +++++++++++
 .../management/DescriptionManagementTest.java      |  81 ++++++++++++++
 .../health/monitoring/PipelineHealthCheck.java     |   2 +-
 .../endpoint/ExtensionsServiceEndpointUtils.java   |   7 +-
 .../extensions/AvailableExtensionsProvider.java    |  26 +++--
 .../manager/extensions/ExtensionItemInstaller.java |  10 +-
 .../manager/function/FunctionManager.java          |   9 +-
 .../manager/matching/v2/DatatypeMatch.java         |  25 +----
 .../migration/AbstractMigrationManager.java        |   8 +-
 .../migration/PipelineElementMigrationManager.java |   6 +-
 .../manager/recommender/ElementRecommender.java    |  14 +--
 .../remote/ContainerProvidedOptionsHandler.java    |   8 +-
 .../manager/setup/AutoInstallation.java            |   9 +-
 .../manager/setup/CouchDbInstallationStep.java     |  14 ++-
 .../manager/setup/ExtensionsInstallationTask.java  |  16 ++-
 .../manager/setup/InstallationConfiguration.java   |  29 ++++-
 .../setup/PipelineElementInstallationStep.java     |   8 +-
 .../setup/tasks/CreateAssetLinkTypeTask.java       |  11 +-
 .../verification/extractor/TypeExtractor.java      |  14 ---
 .../ExtensionsServiceEndpointUtilsTest.java        |  63 +++++++++++
 .../AvailableExtensionsProviderTest.java           |  95 ++++++++++++++++
 .../manager/matching/v2/TestDatatypeMatch.java     |  68 +++++++-----
 .../AdapterDescriptionResourceManager.java         |   6 +-
 .../management/DataProcessorResourceManager.java   |   6 +-
 .../resource/management/SpResourceManager.java     |  24 +++-
 .../resource/management/UserResourceManager.java   |  31 +++---
 .../AdapterDescriptionResourceManagerTest.java}    |  32 ++++--
 .../management/UserResourceManagerTest.java        |  99 +++++++++++++++++
 .../streampipes/rest/impl/Authentication.java      |  10 +-
 .../rest/impl/ContainerProvidedOptions.java        |   6 +-
 .../rest/impl/PipelineCanvasMetadataResource.java  |  22 ++--
 .../streampipes/rest/impl/PipelineResource.java    |  13 ++-
 .../impl/admin/ExtensionsInstallationResource.java |  11 +-
 .../admin/ExtensionsServiceEndpointResource.java   |   7 +-
 .../rest/impl/admin/MigrationResource.java         |  30 +++--
 .../rest/impl/connect/AdapterResource.java         |  16 ++-
 .../rest/impl/connect/CompactAdapterResource.java  |   7 +-
 .../rest/impl/connect/DescriptionResource.java     |   7 +-
 .../rest/impl/dataset/DatasetImageResource.java    |  10 +-
 .../rest/impl/pe/DataProcessorResource.java        |   4 +-
 .../impl/PipelineCanvasMetadataResourceTest.java   |  77 +++++++++++++
 .../core/PipelineManagementConfiguration.java      |  53 +++++++++
 .../streampipes/service/core/PostStartupTask.java  |  19 ++--
 .../service/core/StreamPipesCoreApplication.java   |  27 +++--
 .../ExtensionServiceRequestConfiguration.java      |  23 +++-
 .../oauth2/OAuth2AuthenticationSuccessHandler.java |   7 +-
 .../core/storage/StorageApiConfiguration.java      | 123 +++++++++++++++++++++
 .../core/storage/StorageApiConfigurationTest.java  |  49 ++++++++
 .../storage/api/core/INoSqlStorage.java            |  21 ----
 .../storage/couchdb/CouchDbStorageManager.java     |  49 --------
 streampipes-user-management/pom.xml                |   5 +
 .../management/service/RefreshTokenService.java    |   7 +-
 .../service/RefreshTokenServiceTest.java           |  98 ++++++++++++++++
 56 files changed, 1205 insertions(+), 309 deletions(-)

diff --git a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterMigrationManager.java b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterMigrationManager.java
index 0bfcb89a83..1da83d8b45 100644
--- a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterMigrationManager.java
+++ b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterMigrationManager.java
@@ -27,6 +27,7 @@ import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceTagPrefix;
 import org.apache.streampipes.model.migration.ModelMigratorConfig;
 import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.storage.api.connect.IAdapterStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -46,8 +47,9 @@ public class AdapterMigrationManager extends AbstractMigrationManager implements
                                  IAdapterStorage adapterDescriptionStorage,
                                  WorkerRestClient workerRestClient,
                                  ExtensionServiceRequestManager extensionServiceRequestManager,
-                                 SpResourceManager resourceManager) {
-    super(extensionServiceRequestManager, resourceManager);
+                                 SpResourceManager resourceManager,
+                                 IPipelineElementDescriptionStorage descriptionStorage) {
+    super(extensionServiceRequestManager, resourceManager, descriptionStorage);
     this.adapterStorage = adapterStorage;
     this.adapterDescriptionStorage = adapterDescriptionStorage;
     this.workerRestClient = workerRestClient;
diff --git a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/CompactAdapterManagement.java b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/CompactAdapterManagement.java
index ce5229cf72..70cd5e557c 100644
--- a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/CompactAdapterManagement.java
+++ b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/CompactAdapterManagement.java
@@ -23,16 +23,18 @@ import org.apache.streampipes.connect.management.compact.generator.CompactAdapte
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.model.connect.adapter.compact.CompactAdapter;
 import org.apache.streampipes.storage.api.connect.IAdapterStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
 import java.util.List;
 
 public class CompactAdapterManagement {
 
   private final List<AdapterModelGenerator> generators;
+  private final IAdapterStorage adapterDescriptionStorage;
 
-  public CompactAdapterManagement(List<AdapterModelGenerator> generators) {
+  public CompactAdapterManagement(List<AdapterModelGenerator> generators,
+                                  IAdapterStorage adapterDescriptionStorage) {
     this.generators = generators;
+    this.adapterDescriptionStorage = adapterDescriptionStorage;
   }
 
   public AdapterDescription convertToAdapterDescription(CompactAdapter compactAdapter,
@@ -77,8 +79,7 @@ public class CompactAdapterManagement {
   }
 
   private AdapterDescription findAdapterDescription(String appId) {
-    IAdapterStorage adapterStorage = StorageDispatcher.INSTANCE.getNoSqlStore().getAdapterDescriptionStorage();
-    return adapterStorage.findAll()
+    return adapterDescriptionStorage.findAll()
         .stream()
         .filter(desc -> desc.getAppId()
             .equals(appId))
diff --git a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/DescriptionManagement.java b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/DescriptionManagement.java
index 739d4cab42..83b13c971a 100644
--- a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/DescriptionManagement.java
+++ b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/DescriptionManagement.java
@@ -24,25 +24,26 @@ import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceRegistration;
 import org.apache.streampipes.resource.management.AdapterResourceManager;
 import org.apache.streampipes.storage.api.connect.IAdapterStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
 import java.util.List;
 import java.util.Optional;
 
 public class DescriptionManagement {
 
+  private final IAdapterStorage adapterDescriptionStorage;
   private final WorkerRestClient workerRestClient;
   private final AdapterResourceManager adapterResourceManager;
 
   public DescriptionManagement(WorkerRestClient workerRestClient,
-                               AdapterResourceManager adapterResourceManager) {
+                               AdapterResourceManager adapterResourceManager,
+                               IAdapterStorage adapterDescriptionStorage) {
+    this.adapterDescriptionStorage = adapterDescriptionStorage;
     this.workerRestClient = workerRestClient;
     this.adapterResourceManager = adapterResourceManager;
   }
 
   public List<AdapterDescription> getAdapters() {
-    IAdapterStorage adapterStorage = StorageDispatcher.INSTANCE.getNoSqlStore().getAdapterDescriptionStorage();
-    return adapterStorage.findAll();
+    return adapterDescriptionStorage.findAll();
   }
 
   public Optional<AdapterDescription> getAdapter(String id) {
@@ -52,10 +53,9 @@ public class DescriptionManagement {
   }
 
   public void deleteAdapterDescription(String id) throws SpRuntimeException {
-    var adapterStorage = StorageDispatcher.INSTANCE.getNoSqlStore().getAdapterDescriptionStorage();
-    var adapter = adapterStorage.getElementById(id);
+    var adapter = adapterDescriptionStorage.getElementById(id);
     if (!isAdapterUsed(adapter)) {
-      adapterStorage.deleteElementById(id);
+      adapterDescriptionStorage.deleteElementById(id);
     } else {
       throw new SpRuntimeException("This adapter is used by an existing instance and cannot be deleted");
     }
diff --git a/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/CompactAdapterManagementTest.java b/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/CompactAdapterManagementTest.java
new file mode 100644
index 0000000000..5c902ab0c2
--- /dev/null
+++ b/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/CompactAdapterManagementTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.connect.management.management;
+
+import org.apache.streampipes.connect.management.compact.generator.AdapterModelGenerator;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.model.connect.adapter.compact.CompactAdapter;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+class CompactAdapterManagementTest {
+
+  private final IAdapterStorage descriptions = mock(IAdapterStorage.class);
+  private final AdapterModelGenerator generator = mock(AdapterModelGenerator.class);
+  private final CompactAdapterManagement management = new CompactAdapterManagement(List.of(generator), descriptions);
+  private final CompactAdapter compact = new CompactAdapter(null, null, null, "app", List.of(), null, null, null);
+
+  @Test
+  void appliesGeneratorsToMatchingInjectedDescription() throws Exception {
+    var other = new AdapterDescription();
+    other.setAppId("other");
+    var description = new AdapterDescription();
+    description.setAppId("app");
+    when(descriptions.findAll()).thenReturn(List.of(other, description));
+
+    assertSame(description, management.convertToAdapterDescription(compact, "user"));
+    verify(generator).apply(description, compact, "user");
+  }
+
+  @Test
+  void rejectsUnknownAppBeforeApplyingGenerators() {
+    when(descriptions.findAll()).thenReturn(List.of());
+
+    assertThrows(IllegalArgumentException.class, () -> management.convertToAdapterDescription(compact, "user"));
+    verifyNoInteractions(generator);
+  }
+}
diff --git a/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/DescriptionManagementTest.java b/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/DescriptionManagementTest.java
new file mode 100644
index 0000000000..baac274fa9
--- /dev/null
+++ b/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/DescriptionManagementTest.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.connect.management.management;
+
+import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.resource.management.AdapterResourceManager;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class DescriptionManagementTest {
+
+  private final IAdapterStorage descriptions = mock(IAdapterStorage.class);
+  private final IAdapterStorage instances = mock(IAdapterStorage.class);
+  private final AdapterResourceManager adapters = mock(AdapterResourceManager.class);
+  private final DescriptionManagement management =
+      new DescriptionManagement(mock(WorkerRestClient.class), adapters, descriptions);
+
+  @Test
+  void looksUpDescriptionByAppIdInInjectedStorage() {
+    var description = description("app");
+    when(descriptions.findAll()).thenReturn(List.of(description));
+
+    assertEquals(description, management.getAdapter("app").orElseThrow());
+  }
+
+  @Test
+  void deletesUnusedDescriptionFromDescriptionStorage() {
+    when(descriptions.getElementById("description")).thenReturn(description("app"));
+    when(adapters.getDb()).thenReturn(instances);
+    when(instances.findAll()).thenReturn(List.of(description("other-app")));
+
+    management.deleteAdapterDescription("description");
+
+    verify(descriptions).deleteElementById("description");
+    verify(instances, never()).deleteElementById("description");
+  }
+
+  @Test
+  void preservesDescriptionUsedByAnAdapterInstance() {
+    when(descriptions.getElementById("description")).thenReturn(description("app"));
+    when(adapters.getDb()).thenReturn(instances);
+    when(instances.findAll()).thenReturn(List.of(description("app")));
+
+    assertThrows(SpRuntimeException.class, () -> management.deleteAdapterDescription("description"));
+
+    verify(descriptions, never()).deleteElementById("description");
+  }
+
+  private AdapterDescription description(String appId) {
+    var description = new AdapterDescription();
+    description.setAppId(appId);
+    return description;
+  }
+}
diff --git a/streampipes-health-monitoring/src/main/java/org/apache/streampipes/health/monitoring/PipelineHealthCheck.java b/streampipes-health-monitoring/src/main/java/org/apache/streampipes/health/monitoring/PipelineHealthCheck.java
index 55fbcc8947..c02e08bd39 100644
--- a/streampipes-health-monitoring/src/main/java/org/apache/streampipes/health/monitoring/PipelineHealthCheck.java
+++ b/streampipes-health-monitoring/src/main/java/org/apache/streampipes/health/monitoring/PipelineHealthCheck.java
@@ -227,7 +227,7 @@ public class PipelineHealthCheck implements HealthCheck {
     try {
       var service = new ExtensionsServiceEndpointGenerator().selectService(
           pipelineElement.getAppId(),
-          ExtensionsServiceEndpointUtils.getPipelineElementType(pipelineElement.getAppId()),
+          ExtensionsServiceEndpointUtils.getPipelineElementType(pipelineElement),
           Collections.emptySet()
       );
       new SecretService(new SecretDecrypter()).apply(pipelineElement);
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointUtils.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointUtils.java
index ef4a028ca8..fd56a0e6a4 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointUtils.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointUtils.java
@@ -24,7 +24,7 @@ import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
-import org.apache.streampipes.storage.management.StorageDispatcher;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 import org.apache.streampipes.svcdiscovery.api.model.SpServiceUrlProvider;
 
 import java.util.List;
@@ -46,9 +46,10 @@ public class ExtensionsServiceEndpointUtils {
     }
   }
 
-  public static SpServiceUrlProvider getPipelineElementType(String appId) {
+  public static SpServiceUrlProvider getPipelineElementType(String appId,
+                                                             IPipelineElementDescriptionStorage descriptionStorage) {
     try {
-      StorageDispatcher.INSTANCE.getNoSqlStore().getPipelineElementDescriptionStorage().getDataProcessorByAppId(appId);
+      descriptionStorage.getDataProcessorByAppId(appId);
       return SpServiceUrlProvider.DATA_PROCESSOR;
     } catch (NoSuchElementException e) {
       return SpServiceUrlProvider.DATA_SINK;
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/extensions/AvailableExtensionsProvider.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/extensions/AvailableExtensionsProvider.java
index 435ff60d58..532c9409aa 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/extensions/AvailableExtensionsProvider.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/extensions/AvailableExtensionsProvider.java
@@ -25,7 +25,9 @@ import org.apache.streampipes.model.extensions.ExtensionItemDescription;
 import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceStatus;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataSinkDescription;
-import org.apache.streampipes.storage.api.core.INoSqlStorage;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
+import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,10 +41,16 @@ import java.util.stream.Collectors;
  */
 public class AvailableExtensionsProvider {
 
-  private final INoSqlStorage storage;
+  private final IExtensionsServiceStorage extensionsServiceStorage;
+  private final IAdapterStorage adapterDescriptionStorage;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
 
-  public AvailableExtensionsProvider(INoSqlStorage storage) {
-    this.storage = storage;
+  public AvailableExtensionsProvider(IExtensionsServiceStorage extensionsServiceStorage,
+                                     IAdapterStorage adapterDescriptionStorage,
+                                     IPipelineElementDescriptionStorage descriptionStorage) {
+    this.extensionsServiceStorage = extensionsServiceStorage;
+    this.adapterDescriptionStorage = adapterDescriptionStorage;
+    this.descriptionStorage = descriptionStorage;
   }
 
   public List<ExtensionItemDescription> getExtensionItemDescriptions() {
@@ -66,7 +74,7 @@ public class AvailableExtensionsProvider {
    * @return Map of extension item descriptions keyed by their elementId
    */
   private Map<String, ExtensionItemDescription> getUniqueAvailableExtensions() {
-    return storage.getExtensionsServiceStorage().findAll()
+    return extensionsServiceStorage.findAll()
         .stream()
         .filter(service -> service.getStatus() == SpServiceStatus.HEALTHY)
         .flatMap(service -> service.getProvidedExtensions().stream())
@@ -107,22 +115,22 @@ public class AvailableExtensionsProvider {
   }
 
   private List<AdapterDescription> getAllAdapters() {
-    return storage.getAdapterDescriptionStorage().findAll();
+    return adapterDescriptionStorage.findAll();
   }
 
   private List<SpDataStream> getAllDataStreams() {
-    return storage.getDataStreamStorage().findAll()
+    return descriptionStorage.getAllDataStreams()
         .stream()
         .filter(stream -> !stream.isInternallyManaged())
         .toList();
   }
 
   private List<DataProcessorDescription> getAllDataProcessors() {
-    return storage.getDataProcessorStorage().findAll();
+    return descriptionStorage.getAllDataProcessors();
   }
 
   private List<DataSinkDescription> getAllDataSinks() {
-    return storage.getDataSinkStorage().findAll();
+    return descriptionStorage.getAllDataSinks();
   }
 
 }
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/extensions/ExtensionItemInstaller.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/extensions/ExtensionItemInstaller.java
index 00cd6906a9..4671a8cae7 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/extensions/ExtensionItemInstaller.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/extensions/ExtensionItemInstaller.java
@@ -27,6 +27,7 @@ import org.apache.streampipes.model.extensions.ExtensionItemInstallationRequest;
 import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceRegistration;
 import org.apache.streampipes.model.message.Message;
 import org.apache.streampipes.resource.management.SpResourceManager;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 import org.apache.streampipes.svcdiscovery.api.model.SpServiceUrlProvider;
 
 import java.io.IOException;
@@ -36,27 +37,30 @@ public class ExtensionItemInstaller {
   private final ExtensionServiceRequestManager requestManager;
   private final SpServiceRegistration service;
   private final SpResourceManager resourceManager;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
 
   public ExtensionItemInstaller(SpServiceRegistration service,
                                 ExtensionServiceRequestManager requestManager,
-                                SpResourceManager resourceManager) {
+                                SpResourceManager resourceManager,
+                                     IPipelineElementDescriptionStorage descriptionStorage) {
     this.requestManager = requestManager;
     this.service = service;
     this.resourceManager = resourceManager;
+    this.descriptionStorage = descriptionStorage;
   }
 
   public Message installExtension(ExtensionItemInstallationRequest req,
                                   String principalSid) throws IOException, SepaParseException {
     var requestTarget = getDescriptionRequestTarget(req);
     var description = fetchDescription(requestTarget);
-    return new TypeExtractor(description, requestManager,
+    return new TypeExtractor(description, descriptionStorage, requestManager,
         resourceManager).getTypeVerifier().verifyAndAdd(principalSid, req.publicElement());
   }
 
   public Message updateExtension(ExtensionItemInstallationRequest req) throws IOException, SepaParseException {
     var requestTarget = getDescriptionRequestTarget(req);
     var description = fetchDescription(requestTarget);
-    return new TypeExtractor(description, requestManager,
+    return new TypeExtractor(description, descriptionStorage, requestManager,
         resourceManager).getTypeVerifier().verifyAndUpdate();
   }
 
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/function/FunctionManager.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/function/FunctionManager.java
index 776c8a91a6..0769846509 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/function/FunctionManager.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/function/FunctionManager.java
@@ -27,7 +27,7 @@ import org.apache.streampipes.model.function.FunctionsShutdownResponse;
 import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.serializers.json.JacksonSerializer;
 import org.apache.streampipes.storage.api.function.IFunctionStateStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
+import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,15 +40,18 @@ public class FunctionManager {
 
   private final ExtensionServiceRequestManager requestManager;
   private final SpResourceManager resourceManager;
+  private final IExtensionsServiceStorage extensionsServiceStorage;
 
   public FunctionManager(ExtensionServiceRequestManager requestManager,
-                         SpResourceManager resourceManager) {
+                         SpResourceManager resourceManager,
+                         IExtensionsServiceStorage extensionsServiceStorage) {
     this.requestManager = requestManager;
     this.resourceManager = resourceManager;
+    this.extensionsServiceStorage = extensionsServiceStorage;
   }
 
   public void stopAllFunctionsAndPersistState(IFunctionStateStorage functionStateStorage) {
-    var extensions = StorageDispatcher.INSTANCE.getNoSqlStore().getExtensionsServiceStorage().findAll();
+    var extensions = extensionsServiceStorage.findAll();
 
     LOG.info("Triggering function stop at {} extension services...", extensions.size());
     extensions.forEach(service -> {
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/DatatypeMatch.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/DatatypeMatch.java
index 2f652708d3..7a36d5d73a 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/DatatypeMatch.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/DatatypeMatch.java
@@ -18,16 +18,19 @@
 
 package org.apache.streampipes.manager.matching.v2;
 
-import org.apache.streampipes.manager.matching.v2.utils.MatchingUtils;
 import org.apache.streampipes.model.client.matching.MatchingResultMessage;
 import org.apache.streampipes.model.client.matching.MatchingResultType;
 import org.apache.streampipes.vocabulary.SO;
 import org.apache.streampipes.vocabulary.XSD;
 
 import java.util.List;
+import java.util.Set;
 
 public class DatatypeMatch extends AbstractMatcher<String, String> {
 
+  private static final Set<String> NUMERIC_TYPES = Set.of(
+      XSD.INTEGER.toString(), XSD.LONG.toString(), XSD.DOUBLE.toString(), XSD.FLOAT.toString());
+
   public DatatypeMatch() {
     super(MatchingResultType.DATATYPE_MATCH);
   }
@@ -35,29 +38,13 @@ public class DatatypeMatch extends AbstractMatcher<String, String> {
   @Override
   public boolean match(String offer, String requirement, List<MatchingResultMessage> errorLog) {
 
-    boolean match = MatchingUtils.nullCheckReqAllowed(offer, requirement)
+    boolean match = requirement == null
                     || requirement.equals(offer)
-                    || subClassOf(offer, requirement)
-                    || MatchingUtils.nullCheck(offer, requirement);
+                    || (SO.NUMBER.equals(requirement) && offer != null && NUMERIC_TYPES.contains(offer));
 
     if (!match) {
       buildErrorMessage(errorLog, requirement);
     }
     return match;
   }
-
-  private boolean subClassOf(String offer, String requirement) {
-    if (!requirement.equals(SO.NUMBER)) {
-      return false;
-    } else {
-      if (offer.equals(XSD.INTEGER.toString())
-          || offer.equals(XSD.LONG.toString())
-          || offer.equals(XSD.DOUBLE.toString())
-          || offer.equals(XSD.FLOAT.toString())) {
-        return true;
-      }
-    }
-    return false;
-  }
-
 }
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/migration/AbstractMigrationManager.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/migration/AbstractMigrationManager.java
index b8a1368def..c933c3aefd 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/migration/AbstractMigrationManager.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/migration/AbstractMigrationManager.java
@@ -33,6 +33,7 @@ import org.apache.streampipes.model.migration.MigrationResult;
 import org.apache.streampipes.model.migration.ModelMigratorConfig;
 import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.serializers.json.JacksonSerializer;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -52,11 +53,14 @@ public abstract class AbstractMigrationManager {
   private static final Logger LOG = LoggerFactory.getLogger(AbstractMigrationManager.class);
   protected final ExtensionServiceRequestManager requestManager;
   protected final SpResourceManager resourceManager;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
 
   protected AbstractMigrationManager(ExtensionServiceRequestManager requestManager,
-                                     SpResourceManager resourceManager) {
+                                     SpResourceManager resourceManager,
+                                     IPipelineElementDescriptionStorage descriptionStorage) {
     this.requestManager = requestManager;
     this.resourceManager = resourceManager;
+    this.descriptionStorage = descriptionStorage;
   }
 
   /**
@@ -157,7 +161,7 @@ public abstract class AbstractMigrationManager {
       var entityPayload = requestManager
           .request(ExtensionServiceRequests.descriptionUpdate(requestTarget, resourceManager))
           .responseBody();
-      var updateResult = new TypeExtractor(entityPayload, requestManager, resourceManager)
+      var updateResult = new TypeExtractor(entityPayload, descriptionStorage, requestManager, resourceManager)
           .getTypeVerifier().verifyAndUpdate();
       if (!updateResult.isSuccess()) {
         LOG.error(
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/migration/PipelineElementMigrationManager.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/migration/PipelineElementMigrationManager.java
index 83bfba1019..6c4ad84666 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/migration/PipelineElementMigrationManager.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/migration/PipelineElementMigrationManager.java
@@ -36,6 +36,7 @@ import org.apache.streampipes.model.staticproperty.StaticProperty;
 import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
 import org.apache.streampipes.storage.api.pipeline.IDataSinkStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineStorage;
 
 import org.apache.commons.lang3.StringUtils;
@@ -61,8 +62,9 @@ public class PipelineElementMigrationManager extends AbstractMigrationManager im
                                          IDataProcessorStorage dataProcessorStorage,
                                          IDataSinkStorage dataSinkStorage,
                                          ExtensionServiceRequestManager extensionServiceRequestManager,
-                                         SpResourceManager resourceManager) {
-    super(extensionServiceRequestManager, resourceManager);
+                                         SpResourceManager resourceManager,
+                                         IPipelineElementDescriptionStorage descriptionStorage) {
+    super(extensionServiceRequestManager, resourceManager, descriptionStorage);
     this.pipelineStorage = pipelineStorage;
     this.dataProcessorStorage = dataProcessorStorage;
     this.dataSinkStorage = dataSinkStorage;
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/recommender/ElementRecommender.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/recommender/ElementRecommender.java
index e428dd03c6..b705b6eb5a 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/recommender/ElementRecommender.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/recommender/ElementRecommender.java
@@ -34,7 +34,6 @@ import org.apache.streampipes.model.pipeline.PipelineModification;
 import org.apache.streampipes.resource.management.DataProcessorResourceManager;
 import org.apache.streampipes.resource.management.DataSinkResourceManager;
 import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,6 +47,7 @@ public class ElementRecommender {
 
   private static final Logger LOG = LoggerFactory.getLogger(ElementRecommender.class);
 
+  private final IPipelineElementDescriptionStorage descriptionStorage;
   private final Pipeline pipeline;
   private final String baseRecDomId;
   private final PipelineElementRecommendationMessage recommendationMessage;
@@ -59,7 +59,9 @@ public class ElementRecommender {
                             String baseRecDomId,
                             ExtensionServiceRequestManager requestManager,
                             DataProcessorResourceManager dataProcessorResourceManager,
-                            DataSinkResourceManager dataSinkResourceManager) {
+                            DataSinkResourceManager dataSinkResourceManager,
+                            IPipelineElementDescriptionStorage descriptionStorage) {
+    this.descriptionStorage = descriptionStorage;
     this.pipeline = partialPipeline;
     this.baseRecDomId = baseRecDomId;
     this.requestManager = requestManager;
@@ -96,7 +98,7 @@ public class ElementRecommender {
 
   private List<ConsumableStreamPipesEntity> getAllDataProcessors() {
     List<String> userObjects = dataProcessorResourceManager.findAllIdsOnly();
-    return getNoSqlStore()
+    return descriptionStorage
         .getAllDataProcessors()
         .stream()
         .filter(e -> userObjects.stream().anyMatch(u -> u.equals(e.getAppId())))
@@ -107,7 +109,7 @@ public class ElementRecommender {
 
   private List<ConsumableStreamPipesEntity> getAllDataSinks() {
     List<String> userObjects = dataSinkResourceManager.findAllIdsOnly();
-    return getNoSqlStore()
+    return descriptionStorage
         .getAllDataSinks()
         .stream()
         .filter(e -> userObjects.stream().anyMatch(u -> u.equals(e.getAppId())))
@@ -122,10 +124,6 @@ public class ElementRecommender {
     return allElements;
   }
 
-  private IPipelineElementDescriptionStorage getNoSqlStore() {
-    return StorageDispatcher.INSTANCE.getNoSqlStore().getPipelineElementDescriptionStorage();
-  }
-
   private Optional<SpDataStream> getOutputStream(AllElementsProvider elementsProvider) {
 
     NamedStreamPipesEntity entity = elementsProvider.findElement(this.baseRecDomId);
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/remote/ContainerProvidedOptionsHandler.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/remote/ContainerProvidedOptionsHandler.java
index 361b4d72d1..e49277ee19 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/remote/ContainerProvidedOptionsHandler.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/remote/ContainerProvidedOptionsHandler.java
@@ -33,6 +33,7 @@ import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.resource.management.secret.SecretDecrypter;
 import org.apache.streampipes.resource.management.secret.SecretService;
 import org.apache.streampipes.serializers.json.JacksonSerializer;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 import org.apache.streampipes.svcdiscovery.api.model.SpServiceUrlProvider;
 
 import com.google.gson.JsonSyntaxException;
@@ -45,11 +46,14 @@ public class ContainerProvidedOptionsHandler {
 
   private final ExtensionServiceRequestManager extensionRequestManager;
   private final SpResourceManager resourceManager;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
 
   public ContainerProvidedOptionsHandler(ExtensionServiceRequestManager extensionRequestManager,
-                                         SpResourceManager resourceManager) {
+                                         SpResourceManager resourceManager,
+                                     IPipelineElementDescriptionStorage descriptionStorage) {
     this.extensionRequestManager = extensionRequestManager;
     this.resourceManager = resourceManager;
+    this.descriptionStorage = descriptionStorage;
   }
 
   public RuntimeOptionsResponse fetchRemoteOptions(RuntimeOptionsRequest request)
@@ -93,7 +97,7 @@ public class ContainerProvidedOptionsHandler {
 
   private ExtensionServiceRequestTarget getEndpointRequestTarget(String appId)
       throws NoServiceEndpointsAvailableException {
-    SpServiceUrlProvider provider = ExtensionsServiceEndpointUtils.getPipelineElementType(appId);
+    SpServiceUrlProvider provider = ExtensionsServiceEndpointUtils.getPipelineElementType(appId, descriptionStorage);
     var service = new ExtensionsServiceEndpointGenerator().selectService(appId, provider, Set.of());
     return ExtensionServiceRequestTargets.containerProvidedOptions(service, provider, appId);
   }
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/AutoInstallation.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/AutoInstallation.java
index fbb3b366aa..7015bfc4bc 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/AutoInstallation.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/AutoInstallation.java
@@ -37,6 +37,7 @@ public class AutoInstallation implements BackgroundTaskNotifier {
 
   private static final Logger LOG = LoggerFactory.getLogger(AutoInstallation.class);
 
+  private final InstallationConfiguration installationConfiguration;
   private final Environment env;
   private final ExtensionServiceRequestManager extensionServiceRequestManager;
   private final AtomicInteger errorCount = new AtomicInteger();
@@ -45,7 +46,9 @@ public class AutoInstallation implements BackgroundTaskNotifier {
   private final SpResourceManager resourceManager;
 
   public AutoInstallation(ExtensionServiceRequestManager extensionServiceRequestManager,
-                          SpResourceManager resourceManager) {
+                          SpResourceManager resourceManager,
+                          InstallationConfiguration installationConfiguration) {
+    this.installationConfiguration = installationConfiguration;
     this.env = Environments.getEnvironment();
     this.extensionServiceRequestManager = extensionServiceRequestManager;
     this.resourceManager = resourceManager;
@@ -54,8 +57,8 @@ public class AutoInstallation implements BackgroundTaskNotifier {
   public void startAutoInstallation() {
     InitialSettings settings = collectInitialSettings();
 
-    List<InstallationStep> steps = InstallationConfiguration.getInstallationSteps(settings, resourceManager);
-    List<Runnable> backgroundSteps = InstallationConfiguration.getBackgroundInstallationSteps(
+    List<InstallationStep> steps = installationConfiguration.getInstallationSteps(settings, resourceManager);
+    List<Runnable> backgroundSteps = installationConfiguration.getBackgroundInstallationSteps(
         settings,
         this,
         extensionServiceRequestManager,
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
index 841d3839c2..86a55c4ffe 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
@@ -25,8 +25,9 @@ import org.apache.streampipes.manager.setup.tasks.AddDefaultPipelineTemplatesTas
 import org.apache.streampipes.manager.setup.tasks.AddFunctionStateViewTask;
 import org.apache.streampipes.manager.setup.tasks.AddScriptTemplateViewTask;
 import org.apache.streampipes.manager.setup.tasks.CreateAssetLinkTypeTask;
+import org.apache.streampipes.storage.api.pipeline.ICompactPipelineTemplateStorage;
+import org.apache.streampipes.storage.api.system.IGenericStorage;
 import org.apache.streampipes.storage.couchdb.utils.Utils;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
 import org.lightcouch.DesignDocument;
 import org.lightcouch.DesignDocument.MapReduce;
@@ -41,17 +42,22 @@ public class CouchDbInstallationStep extends InstallationStep {
 
   private static final String PREPARING_USERS_TEXT = "Preparing database 'users'...";
 
-  public CouchDbInstallationStep() {
+  private final IGenericStorage genericStorage;
+  private final ICompactPipelineTemplateStorage pipelineTemplateStorage;
 
+  public CouchDbInstallationStep(IGenericStorage genericStorage,
+                                  ICompactPipelineTemplateStorage pipelineTemplateStorage) {
+    this.genericStorage = genericStorage;
+    this.pipelineTemplateStorage = pipelineTemplateStorage;
   }
 
   @Override
   public void install() {
     createDatabases();
     createViews();
-    new CreateAssetLinkTypeTask().execute();
+    new CreateAssetLinkTypeTask(genericStorage).execute();
     new AddDefaultPipelineTemplatesTask(
-        StorageDispatcher.INSTANCE.getNoSqlStore().getPipelineTemplateStorage()
+        pipelineTemplateStorage
     ).execute();
   }
 
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/ExtensionsInstallationTask.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/ExtensionsInstallationTask.java
index b6123381a1..f60e9897eb 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/ExtensionsInstallationTask.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/ExtensionsInstallationTask.java
@@ -23,7 +23,7 @@ import org.apache.streampipes.manager.extensions.AvailableExtensionsProvider;
 import org.apache.streampipes.model.client.setup.InitialSettings;
 import org.apache.streampipes.model.extensions.ExtensionItemDescription;
 import org.apache.streampipes.resource.management.SpResourceManager;
-import org.apache.streampipes.storage.api.core.INoSqlStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,17 +42,20 @@ public class ExtensionsInstallationTask implements Runnable {
 
   private final InitialSettings settings;
   private final BackgroundTaskNotifier callback;
-  private final INoSqlStorage storage;
+  private final AvailableExtensionsProvider availableExtensionsProvider;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
   private final ExtensionServiceRequestManager extensionServiceRequestManager;
   private final SpResourceManager resourceManager;
 
   public ExtensionsInstallationTask(InitialSettings settings,
-                                    INoSqlStorage storage,
+                                    AvailableExtensionsProvider availableExtensionsProvider,
+                                    IPipelineElementDescriptionStorage descriptionStorage,
                                     BackgroundTaskNotifier callback,
                                     ExtensionServiceRequestManager extensionServiceRequestManager,
                                     SpResourceManager resourceManager) {
     this.settings = settings;
-    this.storage = storage;
+    this.availableExtensionsProvider = availableExtensionsProvider;
+    this.descriptionStorage = descriptionStorage;
     this.callback = callback;
     this.extensionServiceRequestManager = extensionServiceRequestManager;
     this.resourceManager = resourceManager;
@@ -66,7 +69,7 @@ public class ExtensionsInstallationTask implements Runnable {
       int numberOfAttempts = 0;
       do {
 
-        availableExtensions = new AvailableExtensionsProvider(storage).getExtensionItemDescriptions();
+        availableExtensions = availableExtensionsProvider.getExtensionItemDescriptions();
         numberOfAttempts++;
         if (availableExtensions.isEmpty()) {
           LOG.info("Found 0 extensions - waiting {} seconds to make sure all extension services have properly started",
@@ -86,7 +89,8 @@ public class ExtensionsInstallationTask implements Runnable {
             extensionItem,
             settings.getInitialAdminUserSid(),
             extensionServiceRequestManager,
-            resourceManager)
+            resourceManager,
+            descriptionStorage)
         );
       }
 
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/InstallationConfiguration.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/InstallationConfiguration.java
index c76dda0dec..f84747d78b 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/InstallationConfiguration.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/InstallationConfiguration.java
@@ -19,21 +19,39 @@
 package org.apache.streampipes.manager.setup;
 
 import org.apache.streampipes.manager.api.extensions.ExtensionServiceRequestManager;
+import org.apache.streampipes.manager.extensions.AvailableExtensionsProvider;
 import org.apache.streampipes.model.client.setup.InitialSettings;
 import org.apache.streampipes.resource.management.SpResourceManager;
-import org.apache.streampipes.storage.management.StorageDispatcher;
+import org.apache.streampipes.storage.api.pipeline.ICompactPipelineTemplateStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
+import org.apache.streampipes.storage.api.system.IGenericStorage;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class InstallationConfiguration {
 
-  public static List<InstallationStep> getInstallationSteps(InitialSettings settings,
+  private final IGenericStorage genericStorage;
+  private final ICompactPipelineTemplateStorage pipelineTemplateStorage;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
+  private final AvailableExtensionsProvider availableExtensionsProvider;
+
+  public InstallationConfiguration(IGenericStorage genericStorage,
+                                   ICompactPipelineTemplateStorage pipelineTemplateStorage,
+                                   IPipelineElementDescriptionStorage descriptionStorage,
+                                   AvailableExtensionsProvider availableExtensionsProvider) {
+    this.genericStorage = genericStorage;
+    this.pipelineTemplateStorage = pipelineTemplateStorage;
+    this.descriptionStorage = descriptionStorage;
+    this.availableExtensionsProvider = availableExtensionsProvider;
+  }
+
+  public List<InstallationStep> getInstallationSteps(InitialSettings settings,
                                                             SpResourceManager resourceManager) {
     List<InstallationStep> steps = new ArrayList<>();
 
     steps.add(new SpCoreConfigurationStep(resourceManager.getCoreConfigurationStorage()));
-    steps.add(new CouchDbInstallationStep());
+    steps.add(new CouchDbInstallationStep(genericStorage, pipelineTemplateStorage));
     steps.add(new UserRegistrationInstallationStep(
         settings.getAdminEmail(),
         settings.getAdminPassword(),
@@ -45,13 +63,14 @@ public class InstallationConfiguration {
     return steps;
   }
 
-  public static List<Runnable> getBackgroundInstallationSteps(InitialSettings settings,
+  public List<Runnable> getBackgroundInstallationSteps(InitialSettings settings,
                                                               BackgroundTaskNotifier callback,
                                                               ExtensionServiceRequestManager extensionServiceRequestManager,
                                                               SpResourceManager resourceManager) {
     return List.of(new ExtensionsInstallationTask(
         settings,
-        StorageDispatcher.INSTANCE.getNoSqlStore(),
+        availableExtensionsProvider,
+        descriptionStorage,
         callback,
         extensionServiceRequestManager,
         resourceManager
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/PipelineElementInstallationStep.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/PipelineElementInstallationStep.java
index 11a4374ae4..08660aaf57 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/PipelineElementInstallationStep.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/PipelineElementInstallationStep.java
@@ -25,6 +25,7 @@ import org.apache.streampipes.manager.extensions.ExtensionItemInstaller;
 import org.apache.streampipes.model.extensions.ExtensionItemDescription;
 import org.apache.streampipes.model.extensions.ExtensionItemInstallationRequest;
 import org.apache.streampipes.resource.management.SpResourceManager;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 import org.apache.streampipes.svcdiscovery.api.model.SpServiceUrlProvider;
 
 import java.io.IOException;
@@ -36,16 +37,19 @@ public class PipelineElementInstallationStep extends InstallationStep {
   private final String principalSid;
   private final ExtensionServiceRequestManager extensionServiceRequestManager;
   private final SpResourceManager resourceManager;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
 
 
   public PipelineElementInstallationStep(ExtensionItemDescription extensionItem,
                                          String principalSid,
                                          ExtensionServiceRequestManager extensionServiceRequestManager,
-                                         SpResourceManager resourceManager) {
+                                         SpResourceManager resourceManager,
+                                     IPipelineElementDescriptionStorage descriptionStorage) {
     this.extensionItem = extensionItem;
     this.principalSid = principalSid;
     this.extensionServiceRequestManager = extensionServiceRequestManager;
     this.resourceManager = resourceManager;
+    this.descriptionStorage = descriptionStorage;
   }
 
   @Override
@@ -57,7 +61,7 @@ public class PipelineElementInstallationStep extends InstallationStep {
           SpServiceUrlProvider.valueOf(installationReq.serviceTagPrefix().name()),
           Set.of()
       );
-      new ExtensionItemInstaller(service, extensionServiceRequestManager, resourceManager)
+      new ExtensionItemInstaller(service, extensionServiceRequestManager, resourceManager, descriptionStorage)
           .installExtension(installationReq, principalSid);
       logSuccess(getTitle());
     } catch (SepaParseException | IOException | NoServiceEndpointsAvailableException e) {
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/tasks/CreateAssetLinkTypeTask.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/tasks/CreateAssetLinkTypeTask.java
index 7ac97eba37..c79046e4c2 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/tasks/CreateAssetLinkTypeTask.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/tasks/CreateAssetLinkTypeTask.java
@@ -22,7 +22,6 @@ import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.commons.random.UUIDGenerator;
 import org.apache.streampipes.model.assets.AssetLinkType;
 import org.apache.streampipes.storage.api.system.IGenericStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -60,9 +59,14 @@ public class CreateAssetLinkTypeTask implements InstallationTask {
       new AssetLinkType("file", "File", "var(--color-file)", "folder", "file", List.of(), false)
   );
 
+  private final IGenericStorage genericStorage;
+
+  public CreateAssetLinkTypeTask(IGenericStorage genericStorage) {
+    this.genericStorage = genericStorage;
+  }
+
   @Override
   public void execute() {
-    var genericStorage = getGenericStorage();
 
     this.defaultLinkTypes.forEach(link -> {
       try {
@@ -75,7 +79,4 @@ public class CreateAssetLinkTypeTask implements InstallationTask {
     });
   }
 
-  private IGenericStorage getGenericStorage() {
-    return StorageDispatcher.INSTANCE.getNoSqlStore().getGenericStorage();
-  }
 }
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/extractor/TypeExtractor.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/extractor/TypeExtractor.java
index cb57bcc10c..56e0d0cffa 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/extractor/TypeExtractor.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/extractor/TypeExtractor.java
@@ -30,7 +30,6 @@ import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.serializers.json.JacksonSerializer;
 import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 import org.apache.streampipes.svcdiscovery.api.model.SpServiceUrlProvider;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -52,12 +51,6 @@ public class TypeExtractor {
   private final ExtensionServiceRequestManager requestManager;
   private final SpResourceManager resourceManager;
 
-  public TypeExtractor(String extensionElementDescription,
-                       ExtensionServiceRequestManager requestManager,
-                       SpResourceManager resourceManager) {
-    this(extensionElementDescription, defaultStorageApi(), requestManager, resourceManager);
-  }
-
   public TypeExtractor(
       String extensionElementDescription,
       IPipelineElementDescriptionStorage storageApi,
@@ -144,11 +137,4 @@ public class TypeExtractor {
     );
   }
 
-  private static IPipelineElementDescriptionStorage defaultStorageApi() {
-    return StorageDispatcher
-        .INSTANCE
-        .getNoSqlStore()
-        .getPipelineElementDescriptionStorage();
-  }
-
 }
diff --git a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointUtilsTest.java b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointUtilsTest.java
new file mode 100644
index 0000000000..a200c45ae0
--- /dev/null
+++ b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointUtilsTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.manager.execution.endpoint;
+
+import org.apache.streampipes.model.graph.DataProcessorDescription;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
+import org.apache.streampipes.svcdiscovery.api.model.SpServiceUrlProvider;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class ExtensionsServiceEndpointUtilsTest {
+
+  private final IPipelineElementDescriptionStorage storage = mock(IPipelineElementDescriptionStorage.class);
+
+  @Test
+  void resolvesProcessorUsingInjectedStorage() {
+    when(storage.getDataProcessorByAppId("processor")).thenReturn(new DataProcessorDescription());
+
+    assertEquals(SpServiceUrlProvider.DATA_PROCESSOR,
+        ExtensionsServiceEndpointUtils.getPipelineElementType("processor", storage));
+    verify(storage).getDataProcessorByAppId("processor");
+  }
+
+  @Test
+  void fallsBackToSinkWhenNoProcessorExists() {
+    when(storage.getDataProcessorByAppId("sink")).thenThrow(new NoSuchElementException());
+
+    assertEquals(SpServiceUrlProvider.DATA_SINK,
+        ExtensionsServiceEndpointUtils.getPipelineElementType("sink", storage));
+  }
+
+  @Test
+  void doesNotInterpretStorageFailuresAsSinkTypes() {
+    when(storage.getDataProcessorByAppId("processor")).thenThrow(new IllegalStateException("Storage unavailable"));
+
+    assertThrows(IllegalStateException.class,
+        () -> ExtensionsServiceEndpointUtils.getPipelineElementType("processor", storage));
+  }
+}
diff --git a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/extensions/AvailableExtensionsProviderTest.java b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/extensions/AvailableExtensionsProviderTest.java
new file mode 100644
index 0000000000..9fc99b1aac
--- /dev/null
+++ b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/extensions/AvailableExtensionsProviderTest.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.manager.extensions;
+
+import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.model.extensions.ExtensionItemDescription;
+import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceRegistration;
+import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceStatus;
+import org.apache.streampipes.model.graph.DataProcessorDescription;
+import org.apache.streampipes.model.graph.DataSinkDescription;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
+import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class AvailableExtensionsProviderTest {
+
+  @Test
+  void mergesInstalledDescriptionsWithHealthyServicesWithoutDuplicates() {
+    var services = mock(IExtensionsServiceStorage.class);
+    var adapters = mock(IAdapterStorage.class);
+    var descriptions = mock(IPipelineElementDescriptionStorage.class);
+    var adapter = new AdapterDescription();
+    adapter.setElementId("adapter");
+    var processor = new DataProcessorDescription();
+    processor.setElementId("processor");
+    var sink = new DataSinkDescription();
+    sink.setElementId("sink");
+    var stream = new SpDataStream();
+    stream.setElementId("stream");
+    var managedStream = new SpDataStream();
+    managedStream.setElementId("managed");
+    managedStream.setInternallyManaged(true);
+    when(adapters.findAll()).thenReturn(List.of(adapter));
+    when(descriptions.getAllDataProcessors()).thenReturn(List.of(processor));
+    when(descriptions.getAllDataSinks()).thenReturn(List.of(sink));
+    when(descriptions.getAllDataStreams()).thenReturn(List.of(stream, managedStream));
+
+    var healthy = new SpServiceRegistration();
+    healthy.setStatus(SpServiceStatus.HEALTHY);
+    healthy.setProvidedExtensions(Set.of(extension("processor"), extension("available")));
+    var unavailable = new SpServiceRegistration();
+    unavailable.setProvidedExtensions(Set.of(extension("unavailable")));
+    var anotherHealthyService = new SpServiceRegistration();
+    anotherHealthyService.setStatus(SpServiceStatus.HEALTHY);
+    anotherHealthyService.setProvidedExtensions(Set.of(extension("available")));
+    when(services.findAll()).thenReturn(List.of(healthy, anotherHealthyService, unavailable));
+
+    var result = new AvailableExtensionsProvider(services, adapters, descriptions).getExtensionItemDescriptions();
+
+    assertEquals(5, result.size());
+    assertEquals(Set.of("adapter", "processor", "sink", "stream", "available"),
+        result.stream().map(ExtensionItemDescription::getElementId).collect(Collectors.toSet()));
+    var installedProcessor = result.stream().filter(e -> e.getElementId().equals("processor")).findFirst().orElseThrow();
+    assertTrue(installedProcessor.isInstalled());
+    assertTrue(installedProcessor.isAvailable());
+    var installedSink = result.stream().filter(e -> e.getElementId().equals("sink")).findFirst().orElseThrow();
+    assertTrue(installedSink.isInstalled());
+    assertFalse(installedSink.isAvailable());
+  }
+
+  private ExtensionItemDescription extension(String id) {
+    var extension = new ExtensionItemDescription();
+    extension.setElementId(id);
+    return extension;
+  }
+}
diff --git a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestDatatypeMatch.java b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestDatatypeMatch.java
index 6e6828a1f3..07731448d0 100644
--- a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestDatatypeMatch.java
+++ b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestDatatypeMatch.java
@@ -24,48 +24,60 @@ import org.apache.streampipes.vocabulary.XSD;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 public class TestDatatypeMatch {
 
-  @Test
-  public void testPositiveDatatypeMatch() {
-
-    String offer = XSD.INTEGER.toString();
-    String requirement = XSD.INTEGER.toString();
-
+  @ParameterizedTest
+  @MethodSource("datatypeMatches")
+  public void testDatatypeMatch(String offer, String requirement, boolean expected) {
     List<MatchingResultMessage> errorLog = new ArrayList<>();
 
-    boolean matches = new DatatypeMatch().match(offer, requirement, errorLog);
-    Assertions.assertTrue(matches);
+    Assertions.assertEquals(expected, new DatatypeMatch().match(offer, requirement, errorLog));
+    Assertions.assertEquals(expected ? 0 : 1, errorLog.size());
+    if (!expected) {
+      Assertions.assertEquals(requirement, errorLog.getFirst().getRequirementSubject());
+      Assertions.assertFalse(errorLog.getFirst().isMatchingSuccessful());
+    }
   }
 
-  @Test
-  public void testNegativeDatatypeMatch() {
-
-    String offer = XSD.INTEGER.toString();
-    String requirement = XSD.STRING.toString();
-
-    List<MatchingResultMessage> errorLog = new ArrayList<>();
-
-    boolean matches = new DatatypeMatch().match(offer, requirement, errorLog);
-    Assertions.assertFalse(matches);
+  private static Stream<Arguments> datatypeMatches() {
+    return Stream.of(
+        Arguments.of(XSD.INTEGER.toString(), XSD.INTEGER.toString(), true),
+        Arguments.of(XSD.STRING.toString(), XSD.STRING.toString(), true),
+        Arguments.of("custom:type", "custom:type", true),
+        Arguments.of(SO.NUMBER, SO.NUMBER, true),
+        Arguments.of(XSD.INTEGER.toString(), SO.NUMBER, true),
+        Arguments.of(XSD.LONG.toString(), SO.NUMBER, true),
+        Arguments.of(XSD.DOUBLE.toString(), SO.NUMBER, true),
+        Arguments.of(XSD.FLOAT.toString(), SO.NUMBER, true),
+        Arguments.of(XSD.INTEGER.toString(), XSD.STRING.toString(), false),
+        Arguments.of(XSD.STRING.toString(), SO.NUMBER, false),
+        Arguments.of("custom:type", SO.NUMBER, false),
+        Arguments.of(SO.NUMBER, XSD.INTEGER.toString(), false),
+        Arguments.of(XSD.INTEGER.toString(), XSD.LONG.toString(), false),
+        Arguments.of(null, null, true),
+        Arguments.of(XSD.INTEGER.toString(), null, true),
+        Arguments.of(null, XSD.STRING.toString(), false),
+        Arguments.of(null, SO.NUMBER, false)
+    );
   }
 
   @Test
-  public void testSubPropertyMatch() {
-
-    String offer = XSD.INTEGER.toString();
-    String requirement = SO.NUMBER;
-
+  public void testRepeatedMismatchDoesNotDuplicateError() {
     List<MatchingResultMessage> errorLog = new ArrayList<>();
+    var matcher = new DatatypeMatch();
 
-    boolean matches = new DatatypeMatch().match(offer, requirement, errorLog);
-    Assertions.assertTrue(matches);
-  }
-
+    Assertions.assertFalse(matcher.match(XSD.STRING.toString(), SO.NUMBER, errorLog));
+    Assertions.assertFalse(matcher.match(null, SO.NUMBER, errorLog));
 
+    Assertions.assertEquals(1, errorLog.size());
+    Assertions.assertEquals(SO.NUMBER, errorLog.getFirst().getRequirementSubject());
+  }
 }
-
diff --git a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManager.java b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManager.java
index db2df6411e..1fda8377a6 100644
--- a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManager.java
+++ b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManager.java
@@ -20,13 +20,13 @@ package org.apache.streampipes.resource.management;
 
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.storage.api.connect.IAdapterStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
 public class AdapterDescriptionResourceManager
     extends AbstractPipelineElementResourceManager<IAdapterStorage, AdapterDescription, AdapterDescription> {
 
-  public AdapterDescriptionResourceManager(PermissionResourceManager permissionResourceManager) {
-    super(StorageDispatcher.INSTANCE.getNoSqlStore().getAdapterDescriptionStorage(), permissionResourceManager);
+  public AdapterDescriptionResourceManager(IAdapterStorage adapterDescriptionStorage,
+                                           PermissionResourceManager permissionResourceManager) {
+    super(adapterDescriptionStorage, permissionResourceManager);
   }
 
   @Override
diff --git a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/DataProcessorResourceManager.java b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/DataProcessorResourceManager.java
index 8e0eb9398b..19f9e29201 100644
--- a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/DataProcessorResourceManager.java
+++ b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/DataProcessorResourceManager.java
@@ -20,13 +20,13 @@ package org.apache.streampipes.resource.management;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
 public class DataProcessorResourceManager extends
     AbstractPipelineElementResourceManager<IDataProcessorStorage, DataProcessorDescription, DataProcessorInvocation> {
 
-  public DataProcessorResourceManager(PermissionResourceManager permissionResourceManager) {
-    super(StorageDispatcher.INSTANCE.getNoSqlStore().getDataProcessorStorage(), permissionResourceManager);
+  public DataProcessorResourceManager(IDataProcessorStorage dataProcessorStorage,
+                                      PermissionResourceManager permissionResourceManager) {
+    super(dataProcessorStorage, permissionResourceManager);
   }
 
   @Override
diff --git a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/SpResourceManager.java b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/SpResourceManager.java
index 2b921cebe7..7a56614d36 100644
--- a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/SpResourceManager.java
+++ b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/SpResourceManager.java
@@ -22,13 +22,16 @@ import org.apache.streampipes.storage.api.explorer.IChartStorage;
 import org.apache.streampipes.storage.api.explorer.IDashboardStorage;
 import org.apache.streampipes.storage.api.explorer.IDatasetMetadataStorage;
 import org.apache.streampipes.storage.api.pipeline.ICompactPipelineTemplateStorage;
+import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineStorage;
 import org.apache.streampipes.storage.api.system.IAssetStorage;
 import org.apache.streampipes.storage.api.system.IFileMetadataStorage;
 import org.apache.streampipes.storage.api.system.ISpCoreConfigurationStorage;
+import org.apache.streampipes.storage.api.user.IPasswordRecoveryTokenStorage;
 import org.apache.streampipes.storage.api.user.IPermissionStorage;
 import org.apache.streampipes.storage.api.user.IPrivilegeStorage;
 import org.apache.streampipes.storage.api.user.IRoleStorage;
+import org.apache.streampipes.storage.api.user.IUserActivationTokenStorage;
 import org.apache.streampipes.storage.api.user.IUserGroupStorage;
 import org.apache.streampipes.storage.api.user.IUserStorage;
 import org.apache.streampipes.storage.management.StorageDispatcher;
@@ -38,6 +41,7 @@ public class SpResourceManager {
   private final IPermissionStorage permissionStorage;
   private final IChartStorage chartStorage;
   private final IAdapterStorage adapterStorage;
+  private final IAdapterStorage adapterDescriptionStorage;
   private final IAssetStorage assetStorage;
   private final IDashboardStorage dashboardStorage;
   private final IPipelineStorage pipelineStorage;
@@ -48,10 +52,14 @@ public class SpResourceManager {
   private final IUserGroupStorage userGroupStorage;
   private final IPrivilegeStorage privilegeStorage;
   private final IUserStorage userStorage;
+  private final IDataProcessorStorage dataProcessorStorage;
+  private final IUserActivationTokenStorage userActivationTokenStorage;
+  private final IPasswordRecoveryTokenStorage passwordRecoveryTokenStorage;
 
   public SpResourceManager(IPermissionStorage permissionStorage,
                            IChartStorage chartStorage,
                            IAdapterStorage adapterStorage,
+                           IAdapterStorage adapterDescriptionStorage,
                            IAssetStorage assetStorage,
                            IDashboardStorage dashboardStorage,
                            IPipelineStorage pipelineStorage,
@@ -61,10 +69,14 @@ public class SpResourceManager {
                            IRoleStorage roleStorage,
                            IUserGroupStorage userGroupStorage,
                            IPrivilegeStorage privilegeStorage,
-                           IUserStorage userStorage) {
+                           IUserStorage userStorage,
+                           IDataProcessorStorage dataProcessorStorage,
+                           IUserActivationTokenStorage userActivationTokenStorage,
+                           IPasswordRecoveryTokenStorage passwordRecoveryTokenStorage) {
     this.permissionStorage = permissionStorage;
     this.chartStorage = chartStorage;
     this.adapterStorage = adapterStorage;
+    this.adapterDescriptionStorage = adapterDescriptionStorage;
     this.assetStorage = assetStorage;
     this.dashboardStorage = dashboardStorage;
     this.pipelineStorage = pipelineStorage;
@@ -75,10 +87,13 @@ public class SpResourceManager {
     this.userGroupStorage = userGroupStorage;
     this.privilegeStorage = privilegeStorage;
     this.userStorage = userStorage;
+    this.dataProcessorStorage = dataProcessorStorage;
+    this.userActivationTokenStorage = userActivationTokenStorage;
+    this.passwordRecoveryTokenStorage = passwordRecoveryTokenStorage;
   }
 
   public AdapterDescriptionResourceManager manageAdapterDescriptions() {
-    return new AdapterDescriptionResourceManager(managePermissions());
+    return new AdapterDescriptionResourceManager(adapterDescriptionStorage, managePermissions());
   }
 
   public DataSinkResourceManager manageDataSinks() {
@@ -86,7 +101,7 @@ public class SpResourceManager {
   }
 
   public DataProcessorResourceManager manageDataProcessors() {
-    return new DataProcessorResourceManager(managePermissions());
+    return new DataProcessorResourceManager(dataProcessorStorage, managePermissions());
   }
 
   public DataStreamResourceManager manageDataStreams() {
@@ -148,6 +163,7 @@ public class SpResourceManager {
   }
 
   public UserResourceManager manageUsers() {
-    return new UserResourceManager(userStorage, coreConfigurationStorage);
+    return new UserResourceManager(
+        userStorage, coreConfigurationStorage, userActivationTokenStorage, passwordRecoveryTokenStorage);
   }
 }
diff --git a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/UserResourceManager.java b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/UserResourceManager.java
index ddd15dfe28..4510ceafd4 100644
--- a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/UserResourceManager.java
+++ b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/UserResourceManager.java
@@ -34,7 +34,6 @@ import org.apache.streampipes.storage.api.system.ISpCoreConfigurationStorage;
 import org.apache.streampipes.storage.api.user.IPasswordRecoveryTokenStorage;
 import org.apache.streampipes.storage.api.user.IUserActivationTokenStorage;
 import org.apache.streampipes.storage.api.user.IUserStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 import org.apache.streampipes.user.management.util.PasswordUtil;
 import org.apache.streampipes.user.management.util.TokenUtil;
 
@@ -53,11 +52,17 @@ public class UserResourceManager extends AbstractResourceManager<IUserStorage> {
   private static final Logger LOG = LoggerFactory.getLogger(UserResourceManager.class);
 
   private final ISpCoreConfigurationStorage coreConfigurationStorage;
+  private final IUserActivationTokenStorage userActivationTokenStorage;
+  private final IPasswordRecoveryTokenStorage passwordRecoveryTokenStorage;
 
   public UserResourceManager(IUserStorage userStorage,
-                             ISpCoreConfigurationStorage coreConfigurationStorage) {
+                             ISpCoreConfigurationStorage coreConfigurationStorage,
+                             IUserActivationTokenStorage userActivationTokenStorage,
+                             IPasswordRecoveryTokenStorage passwordRecoveryTokenStorage) {
     super(userStorage);
     this.coreConfigurationStorage = coreConfigurationStorage;
+    this.userActivationTokenStorage = userActivationTokenStorage;
+    this.passwordRecoveryTokenStorage = passwordRecoveryTokenStorage;
   }
 
   public void setHideTutorial(String username, boolean hideTutorial) {
@@ -120,13 +125,13 @@ public class UserResourceManager extends AbstractResourceManager<IUserStorage> {
   }
 
   public void activateAccount(String activationCode) throws UserNotFoundException {
-    UserActivationToken token = getUserActivationTokenStorage().getElementById(activationCode);
+    UserActivationToken token = userActivationTokenStorage.getElementById(activationCode);
     if (token != null) {
       Principal user = db.getUser(token.getUsername());
       if (user instanceof UserAccount) {
         user.setAccountEnabled(true);
         db.updateUser(user);
-        getUserActivationTokenStorage().deleteElement(token);
+        userActivationTokenStorage.deleteElement(token);
       }
     } else {
       throw new UserNotFoundException("User or token not found");
@@ -145,7 +150,7 @@ public class UserResourceManager extends AbstractResourceManager<IUserStorage> {
   private void storeActivationCode(String username,
                                    String activationCode) throws IOException {
     UserActivationToken token = UserActivationToken.create(activationCode, username);
-    getUserActivationTokenStorage().persist(token);
+    userActivationTokenStorage.persist(token);
     new MailSender(coreConfigurationStorage.get()).sendAccountActivationMail(username, activationCode);
   }
 
@@ -159,7 +164,7 @@ public class UserResourceManager extends AbstractResourceManager<IUserStorage> {
   }
 
   public void checkPasswordRecoveryCode(String recoveryCode) {
-    var tokenStorage = getPasswordRecoveryTokenStorage();
+    var tokenStorage = passwordRecoveryTokenStorage;
     PasswordRecoveryToken token = tokenStorage.getElementById(recoveryCode);
     if (token == null) {
       throw new IllegalArgumentException("Invalid recovery code");
@@ -169,27 +174,19 @@ public class UserResourceManager extends AbstractResourceManager<IUserStorage> {
   public void changePassword(String recoveryCode,
                              UserRegistrationData data) throws NoSuchAlgorithmException, InvalidKeySpecException {
     checkPasswordRecoveryCode(recoveryCode);
-    PasswordRecoveryToken token = getPasswordRecoveryTokenStorage().getElementById(recoveryCode);
+    PasswordRecoveryToken token = passwordRecoveryTokenStorage.getElementById(recoveryCode);
     Principal user = db.getUser(token.getUsername());
     if (user instanceof UserAccount) {
       String encryptedPassword = PasswordUtil.encryptPassword(data.getPassword());
       ((UserAccount) user).setPassword(encryptedPassword);
       db.updateUser(user);
-      getPasswordRecoveryTokenStorage().deleteElement(token);
+      passwordRecoveryTokenStorage.deleteElement(token);
     }
   }
 
   private void storeRecoveryCode(String username,
                                  String recoveryCode) {
-    getPasswordRecoveryTokenStorage().persist(PasswordRecoveryToken.create(recoveryCode, username));
-  }
-
-  private IPasswordRecoveryTokenStorage getPasswordRecoveryTokenStorage() {
-    return StorageDispatcher.INSTANCE.getNoSqlStore().getPasswordRecoveryTokenStorage();
-  }
-
-  private IUserActivationTokenStorage getUserActivationTokenStorage() {
-    return StorageDispatcher.INSTANCE.getNoSqlStore().getUserActivationTokenStorage();
+    passwordRecoveryTokenStorage.persist(PasswordRecoveryToken.create(recoveryCode, username));
   }
 
   private Environment getEnvironment() {
diff --git a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManager.java b/streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManagerTest.java
similarity index 51%
copy from streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManager.java
copy to streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManagerTest.java
index db2df6411e..902cfa2eae 100644
--- a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManager.java
+++ b/streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/AdapterDescriptionResourceManagerTest.java
@@ -18,19 +18,33 @@
 
 package org.apache.streampipes.resource.management;
 
+import org.apache.streampipes.model.client.user.Permission;
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.storage.api.connect.IAdapterStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
-public class AdapterDescriptionResourceManager
-    extends AbstractPipelineElementResourceManager<IAdapterStorage, AdapterDescription, AdapterDescription> {
+import org.junit.jupiter.api.Test;
 
-  public AdapterDescriptionResourceManager(PermissionResourceManager permissionResourceManager) {
-    super(StorageDispatcher.INSTANCE.getNoSqlStore().getAdapterDescriptionStorage(), permissionResourceManager);
-  }
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class AdapterDescriptionResourceManagerTest {
+
+  @Test
+  void deletesInjectedDescriptionAndItsPermissions() {
+    var storage = mock(IAdapterStorage.class);
+    var permissions = mock(PermissionResourceManager.class);
+    var description = new AdapterDescription();
+    description.setElementId("description");
+    var permission = new Permission();
+    when(storage.getElementById("description")).thenReturn(description);
+    when(permissions.findForObjectId("description")).thenReturn(List.of(permission));
+
+    new AdapterDescriptionResourceManager(storage, permissions).delete("description");
 
-  @Override
-  protected AdapterDescription toInvocation(AdapterDescription description) {
-    return description;
+    verify(permissions).delete(permission);
+    verify(storage).deleteElement(description);
   }
 }
diff --git a/streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/UserResourceManagerTest.java b/streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/UserResourceManagerTest.java
new file mode 100644
index 0000000000..ea6278e692
--- /dev/null
+++ b/streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/UserResourceManagerTest.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.resource.management;
+
+import org.apache.streampipes.commons.exceptions.UserNotFoundException;
+import org.apache.streampipes.model.client.user.PasswordRecoveryToken;
+import org.apache.streampipes.model.client.user.UserAccount;
+import org.apache.streampipes.model.client.user.UserActivationToken;
+import org.apache.streampipes.model.client.user.UserRegistrationData;
+import org.apache.streampipes.storage.api.system.ISpCoreConfigurationStorage;
+import org.apache.streampipes.storage.api.user.IPasswordRecoveryTokenStorage;
+import org.apache.streampipes.storage.api.user.IUserActivationTokenStorage;
+import org.apache.streampipes.storage.api.user.IUserStorage;
+import org.apache.streampipes.user.management.util.PasswordUtil;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+class UserResourceManagerTest {
+
+  private final IUserStorage users = mock(IUserStorage.class);
+  private final IUserActivationTokenStorage activationTokens = mock(IUserActivationTokenStorage.class);
+  private final IPasswordRecoveryTokenStorage recoveryTokens = mock(IPasswordRecoveryTokenStorage.class);
+  private final UserResourceManager manager = new UserResourceManager(
+      users, mock(ISpCoreConfigurationStorage.class), activationTokens, recoveryTokens);
+
+  @Test
+  void activatesAccountAndConsumesInjectedToken() {
+    var token = UserActivationToken.create("activation", "user");
+    var user = new UserAccount();
+    user.setAccountEnabled(false);
+    when(activationTokens.getElementById("activation")).thenReturn(token);
+    when(users.getUser("user")).thenReturn(user);
+
+    manager.activateAccount("activation");
+
+    assertTrue(user.isAccountEnabled());
+    verify(users).updateUser(user);
+    verify(activationTokens).deleteElement(token);
+    verifyNoInteractions(recoveryTokens);
+  }
+
+  @Test
+  void rejectsUnknownActivationTokenWithoutUpdatingUsers() {
+    assertThrows(UserNotFoundException.class, () -> manager.activateAccount("missing"));
+    verifyNoInteractions(users, recoveryTokens);
+  }
+
+  @Test
+  void changesPasswordAndConsumesInjectedRecoveryToken() throws Exception {
+    var token = PasswordRecoveryToken.create("recovery", "user");
+    var user = new UserAccount();
+    var registration = mock(UserRegistrationData.class);
+    when(registration.getPassword()).thenReturn("test-password");
+    when(recoveryTokens.getElementById("recovery")).thenReturn(token);
+    when(users.getUser("user")).thenReturn(user);
+    try (var passwords = mockStatic(PasswordUtil.class)) {
+      passwords.when(() -> PasswordUtil.encryptPassword("test-password")).thenReturn("encrypted");
+
+      manager.changePassword("recovery", registration);
+
+      assertEquals("encrypted", user.getPassword());
+      verify(users).updateUser(user);
+      verify(recoveryTokens).deleteElement(token);
+      verifyNoInteractions(activationTokens);
+    }
+  }
+
+  @Test
+  void rejectsUnknownRecoveryTokenUsingRecoveryStorage() {
+    assertThrows(IllegalArgumentException.class, () -> manager.checkPasswordRecoveryCode("missing"));
+    verify(recoveryTokens).getElementById("missing");
+    verifyNoInteractions(users, activationTokens);
+  }
+}
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/Authentication.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/Authentication.java
index d085847f32..3f087a41d1 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/Authentication.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/Authentication.java
@@ -74,12 +74,15 @@ public class Authentication extends AbstractRestResource {
 
   AuthenticationManager authenticationManager;
   private final SpResourceManager resourceManager;
+  private final RefreshTokenService refreshTokenService;
   private final ISpCoreConfigurationStorage coreConfigurationStorage;
 
   public Authentication(AuthenticationManager authenticationManager,
-                        SpResourceManager resourceManager) {
+                        SpResourceManager resourceManager,
+                        RefreshTokenService refreshTokenService) {
     this.authenticationManager = authenticationManager;
     this.resourceManager = resourceManager;
+    this.refreshTokenService = refreshTokenService;
     this.coreConfigurationStorage = resourceManager.getCoreConfigurationStorage();
   }
 
@@ -112,7 +115,7 @@ public class Authentication extends AbstractRestResource {
       return unauthorized();
     }
 
-    var issuedRefreshToken = new RefreshTokenService().rotateRefreshToken(existingToken);
+    var issuedRefreshToken = refreshTokenService.rotateRefreshToken(existingToken);
 
     if (issuedRefreshToken == null) {
       clearRefreshCookie(request, response);
@@ -143,7 +146,6 @@ public class Authentication extends AbstractRestResource {
       produces = org.springframework.http.MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<?> logout(HttpServletRequest request,
                                   HttpServletResponse response) {
-    RefreshTokenService refreshTokenService = new RefreshTokenService();
     String existingToken = getRefreshTokenFromRequest(request);
 
     if (existingToken != null) {
@@ -234,7 +236,7 @@ public class Authentication extends AbstractRestResource {
     if (principal instanceof UserAccount) {
       JwtAuthenticationResponse tokenResp = makeJwtResponse(auth);
       if (request != null && response != null) {
-        var issuedRefreshToken = new RefreshTokenService().issueRefreshToken(principal.getPrincipalId(), rememberMe);
+        var issuedRefreshToken = refreshTokenService.issueRefreshToken(principal.getPrincipalId(), rememberMe);
         setRefreshCookie(request, response, issuedRefreshToken);
       }
       ((UserAccount) principal).setLastLoginAtMillis(System.currentTimeMillis());
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/ContainerProvidedOptions.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/ContainerProvidedOptions.java
index 2508aee15e..c18ffd846e 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/ContainerProvidedOptions.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/ContainerProvidedOptions.java
@@ -25,6 +25,7 @@ import org.apache.streampipes.model.monitoring.SpLogMessage;
 import org.apache.streampipes.model.runtime.RuntimeOptionsRequest;
 import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.rest.core.base.impl.AbstractRestResource;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -40,9 +41,10 @@ public class ContainerProvidedOptions extends AbstractRestResource {
   private final ContainerProvidedOptionsHandler containerProvidedOptionsHandler;
 
   public ContainerProvidedOptions(ExtensionServiceRequestManager extensionServiceRequestManager,
-                                  SpResourceManager resourceManager) {
+                                  SpResourceManager resourceManager,
+                                  IPipelineElementDescriptionStorage descriptionStorage) {
     this.containerProvidedOptionsHandler = new ContainerProvidedOptionsHandler(
-        extensionServiceRequestManager, resourceManager
+        extensionServiceRequestManager, resourceManager, descriptionStorage
     );
   }
 
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineCanvasMetadataResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineCanvasMetadataResource.java
index ee86ad9d14..183594119f 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineCanvasMetadataResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineCanvasMetadataResource.java
@@ -40,12 +40,18 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/api/v2/pipeline-canvas-metadata")
 public class PipelineCanvasMetadataResource extends AbstractAuthGuardedRestResource {
 
+  private final IPipelineCanvasMetadataStorage pipelineCanvasMetadataStorage;
+
+  public PipelineCanvasMetadataResource(IPipelineCanvasMetadataStorage pipelineCanvasMetadataStorage) {
+    this.pipelineCanvasMetadataStorage = pipelineCanvasMetadataStorage;
+  }
+
   @GetMapping(path = "/pipeline/{pipelineId}", produces = MediaType.APPLICATION_JSON_VALUE)
   @PreAuthorize("this.hasReadAuthority() and hasPermission(#pipelineId, 'READ')")
   public ResponseEntity<PipelineCanvasMetadata> getPipelineCanvasMetadataForPipeline(
       @PathVariable("pipelineId") String pipelineId) {
     try {
-      return ok(getPipelineCanvasMetadataStorage()
+      return ok(pipelineCanvasMetadataStorage
           .getPipelineCanvasMetadataForPipeline(pipelineId));
     } catch (IllegalArgumentException e) {
       throw new SpMessageException(HttpStatus.BAD_REQUEST, Notifications.error(e.getMessage()));
@@ -58,9 +64,9 @@ public class PipelineCanvasMetadataResource extends AbstractAuthGuardedRestResou
   @PreAuthorize("this.hasWriteAuthority() and hasPermission(#pipelineId, 'WRITE')")
   public ResponseEntity<Void> deletePipelineCanvasMetadataForPipeline(@PathVariable("pipelineId") String pipelineId) {
     PipelineCanvasMetadata metadata =
-        getPipelineCanvasMetadataStorage().getPipelineCanvasMetadataForPipeline(pipelineId);
+        pipelineCanvasMetadataStorage.getPipelineCanvasMetadataForPipeline(pipelineId);
     if (metadata != null) {
-      getPipelineCanvasMetadataStorage().deleteElement(metadata);
+      pipelineCanvasMetadataStorage.deleteElement(metadata);
     }
     return ok();
   }
@@ -72,24 +78,20 @@ public class PipelineCanvasMetadataResource extends AbstractAuthGuardedRestResou
   @PreAuthorize("this.hasWriteAuthority() and hasPermission(#pipelineId, 'WRITE')")
   public ResponseEntity<Void> updatePipelineCanvasMetadata(@PathVariable("pipelineId") String pipelineId,
                                                            @RequestBody PipelineCanvasMetadata pipelineCanvasMetadata) {
-    var existing = getPipelineCanvasMetadataStorage().getPipelineCanvasMetadataForPipeline(pipelineId);
+    var existing = pipelineCanvasMetadataStorage.getPipelineCanvasMetadataForPipeline(pipelineId);
     pipelineCanvasMetadata.setPipelineId(pipelineId);
     if (existing != null) {
       pipelineCanvasMetadata.setId(existing.getId());
       pipelineCanvasMetadata.setRev(existing.getRev());
-      getPipelineCanvasMetadataStorage().updateElement(pipelineCanvasMetadata);
+      pipelineCanvasMetadataStorage.updateElement(pipelineCanvasMetadata);
     } else {
       pipelineCanvasMetadata.setId(null);
       pipelineCanvasMetadata.setRev(null);
-      getPipelineCanvasMetadataStorage().persist(pipelineCanvasMetadata);
+      pipelineCanvasMetadataStorage.persist(pipelineCanvasMetadata);
     }
     return ok();
   }
 
-  private IPipelineCanvasMetadataStorage getPipelineCanvasMetadataStorage() {
-    return getNoSqlStorage().getPipelineCanvasMetadataStorage();
-  }
-
   public boolean hasWriteAuthority() {
     return isAdminOrHasAnyAuthority(DefaultPrivilege.Constants.PRIVILEGE_WRITE_PIPELINE_VALUE);
   }
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
index 35a1377e19..c3af1e9990 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineResource.java
@@ -51,7 +51,7 @@ import org.apache.streampipes.rest.core.base.impl.AbstractAuthGuardedRestResourc
 import org.apache.streampipes.rest.shared.exception.SpMessageException;
 import org.apache.streampipes.rest.shared.exception.SpNotificationException;
 import org.apache.streampipes.storage.api.explorer.IChartStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 
 import com.google.gson.JsonSyntaxException;
 import io.swagger.v3.oas.annotations.Hidden;
@@ -98,13 +98,16 @@ public class PipelineResource extends AbstractAuthGuardedRestResource {
   private final DataProcessorResourceManager dataProcessorResourceManager;
   private final DataSinkResourceManager dataSinkResourceManager;
   private final SpResourceManager resourceManager;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
 
   public PipelineResource(ExtensionServiceRequestManager requestManager,
                           SpResourceManager resourceManager,
-                          IChartStorage chartStorage) {
+                          IChartStorage chartStorage,
+                          IPipelineElementDescriptionStorage descriptionStorage) {
     this.resourceManager = resourceManager;
+    this.descriptionStorage = descriptionStorage;
     this.compactPipelineManagement = new CompactPipelineManagement(
-        StorageDispatcher.INSTANCE.getNoSqlStore().getPipelineElementDescriptionStorage(),
+        descriptionStorage,
         requestManager
     );
     this.requestManager = requestManager;
@@ -114,7 +117,7 @@ public class PipelineResource extends AbstractAuthGuardedRestResource {
     );
     PermissionResourceManager permissionResourceManager = resourceManager.managePermissions();
     this.pipelineManager = new PipelineManager(resourceManager);
-    this.dataProcessorResourceManager = new DataProcessorResourceManager(permissionResourceManager);
+    this.dataProcessorResourceManager = resourceManager.manageDataProcessors();
     this.dataSinkResourceManager = new DataSinkResourceManager(permissionResourceManager);
   }
 
@@ -245,7 +248,7 @@ public class PipelineResource extends AbstractAuthGuardedRestResource {
                                                         @PathVariable("recId") String baseRecElement) {
     try {
       return new ElementRecommender(
-          pipeline, baseRecElement, requestManager, dataProcessorResourceManager, dataSinkResourceManager
+          pipeline, baseRecElement, requestManager, dataProcessorResourceManager, dataSinkResourceManager, descriptionStorage
       ).findRecommendedElements();
     } catch (JsonSyntaxException e) {
       throw new SpNotificationException(
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/ExtensionsInstallationResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/ExtensionsInstallationResource.java
index 3f1a5e3d66..bcc3f5a5d2 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/ExtensionsInstallationResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/ExtensionsInstallationResource.java
@@ -65,10 +65,13 @@ public class ExtensionsInstallationResource extends AbstractAuthGuardedRestResou
   private final DataStreamResourceManager dataStreamResourceManager;
   private final SpResourceManager resourceManager;
   private final AssetManager assetManager;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
 
   public ExtensionsInstallationResource(ExtensionServiceRequestManager extensionServiceRequestManager,
-                                        SpResourceManager resourceManager) {
+                                        SpResourceManager resourceManager,
+                                        IPipelineElementDescriptionStorage descriptionStorage) {
     this.resourceManager = resourceManager;
+    this.descriptionStorage = descriptionStorage;
     this.extensionServiceRequestManager = extensionServiceRequestManager;
     this.dataSinkResourceManager = resourceManager.manageDataSinks();
     this.dataProcessorResourceManager = resourceManager.manageDataProcessors();
@@ -83,7 +86,7 @@ public class ExtensionsInstallationResource extends AbstractAuthGuardedRestResou
   public ResponseEntity<Message> addElement(@RequestBody ExtensionItemInstallationRequest installationReq) {
     try {
       var service = findSupportedService(installationReq);
-      return ok(new ExtensionItemInstaller(service, extensionServiceRequestManager, resourceManager)
+      return ok(new ExtensionItemInstaller(service, extensionServiceRequestManager, resourceManager, descriptionStorage)
           .installExtension(installationReq, getAuthenticatedUserSid()));
     } catch (IOException | SepaParseException | NoServiceEndpointsAvailableException e) {
       return constructErrorMessage(new Notification(NotificationType.PARSE_ERROR, e.getMessage()));
@@ -96,7 +99,7 @@ public class ExtensionsInstallationResource extends AbstractAuthGuardedRestResou
   public ResponseEntity<Message> updateElement(@RequestBody ExtensionItemInstallationRequest installationReq) {
     try {
       var service = findSupportedService(installationReq);
-      return ok(new ExtensionItemInstaller(service, extensionServiceRequestManager, resourceManager)
+      return ok(new ExtensionItemInstaller(service, extensionServiceRequestManager, resourceManager, descriptionStorage)
           .updateExtension(installationReq));
     } catch (IOException | SepaParseException | NoServiceEndpointsAvailableException e) {
       return constructErrorMessage(new Notification(NotificationType.PARSE_ERROR, e.getMessage()));
@@ -105,7 +108,7 @@ public class ExtensionsInstallationResource extends AbstractAuthGuardedRestResou
 
   @DeleteMapping(path = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<Message> deleteElement(@PathVariable("id") String elementId) {
-    IPipelineElementDescriptionStorage requestor = getPipelineElementStorage();
+    IPipelineElementDescriptionStorage requestor = descriptionStorage;
     String appId;
     try {
       if (requestor.existsDataProcessor(elementId)) {
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/ExtensionsServiceEndpointResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/ExtensionsServiceEndpointResource.java
index d6d629d4aa..d516458786 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/ExtensionsServiceEndpointResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/ExtensionsServiceEndpointResource.java
@@ -54,16 +54,19 @@ public class ExtensionsServiceEndpointResource extends AbstractAuthGuardedRestRe
 
   private final ExtensionServiceRequestManager extensionServiceRequestManager;
   private final AssetManager assetManager;
+  private final AvailableExtensionsProvider availableExtensionsProvider;
 
   public ExtensionsServiceEndpointResource(ExtensionServiceRequestManager extensionServiceRequestManager,
-                                           ISpCoreConfigurationStorage coreConfigurationStorage) {
+                                           ISpCoreConfigurationStorage coreConfigurationStorage,
+                                           AvailableExtensionsProvider availableExtensionsProvider) {
     this.extensionServiceRequestManager = extensionServiceRequestManager;
+    this.availableExtensionsProvider = availableExtensionsProvider;
     this.assetManager = new AssetManager(coreConfigurationStorage);
   }
 
   @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<List<ExtensionItemDescription>> getExtensionItems() {
-    var allExtensions = new AvailableExtensionsProvider(getNoSqlStorage()).getExtensionItemDescriptions();
+    var allExtensions = availableExtensionsProvider.getExtensionItemDescriptions();
     return ok(allExtensions);
   }
 
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/MigrationResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/MigrationResource.java
index f08b9e6d19..229f5ca38c 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/MigrationResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/MigrationResource.java
@@ -35,6 +35,7 @@ import org.apache.streampipes.rest.shared.exception.SpMessageException;
 import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
 import org.apache.streampipes.storage.api.pipeline.IDataSinkStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineStorage;
 import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
 
@@ -45,6 +46,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -63,14 +65,14 @@ public class MigrationResource extends AbstractAuthGuardedRestResource {
 
   private static final Logger LOG = LoggerFactory.getLogger(MigrationResource.class);
 
-  private final IExtensionsServiceStorage extensionsServiceStorage =
-      getNoSqlStorage().getExtensionsServiceStorage();
-  private final IAdapterStorage adapterDescriptionStorage = getNoSqlStorage().getAdapterDescriptionStorage();
+  private final IExtensionsServiceStorage extensionsServiceStorage;
+  private final IAdapterStorage adapterDescriptionStorage;
   private final IAdapterStorage adapterStorage;
 
-  private final IDataProcessorStorage dataProcessorStorage = getNoSqlStorage().getDataProcessorStorage();
+  private final IDataProcessorStorage dataProcessorStorage;
 
-  private final IDataSinkStorage dataSinkStorage = getNoSqlStorage().getDataSinkStorage();
+  private final IDataSinkStorage dataSinkStorage;
+  private final IPipelineElementDescriptionStorage descriptionStorage;
   private final IPipelineStorage pipelineStorage;
 
   private final CoreServiceStatusManager coreServiceStatusManager;
@@ -80,7 +82,17 @@ public class MigrationResource extends AbstractAuthGuardedRestResource {
 
   public MigrationResource(ExtensionServiceRequestManager extensionServiceRequestManager,
                            WorkerRestClient workerRestClient,
-                           SpResourceManager resourceManager) {
+                           SpResourceManager resourceManager,
+                           IExtensionsServiceStorage extensionsServiceStorage,
+                           @Qualifier("adapterDescriptionStorage") IAdapterStorage adapterDescriptionStorage,
+                           IDataProcessorStorage dataProcessorStorage,
+                           IDataSinkStorage dataSinkStorage,
+                           IPipelineElementDescriptionStorage descriptionStorage) {
+    this.extensionsServiceStorage = extensionsServiceStorage;
+    this.adapterDescriptionStorage = adapterDescriptionStorage;
+    this.dataProcessorStorage = dataProcessorStorage;
+    this.dataSinkStorage = dataSinkStorage;
+    this.descriptionStorage = descriptionStorage;
     this.extensionServiceRequestManager = extensionServiceRequestManager;
     this.workerRestClient = workerRestClient;
     this.resourceManager = resourceManager;
@@ -141,14 +153,16 @@ public class MigrationResource extends AbstractAuthGuardedRestResource {
                 adapterDescriptionStorage,
                 workerRestClient,
                 extensionServiceRequestManager,
-                resourceManager)
+                resourceManager,
+                descriptionStorage)
               .handleMigrations(extensionsServiceConfig, adapterMigrations);
             new PipelineElementMigrationManager(
                 pipelineStorage,
                 dataProcessorStorage,
                 dataSinkStorage,
                 extensionServiceRequestManager,
-                resourceManager)
+                resourceManager,
+                descriptionStorage)
                 .handleMigrations(extensionsServiceConfig, pipelineElementMigrations);
           }
         }
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterResource.java
index b44a5ab574..2554f55758 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterResource.java
@@ -43,6 +43,7 @@ import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.resource.management.permission.SpPermissionEvaluator;
 import org.apache.streampipes.rest.security.AuthConstants;
 import org.apache.streampipes.rest.shared.constants.SpMediaType;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineStorage;
 import org.apache.streampipes.storage.management.StorageDispatcher;
 
@@ -51,6 +52,7 @@ import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -81,18 +83,21 @@ public class AdapterResource extends AbstractAdapterResource<AdapterMasterManage
   private final PipelineManager pipelineManager;
   private final AdapterUpdateManagement adapterUpdateManagement;
   private final SpResourceManager resourceManager;
+  private final IAdapterStorage adapterDescriptionStorage;
 
   public AdapterResource(WorkerRestClient workerRestClient,
                          ExtensionServiceRequestManager requestManager,
-                         SpResourceManager resourceManager) {
-    this(workerRestClient, requestManager, null, resourceManager);
+                         SpResourceManager resourceManager,
+                         @Qualifier("adapterDescriptionStorage") IAdapterStorage adapterDescriptionStorage) {
+    this(workerRestClient, requestManager, null, resourceManager, adapterDescriptionStorage);
   }
 
   @Autowired
   public AdapterResource(WorkerRestClient workerRestClient,
                          ExtensionServiceRequestManager requestManager,
                          ApplicationEventPublisher eventPublisher,
-                         SpResourceManager resourceManager) {
+                         SpResourceManager resourceManager,
+                         @Qualifier("adapterDescriptionStorage") IAdapterStorage adapterDescriptionStorage) {
     super(() -> new AdapterMasterManagement(
         resourceManager,
         AdapterMetricsManager.INSTANCE.getAdapterMetrics(),
@@ -101,6 +106,7 @@ public class AdapterResource extends AbstractAdapterResource<AdapterMasterManage
         requestManager));
     this.requestManager = requestManager;
     this.resourceManager = resourceManager;
+    this.adapterDescriptionStorage = adapterDescriptionStorage;
     this.eventPublisher = eventPublisher;
     this.permissionResourceManager = resourceManager.managePermissions();
     this.pipelineManager = new PipelineManager(
@@ -142,7 +148,7 @@ public class AdapterResource extends AbstractAdapterResource<AdapterMasterManage
   @PreAuthorize("this.hasWriteAuthority()")
   public ResponseEntity<?> convertToCompactAdapter(@RequestBody AdapterDescription adapterDescription)
       throws Exception {
-    return ok(new CompactAdapterManagement(List.of()).convertToCompactAdapter(adapterDescription));
+    return ok(new CompactAdapterManagement(List.of(), adapterDescriptionStorage).convertToCompactAdapter(adapterDescription));
   }
 
   @PutMapping(produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
@@ -360,7 +366,7 @@ public class AdapterResource extends AbstractAdapterResource<AdapterMasterManage
   }
 
   private CompactAdapter toCompactAdapterDescription(AdapterDescription adapterDescription) throws Exception {
-    return new CompactAdapterManagement(List.of()).convertToCompactAdapter(adapterDescription);
+    return new CompactAdapterManagement(List.of(), adapterDescriptionStorage).convertToCompactAdapter(adapterDescription);
   }
 
   private List<String> getPipelinesUsingAdapter(String adapterId) {
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/CompactAdapterResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/CompactAdapterResource.java
index f262f1e03b..b0864a8a8f 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/CompactAdapterResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/CompactAdapterResource.java
@@ -39,10 +39,12 @@ import org.apache.streampipes.resource.management.SpResourceManager;
 import org.apache.streampipes.rest.shared.constants.SpMediaType;
 import org.apache.streampipes.rest.shared.exception.BadRequestException;
 import org.apache.streampipes.rest.shared.exception.SpMessageException;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.storage.management.StorageDispatcher;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -68,7 +70,8 @@ public class CompactAdapterResource extends AbstractAdapterResource<AdapterMaste
   public CompactAdapterResource(WorkerRestClient workerRestClient,
                                 ExtensionServiceRequestManager requestManager,
                                 ApplicationEventPublisher eventPublisher,
-                                SpResourceManager resourceManager) {
+                                SpResourceManager resourceManager,
+                                @Qualifier("adapterDescriptionStorage") IAdapterStorage adapterDescriptionStorage) {
     super(() -> new AdapterMasterManagement(
         resourceManager,
         AdapterMetricsManager.INSTANCE.getAdapterMetrics(),
@@ -83,7 +86,7 @@ public class CompactAdapterResource extends AbstractAdapterResource<AdapterMaste
     );
     this.requestManager = requestManager;
     this.compactAdapterManagement = new CompactAdapterManagement(
-        new AdapterGenerationSteps(guessManagement).getGenerators()
+        new AdapterGenerationSteps(guessManagement).getGenerators(), adapterDescriptionStorage
     );
     this.pipelineManager = new PipelineManager(
         resourceManager
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/DescriptionResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/DescriptionResource.java
index bda058f254..e30e7e4ddf 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/DescriptionResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/DescriptionResource.java
@@ -29,10 +29,12 @@ import org.apache.streampipes.manager.execution.endpoint.ExtensionsServiceEndpoi
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceRegistration;
 import org.apache.streampipes.resource.management.SpResourceManager;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.svcdiscovery.api.model.SpServiceUrlProvider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,8 +56,9 @@ public class DescriptionResource extends AbstractAdapterResource<DescriptionMana
   private final IExtensionsServiceEndpointGenerator endpointGenerator;
 
   public DescriptionResource(WorkerRestClient workerRestClient,
-                             SpResourceManager resourceManager) {
-    super(() -> new DescriptionManagement(workerRestClient, resourceManager.manageAdapters()));
+                             SpResourceManager resourceManager,
+                             @Qualifier("adapterDescriptionStorage") IAdapterStorage adapterDescriptionStorage) {
+    super(() -> new DescriptionManagement(workerRestClient, resourceManager.manageAdapters(), adapterDescriptionStorage));
     endpointGenerator = new ExtensionsServiceEndpointGenerator();
   }
 
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetImageResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetImageResource.java
index ec5a2f45e8..82eb9099fe 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetImageResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetImageResource.java
@@ -19,7 +19,7 @@
 package org.apache.streampipes.rest.impl.dataset;
 
 import org.apache.streampipes.rest.core.base.impl.AbstractAuthGuardedRestResource;
-import org.apache.streampipes.storage.management.StorageDispatcher;
+import org.apache.streampipes.storage.api.system.IImageStorage;
 
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.ResponseEntity;
@@ -34,9 +34,15 @@ import java.io.IOException;
 @RequestMapping("/api/v4/datalake/images")
 public class DatasetImageResource extends AbstractAuthGuardedRestResource {
 
+  private final IImageStorage imageStorage;
+
+  public DatasetImageResource(IImageStorage imageStorage) {
+    this.imageStorage = imageStorage;
+  }
+
   @GetMapping(path = "{imageId}", produces = "image/jpeg")
   public ResponseEntity<byte[]> getImage(@PathVariable("imageId") String imageId) throws IOException {
-    var image = StorageDispatcher.INSTANCE.getNoSqlStore().getImageStorage().getImageBytes(imageId);
+    var image = imageStorage.getImageBytes(imageId);
     return ok(IOUtils.toByteArray(image));
   }
 }
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/DataProcessorResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/DataProcessorResource.java
index 3d76d2d674..925014ba94 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/DataProcessorResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/DataProcessorResource.java
@@ -27,6 +27,7 @@ import org.apache.streampipes.resource.management.DataProcessorResourceManager;
 import org.apache.streampipes.resource.management.PermissionResourceManager;
 import org.apache.streampipes.rest.core.base.impl.AbstractAuthGuardedRestResource;
 import org.apache.streampipes.rest.security.AuthConstants;
+import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
 import org.apache.streampipes.storage.api.user.IPermissionStorage;
 
 import org.springframework.http.MediaType;
@@ -47,8 +48,9 @@ public class DataProcessorResource extends AbstractAuthGuardedRestResource {
 
   private final DataProcessorResourceManager dataProcessorResourceManager;
 
-  public DataProcessorResource(IPermissionStorage permissionStorage) {
+  public DataProcessorResource(IPermissionStorage permissionStorage, IDataProcessorStorage dataProcessorStorage) {
     this.dataProcessorResourceManager = new DataProcessorResourceManager(
+        dataProcessorStorage,
         new PermissionResourceManager(permissionStorage)
     );
   }
diff --git a/streampipes-rest/src/test/java/org/apache/streampipes/rest/impl/PipelineCanvasMetadataResourceTest.java b/streampipes-rest/src/test/java/org/apache/streampipes/rest/impl/PipelineCanvasMetadataResourceTest.java
new file mode 100644
index 0000000000..61093aee90
--- /dev/null
+++ b/streampipes-rest/src/test/java/org/apache/streampipes/rest/impl/PipelineCanvasMetadataResourceTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.rest.impl;
+
+import org.apache.streampipes.model.canvas.PipelineCanvasMetadata;
+import org.apache.streampipes.storage.api.pipeline.IPipelineCanvasMetadataStorage;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class PipelineCanvasMetadataResourceTest {
+
+  private final IPipelineCanvasMetadataStorage storage = mock(IPipelineCanvasMetadataStorage.class);
+  private final PipelineCanvasMetadataResource resource = new PipelineCanvasMetadataResource(storage);
+
+  @Test
+  void updatesExistingMetadataWithStoredIdentityAndRevision() {
+    var existing = new PipelineCanvasMetadata();
+    existing.setId("stored");
+    existing.setRev("revision");
+    when(storage.getPipelineCanvasMetadataForPipeline("pipeline")).thenReturn(existing);
+    var incoming = new PipelineCanvasMetadata();
+
+    resource.updatePipelineCanvasMetadata("pipeline", incoming);
+
+    assertEquals("pipeline", incoming.getPipelineId());
+    assertEquals("stored", incoming.getId());
+    assertEquals("revision", incoming.getRev());
+    verify(storage).updateElement(incoming);
+    verify(storage, never()).persist(any());
+  }
+
+  @Test
+  void createsMetadataWithoutClientSuppliedIdentity() {
+    var incoming = new PipelineCanvasMetadata();
+    incoming.setId("client-id");
+    incoming.setRev("client-revision");
+
+    resource.updatePipelineCanvasMetadata("pipeline", incoming);
+
+    assertEquals("pipeline", incoming.getPipelineId());
+    assertNull(incoming.getId());
+    assertNull(incoming.getRev());
+    verify(storage).persist(incoming);
+    verify(storage, never()).updateElement(any());
+  }
+
+  @Test
+  void deletingMissingMetadataIsIdempotent() {
+    resource.deletePipelineCanvasMetadataForPipeline("missing");
+
+    verify(storage, never()).deleteElement(any());
+  }
+}
diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/PipelineManagementConfiguration.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/PipelineManagementConfiguration.java
new file mode 100644
index 0000000000..84128bc06c
--- /dev/null
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/PipelineManagementConfiguration.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.service.core;
+
+import org.apache.streampipes.manager.extensions.AvailableExtensionsProvider;
+import org.apache.streampipes.manager.setup.InstallationConfiguration;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
+import org.apache.streampipes.storage.api.pipeline.ICompactPipelineTemplateStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
+import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
+import org.apache.streampipes.storage.api.system.IGenericStorage;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class PipelineManagementConfiguration {
+
+  @Bean
+  public AvailableExtensionsProvider availableExtensionsProvider(
+      IExtensionsServiceStorage extensionsServiceStorage,
+      @Qualifier("adapterDescriptionStorage") IAdapterStorage adapterDescriptionStorage,
+      IPipelineElementDescriptionStorage descriptionStorage) {
+    return new AvailableExtensionsProvider(extensionsServiceStorage, adapterDescriptionStorage, descriptionStorage);
+  }
+
+  @Bean
+  public InstallationConfiguration installationConfiguration(
+      IGenericStorage genericStorage,
+      ICompactPipelineTemplateStorage pipelineTemplateStorage,
+      IPipelineElementDescriptionStorage descriptionStorage,
+      AvailableExtensionsProvider availableExtensionsProvider) {
+    return new InstallationConfiguration(
+        genericStorage, pipelineTemplateStorage, descriptionStorage, availableExtensionsProvider);
+  }
+}
diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/PostStartupTask.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/PostStartupTask.java
index 95d1211a9b..60ecd8f9f9 100644
--- a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/PostStartupTask.java
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/PostStartupTask.java
@@ -33,9 +33,9 @@ import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceTagPrefix;
 import org.apache.streampipes.model.pipeline.Pipeline;
 import org.apache.streampipes.model.pipeline.PipelineOperationStatus;
 import org.apache.streampipes.resource.management.SpResourceManager;
-import org.apache.streampipes.storage.api.core.INoSqlStorage;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
+import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,20 +63,23 @@ public class PostStartupTask implements Runnable {
   private final ExtensionServiceRequestManager extensionServiceRequestManager;
   private final SpResourceManager resourceManager;
 
-  private final INoSqlStorage storage = StorageDispatcher.INSTANCE.getNoSqlStore();
+  private final IExtensionsServiceStorage extensionsServiceStorage;
 
   public PostStartupTask(IPipelineStorage pipelineStorage,
+                         IAdapterStorage adapterDescriptionStorage,
+                         IExtensionsServiceStorage extensionsServiceStorage,
                          ExtensionServiceRequestManager extensionServiceRequestManager,
                          WorkerRestClient workerRestClient,
                          SpResourceManager resourceManager,
                          List<HealthCheck> registeredHealthChecks,
                          Duration healthCheckInterval) {
     this.pipelineStorage = pipelineStorage;
+    this.extensionsServiceStorage = extensionsServiceStorage;
     this.extensionServiceRequestManager = extensionServiceRequestManager;
     this.executorService = Executors.newSingleThreadScheduledExecutor();
     this.resourceManager = resourceManager;
     this.workerAdministrationManagement = new WorkerAdministrationManagement(
-        storage.getAdapterDescriptionStorage(),
+        adapterDescriptionStorage,
         resourceManager,
         extensionServiceRequestManager);
     this.postStartupRecovery = new PostStartupRecovery(
@@ -88,11 +91,11 @@ public class PostStartupTask implements Runnable {
                     resourceManager,
                     AdapterMetricsManager.INSTANCE.getAdapterMetrics(),
                     workerRestClient,
-                    StorageDispatcher.INSTANCE.getNoSqlStore().getExtensionsServiceStorage(),
+                    extensionsServiceStorage,
                     extensionServiceRequestManager
                 )
             ),
-            StorageDispatcher.INSTANCE.getNoSqlStore().getExtensionsServiceStorage(),
+            extensionsServiceStorage,
             extensionServiceRequestManager,
             resourceManager,
             registeredHealthChecks,
@@ -103,14 +106,14 @@ public class PostStartupTask implements Runnable {
 
   @Override
   public void run() {
-    new ServiceHealthCheck(storage.getExtensionsServiceStorage(), extensionServiceRequestManager, resourceManager).run();
+    new ServiceHealthCheck(extensionsServiceStorage, extensionServiceRequestManager, resourceManager).run();
     performAdapterAssetUpdate();
     startAllPreviouslyStoppedPipelines();
     runHealthCheckOnce();
   }
 
   private void performAdapterAssetUpdate() {
-    var installedAppIds = storage.getExtensionsServiceStorage()
+    var installedAppIds = extensionsServiceStorage
         .findAll()
         .stream()
         .flatMap(config -> config.getTags()
diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/StreamPipesCoreApplication.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/StreamPipesCoreApplication.java
index af6396938f..22590fc3ce 100644
--- a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/StreamPipesCoreApplication.java
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/StreamPipesCoreApplication.java
@@ -39,6 +39,7 @@ import org.apache.streampipes.manager.health.CoreServiceStatusManager;
 import org.apache.streampipes.manager.pipeline.ExtensionsServiceLogExecutor;
 import org.apache.streampipes.manager.pipeline.PipelineManager;
 import org.apache.streampipes.manager.setup.AutoInstallation;
+import org.apache.streampipes.manager.setup.InstallationConfiguration;
 import org.apache.streampipes.manager.setup.StreamPipesEnvChecker;
 import org.apache.streampipes.manager.setup.tasks.ApplyDefaultRolesAndPrivilegesTask;
 import org.apache.streampipes.messaging.SpProtocolManager;
@@ -59,6 +60,7 @@ import org.apache.streampipes.service.core.migrations.AvailableMigrations;
 import org.apache.streampipes.service.core.migrations.Migration;
 import org.apache.streampipes.service.core.migrations.MigrationsHandler;
 import org.apache.streampipes.service.core.storage.StorageApiConfiguration;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.storage.api.function.IFunctionStateStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineStorage;
 import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
@@ -66,11 +68,11 @@ import org.apache.streampipes.storage.api.user.IPrivilegeStorage;
 import org.apache.streampipes.storage.api.user.IRoleStorage;
 import org.apache.streampipes.storage.couchdb.impl.user.UserStorage;
 import org.apache.streampipes.storage.couchdb.utils.CouchDbViewGenerator;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -94,7 +96,7 @@ import java.util.function.Supplier;
 @Import({OpenApiConfiguration.class, StreamPipesPasswordEncoder.class,
     StreamPipesPrometheusConfig.class, WebSecurityConfig.class, WelcomePageController.class,
     StorageApiConfiguration.class, ExtensionServiceRequestConfiguration.class, SpPermissionEvaluator.class,
-    DatasetQueryConfiguration.class})
+    DatasetQueryConfiguration.class, PipelineManagementConfiguration.class})
 @ComponentScan({"org.apache.streampipes.rest.*", "org.apache.streampipes.service.core.oauth2",
     "org.apache.streampipes.service.core.scheduler"})
 public class StreamPipesCoreApplication extends StreamPipesServiceBase {
@@ -120,8 +122,15 @@ public class StreamPipesCoreApplication extends StreamPipesServiceBase {
   @Autowired
   protected IPrivilegeStorage privilegeStorage;
 
-  private final IExtensionsServiceStorage extensionsServiceStorage =
-      StorageDispatcher.INSTANCE.getNoSqlStore().getExtensionsServiceStorage();
+  @Autowired
+  private IExtensionsServiceStorage extensionsServiceStorage;
+
+  @Autowired
+  private InstallationConfiguration installationConfiguration;
+
+  @Autowired
+  @Qualifier("adapterDescriptionStorage")
+  private IAdapterStorage adapterDescriptionStorage;
 
   public static void main(String[] args) {
     StreamPipesCoreApplication application = new StreamPipesCoreApplication();
@@ -204,6 +213,8 @@ public class StreamPipesCoreApplication extends StreamPipesServiceBase {
 
     executorService.schedule(new PostStartupTask(
             getPipelineStorage(),
+            adapterDescriptionStorage,
+            extensionsServiceStorage,
             extensionServiceRequestManager,
             workerRestClient,
             resourceManager,
@@ -228,7 +239,7 @@ public class StreamPipesCoreApplication extends StreamPipesServiceBase {
                         extensionsServiceStorage,
                         extensionServiceRequestManager
                     )),
-                StorageDispatcher.INSTANCE.getNoSqlStore().getExtensionsServiceStorage(),
+                extensionsServiceStorage,
                 extensionServiceRequestManager,
                 resourceManager,
                 getRegisteredExtensionHealthChecks(),
@@ -277,7 +288,8 @@ public class StreamPipesCoreApplication extends StreamPipesServiceBase {
       LOG.info("Starting installation procedure");
       new AutoInstallation(
           extensionServiceRequestManager,
-          resourceManager
+          resourceManager,
+          installationConfiguration
       ).startAutoInstallation();
     } catch (InterruptedException e) {
       LOG.error("Ooops, something went wrong during the installation", e);
@@ -309,7 +321,8 @@ public class StreamPipesCoreApplication extends StreamPipesServiceBase {
       }
     });
 
-    new FunctionManager(extensionServiceRequestManager, resourceManager).stopAllFunctionsAndPersistState(functionStateStorage);
+    new FunctionManager(extensionServiceRequestManager, resourceManager, extensionsServiceStorage)
+        .stopAllFunctionsAndPersistState(functionStateStorage);
 
     LOG.info("Thanks for using Apache StreamPipes - see you next time!");
   }
diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/extensions/ExtensionServiceRequestConfiguration.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/extensions/ExtensionServiceRequestConfiguration.java
index 5518404b80..87d056b885 100644
--- a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/extensions/ExtensionServiceRequestConfiguration.java
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/extensions/ExtensionServiceRequestConfiguration.java
@@ -27,18 +27,24 @@ import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.storage.api.explorer.IChartStorage;
 import org.apache.streampipes.storage.api.explorer.IDashboardStorage;
 import org.apache.streampipes.storage.api.explorer.IDatasetMetadataStorage;
+import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineStorage;
 import org.apache.streampipes.storage.api.system.IAssetStorage;
 import org.apache.streampipes.storage.api.system.IFileMetadataStorage;
 import org.apache.streampipes.storage.api.system.ISpCoreConfigurationStorage;
+import org.apache.streampipes.storage.api.user.IPasswordRecoveryTokenStorage;
 import org.apache.streampipes.storage.api.user.IPermissionStorage;
 import org.apache.streampipes.storage.api.user.IPrivilegeStorage;
+import org.apache.streampipes.storage.api.user.IRefreshTokenStorage;
 import org.apache.streampipes.storage.api.user.IRoleStorage;
+import org.apache.streampipes.storage.api.user.IUserActivationTokenStorage;
 import org.apache.streampipes.storage.api.user.IUserGroupStorage;
 import org.apache.streampipes.storage.api.user.IUserStorage;
+import org.apache.streampipes.user.management.service.RefreshTokenService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -99,6 +105,7 @@ public class ExtensionServiceRequestConfiguration {
   public SpResourceManager spResourceManager(IPermissionStorage permissionStorage,
                                              IChartStorage chartStorage,
                                              IAdapterStorage adapterStorage,
+                                             @Qualifier("adapterDescriptionStorage") IAdapterStorage adapterDescriptionStorage,
                                              IDashboardStorage dashboardStorage,
                                              IAssetStorage assetStorage,
                                              IPipelineStorage pipelineStorage,
@@ -108,11 +115,15 @@ public class ExtensionServiceRequestConfiguration {
                                              IRoleStorage roleStorage,
                                              IUserGroupStorage userGroupStorage,
                                              IPrivilegeStorage privilegeStorage,
-                                             IUserStorage userStorage) {
+                                             IUserStorage userStorage,
+                                             IDataProcessorStorage dataProcessorStorage,
+                                             IUserActivationTokenStorage userActivationTokenStorage,
+                                             IPasswordRecoveryTokenStorage passwordRecoveryTokenStorage) {
     return new SpResourceManager(
         permissionStorage,
         chartStorage,
         adapterStorage,
+        adapterDescriptionStorage,
         assetStorage,
         dashboardStorage,
         pipelineStorage,
@@ -122,10 +133,18 @@ public class ExtensionServiceRequestConfiguration {
         roleStorage,
         userGroupStorage,
         privilegeStorage,
-        userStorage
+        userStorage,
+        dataProcessorStorage,
+        userActivationTokenStorage,
+        passwordRecoveryTokenStorage
     );
   }
 
+  @Bean
+  public RefreshTokenService refreshTokenService(IRefreshTokenStorage refreshTokenStorage) {
+    return new RefreshTokenService(refreshTokenStorage);
+  }
+
   @Bean
   public WorkerRestClient workerRestClient(ExtensionServiceRequestManager extensionServiceRequestManager,
                                            SpResourceManager resourceManager) {
diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/oauth2/OAuth2AuthenticationSuccessHandler.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/oauth2/OAuth2AuthenticationSuccessHandler.java
index 4ead483dce..e3a36ed21e 100755
--- a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/oauth2/OAuth2AuthenticationSuccessHandler.java
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/oauth2/OAuth2AuthenticationSuccessHandler.java
@@ -57,6 +57,7 @@ public class OAuth2AuthenticationSuccessHandler extends SimpleUrlAuthenticationS
   private static final long MIN_REFRESH_COOKIE_SECONDS = 1;
 
   private final JwtTokenProvider tokenProvider;
+  private final RefreshTokenService refreshTokenService;
   private final HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository;
   private final Environment env;
 
@@ -66,7 +67,9 @@ public class OAuth2AuthenticationSuccessHandler extends SimpleUrlAuthenticationS
                                      ISpCoreConfigurationStorage coreConfigurationStorage,
                                      IRoleStorage roleStorage,
                                      IUserGroupStorage userGroupStorage,
-                                     IUserStorage userStorage) {
+                                     IUserStorage userStorage,
+                                     RefreshTokenService refreshTokenService) {
+    this.refreshTokenService = refreshTokenService;
     this.tokenProvider = new JwtTokenProvider(coreConfigurationStorage, userStorage, roleStorage, userGroupStorage);
     this.httpCookieOAuth2AuthorizationRequestRepository = httpCookieOAuth2AuthorizationRequestRepository;
     this.env = Environments.getEnvironment();
@@ -108,7 +111,7 @@ public class OAuth2AuthenticationSuccessHandler extends SimpleUrlAuthenticationS
         .orElse(false);
 
     Principal principal = ((PrincipalUserDetails<?>) authentication.getPrincipal()).getDetails();
-    var refreshToken = new RefreshTokenService().issueRefreshToken(principal.getPrincipalId(), rememberMe);
+    var refreshToken = refreshTokenService.issueRefreshToken(principal.getPrincipalId(), rememberMe);
     setRefreshCookie(request, response, refreshToken);
 
     String token = tokenProvider.createToken(authentication);
diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/storage/StorageApiConfiguration.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/storage/StorageApiConfiguration.java
index 18c72ad469..8a40d0b735 100644
--- a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/storage/StorageApiConfiguration.java
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/storage/StorageApiConfiguration.java
@@ -24,27 +24,60 @@ import org.apache.streampipes.storage.api.explorer.IChartStorage;
 import org.apache.streampipes.storage.api.explorer.IDashboardStorage;
 import org.apache.streampipes.storage.api.explorer.IDatasetMetadataStorage;
 import org.apache.streampipes.storage.api.function.IFunctionStateStorage;
+import org.apache.streampipes.storage.api.pipeline.ICompactPipelineTemplateStorage;
+import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
+import org.apache.streampipes.storage.api.pipeline.IDataSinkStorage;
+import org.apache.streampipes.storage.api.pipeline.IDataStreamStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineCanvasMetadataStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
+import org.apache.streampipes.storage.api.pipeline.IPipelineElementTemplateStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineStorage;
 import org.apache.streampipes.storage.api.system.IAssetStorage;
+import org.apache.streampipes.storage.api.system.ICertificateStorage;
+import org.apache.streampipes.storage.api.system.IExtensionsServiceConfigurationStorage;
+import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
 import org.apache.streampipes.storage.api.system.IFileMetadataStorage;
+import org.apache.streampipes.storage.api.system.IGenericStorage;
+import org.apache.streampipes.storage.api.system.IImageStorage;
 import org.apache.streampipes.storage.api.system.ISpCoreConfigurationStorage;
+import org.apache.streampipes.storage.api.system.ITransformationScriptTemplateStorage;
+import org.apache.streampipes.storage.api.user.IPasswordRecoveryTokenStorage;
 import org.apache.streampipes.storage.api.user.IPermissionStorage;
 import org.apache.streampipes.storage.api.user.IPrivilegeStorage;
+import org.apache.streampipes.storage.api.user.IRefreshTokenStorage;
 import org.apache.streampipes.storage.api.user.IRoleStorage;
+import org.apache.streampipes.storage.api.user.IUserActivationTokenStorage;
 import org.apache.streampipes.storage.api.user.IUserGroupStorage;
 import org.apache.streampipes.storage.api.user.IUserStorage;
+import org.apache.streampipes.storage.couchdb.impl.connect.AdapterDescriptionStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.connect.AdapterInstanceStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.explorer.ChartStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.explorer.DashboardStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.explorer.DatasetMetadataStorage;
 import org.apache.streampipes.storage.couchdb.impl.function.FunctionStateStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.pipeline.CompactPipelineTemplateStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.pipeline.DataProcessorStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.pipeline.DataSinkStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.pipeline.DataStreamStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.pipeline.PipelineCanvasMetadataStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.pipeline.PipelineElementDescriptionStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.pipeline.PipelineElementTemplateStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.pipeline.PipelineStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.system.AssetStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.system.CertificateStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.system.CoreConfigurationStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.system.ExtensionsServiceConfigurationStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.system.ExtensionsServiceStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.system.FileMetadataStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.system.GenericStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.system.ImageStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.system.TransformationScriptTemplateStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.user.PasswordRecoveryTokenStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.user.PermissionStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.user.PrivilegeStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.user.RefreshTokenStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.user.RoleStorageImpl;
+import org.apache.streampipes.storage.couchdb.impl.user.UserActivationTokenStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.user.UserGroupStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.user.UserStorage;
 import org.apache.streampipes.storage.couchdb.utils.Utils;
@@ -54,6 +87,8 @@ import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
 
 @Configuration
 @EnableCaching
@@ -114,6 +149,7 @@ public class StorageApiConfiguration {
   }
 
   @Bean
+  @Primary
   public IAdapterStorage adapterStorage(CacheManager cacheManager) {
     IAdapterStorage delegate = new AdapterInstanceStorageImpl();
     return adapterCacheEnabled ? new CachedAdapterStorage(delegate, cacheManager) : delegate;
@@ -179,4 +215,91 @@ public class StorageApiConfiguration {
     IUserStorage delegate = new UserStorage();
     return userCacheEnabled ? new CachedUserStorage(delegate, cacheManager) : delegate;
   }
+
+  @Bean
+  public IAdapterStorage adapterDescriptionStorage() {
+    return new AdapterDescriptionStorageImpl();
+  }
+
+  @Bean
+  public IGenericStorage genericStorage() {
+    return new GenericStorageImpl();
+  }
+
+  // The legacy image store opens its database connection in the constructor.
+  @Bean
+  @Lazy
+  public IImageStorage imageStorage() {
+    return new ImageStorageImpl();
+  }
+
+  @Bean
+  public IPipelineElementTemplateStorage pipelineElementTemplateStorage() {
+    return new PipelineElementTemplateStorageImpl();
+  }
+
+  @Bean
+  public IPipelineCanvasMetadataStorage pipelineCanvasMetadataStorage() {
+    return new PipelineCanvasMetadataStorageImpl();
+  }
+
+  @Bean
+  public IPipelineElementDescriptionStorage pipelineElementDescriptionStorage() {
+    return new PipelineElementDescriptionStorageImpl();
+  }
+
+  @Bean
+  public IDataProcessorStorage dataProcessorStorage() {
+    return new DataProcessorStorageImpl();
+  }
+
+  @Bean
+  public IDataSinkStorage dataSinkStorage() {
+    return new DataSinkStorageImpl();
+  }
+
+  @Bean
+  public IDataStreamStorage dataStreamStorage() {
+    return new DataStreamStorageImpl();
+  }
+
+  @Bean
+  public IPasswordRecoveryTokenStorage passwordRecoveryTokenStorage() {
+    return new PasswordRecoveryTokenStorageImpl();
+  }
+
+  @Bean
+  public IUserActivationTokenStorage userActivationTokenStorage() {
+    return new UserActivationTokenStorageImpl();
+  }
+
+  @Bean
+  public IRefreshTokenStorage refreshTokenStorage() {
+    return new RefreshTokenStorageImpl();
+  }
+
+  @Bean
+  public IExtensionsServiceStorage extensionsServiceStorage() {
+    return new ExtensionsServiceStorageImpl();
+  }
+
+  @Bean
+  public IExtensionsServiceConfigurationStorage extensionsServiceConfigurationStorage() {
+    return new ExtensionsServiceConfigurationStorageImpl();
+  }
+
+  @Bean
+  public ICompactPipelineTemplateStorage pipelineTemplateStorage() {
+    return new CompactPipelineTemplateStorageImpl();
+  }
+
+  @Bean
+  public ICertificateStorage certificateStorage() {
+    return new CertificateStorageImpl();
+  }
+
+  @Bean
+  public ITransformationScriptTemplateStorage transformationScriptTemplateStorage() {
+    return new TransformationScriptTemplateStorageImpl();
+  }
 }
diff --git a/streampipes-service-core/src/test/java/org/apache/streampipes/service/core/storage/StorageApiConfigurationTest.java b/streampipes-service-core/src/test/java/org/apache/streampipes/service/core/storage/StorageApiConfigurationTest.java
index dd8673ae7e..272611d292 100644
--- a/streampipes-service-core/src/test/java/org/apache/streampipes/service/core/storage/StorageApiConfigurationTest.java
+++ b/streampipes-service-core/src/test/java/org/apache/streampipes/service/core/storage/StorageApiConfigurationTest.java
@@ -17,6 +17,13 @@
  */
 package org.apache.streampipes.service.core.storage;
 
+import org.apache.streampipes.manager.extensions.AvailableExtensionsProvider;
+import org.apache.streampipes.manager.setup.InstallationConfiguration;
+import org.apache.streampipes.service.core.PipelineManagementConfiguration;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
+import org.apache.streampipes.storage.api.core.INoSqlStorage;
+import org.apache.streampipes.storage.api.system.IImageStorage;
+import org.apache.streampipes.storage.couchdb.impl.connect.AdapterDescriptionStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.connect.AdapterInstanceStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.explorer.ChartStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.pipeline.PipelineStorageImpl;
@@ -24,11 +31,20 @@ import org.apache.streampipes.storage.couchdb.impl.system.CoreConfigurationStora
 import org.apache.streampipes.storage.couchdb.impl.user.PrivilegeStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.user.RoleStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.user.UserStorage;
+import org.apache.streampipes.storage.couchdb.utils.Utils;
 
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Mockito.mockStatic;
 
 class StorageApiConfigurationTest {
 
@@ -46,6 +62,39 @@ class StorageApiConfigurationTest {
       CachedSpCoreConfigurationStorage.CACHE_NAME
   );
 
+  @Test
+  void registersUncachedStoragesAndDistinguishesAdapterDescriptions() {
+    try (var clients = mockStatic(Utils.class);
+         var context = new AnnotationConfigApplicationContext()) {
+      context.registerBean(CacheManager.class, () -> cacheManager);
+      context.register(StorageApiConfiguration.class, PipelineManagementConfiguration.class, AdapterStorages.class);
+      context.refresh();
+
+      var adapters = context.getBean(AdapterStorages.class);
+      assertSame(context.getBean("adapterStorage"), adapters.instances());
+      assertSame(context.getBean("adapterDescriptionStorage"), adapters.descriptions());
+      assertInstanceOf(CachedAdapterStorage.class, adapters.instances());
+      assertInstanceOf(AdapterDescriptionStorageImpl.class, adapters.descriptions());
+
+      for (var method : INoSqlStorage.class.getDeclaredMethods()) {
+        var storageType = method.getReturnType();
+        if (storageType != IAdapterStorage.class && storageType != IImageStorage.class) {
+          var storage = context.getBean(storageType);
+          assertFalse(storage.getClass().getSimpleName().startsWith("Cached"), storageType.getSimpleName());
+        }
+      }
+      assertEquals(IImageStorage.class, context.getType("imageStorage"));
+      assertFalse(context.getBeanFactory().containsSingleton("imageStorage"));
+      assertNotNull(context.getBean(InstallationConfiguration.class));
+      assertNotNull(context.getBean(AvailableExtensionsProvider.class));
+      clients.verifyNoInteractions();
+    }
+  }
+
+  record AdapterStorages(IAdapterStorage instances,
+                         @Qualifier("adapterDescriptionStorage") IAdapterStorage descriptions) {
+  }
+
   @Test
   void enablesStorageCaches() {
     var configuration = new StorageApiConfiguration(true, true, true, true, true, true, true, true, true, true, true);
diff --git a/streampipes-storage-api/src/main/java/org/apache/streampipes/storage/api/core/INoSqlStorage.java b/streampipes-storage-api/src/main/java/org/apache/streampipes/storage/api/core/INoSqlStorage.java
index 332a47e0b3..218ee8613b 100644
--- a/streampipes-storage-api/src/main/java/org/apache/streampipes/storage/api/core/INoSqlStorage.java
+++ b/streampipes-storage-api/src/main/java/org/apache/streampipes/storage/api/core/INoSqlStorage.java
@@ -17,50 +17,29 @@
  */
 package org.apache.streampipes.storage.api.core;
 
-import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.storage.api.pipeline.ICompactPipelineTemplateStorage;
-import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
 import org.apache.streampipes.storage.api.pipeline.IDataSinkStorage;
 import org.apache.streampipes.storage.api.pipeline.IDataStreamStorage;
-import org.apache.streampipes.storage.api.pipeline.IPipelineCanvasMetadataStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineElementTemplateStorage;
 import org.apache.streampipes.storage.api.system.ICertificateStorage;
 import org.apache.streampipes.storage.api.system.IExtensionsServiceConfigurationStorage;
 import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
 import org.apache.streampipes.storage.api.system.IGenericStorage;
-import org.apache.streampipes.storage.api.system.IImageStorage;
 import org.apache.streampipes.storage.api.system.ITransformationScriptTemplateStorage;
-import org.apache.streampipes.storage.api.user.IPasswordRecoveryTokenStorage;
-import org.apache.streampipes.storage.api.user.IRefreshTokenStorage;
-import org.apache.streampipes.storage.api.user.IUserActivationTokenStorage;
 
 public interface INoSqlStorage {
 
   IGenericStorage getGenericStorage();
 
-  IAdapterStorage getAdapterDescriptionStorage();
-
-  IImageStorage getImageStorage();
-
   IPipelineElementTemplateStorage getPipelineElementTemplateStorage();
 
-  IPipelineCanvasMetadataStorage getPipelineCanvasMetadataStorage();
-
   IPipelineElementDescriptionStorage getPipelineElementDescriptionStorage();
 
-  IDataProcessorStorage getDataProcessorStorage();
-
   IDataSinkStorage getDataSinkStorage();
 
   IDataStreamStorage getDataStreamStorage();
 
-  IPasswordRecoveryTokenStorage getPasswordRecoveryTokenStorage();
-
-  IUserActivationTokenStorage getUserActivationTokenStorage();
-
-  IRefreshTokenStorage getRefreshTokenStorage();
-
   IExtensionsServiceStorage getExtensionsServiceStorage();
 
   IExtensionsServiceConfigurationStorage getExtensionsServiceConfigurationStorage();
diff --git a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/CouchDbStorageManager.java b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/CouchDbStorageManager.java
index 420c488e66..96a757bbf8 100644
--- a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/CouchDbStorageManager.java
+++ b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/CouchDbStorageManager.java
@@ -17,79 +17,45 @@
  */
 package org.apache.streampipes.storage.couchdb;
 
-import org.apache.streampipes.storage.api.connect.IAdapterStorage;
 import org.apache.streampipes.storage.api.core.INoSqlStorage;
 import org.apache.streampipes.storage.api.pipeline.ICompactPipelineTemplateStorage;
-import org.apache.streampipes.storage.api.pipeline.IDataProcessorStorage;
 import org.apache.streampipes.storage.api.pipeline.IDataSinkStorage;
 import org.apache.streampipes.storage.api.pipeline.IDataStreamStorage;
-import org.apache.streampipes.storage.api.pipeline.IPipelineCanvasMetadataStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineElementDescriptionStorage;
 import org.apache.streampipes.storage.api.pipeline.IPipelineElementTemplateStorage;
 import org.apache.streampipes.storage.api.system.ICertificateStorage;
 import org.apache.streampipes.storage.api.system.IExtensionsServiceConfigurationStorage;
 import org.apache.streampipes.storage.api.system.IExtensionsServiceStorage;
 import org.apache.streampipes.storage.api.system.IGenericStorage;
-import org.apache.streampipes.storage.api.system.IImageStorage;
 import org.apache.streampipes.storage.api.system.ITransformationScriptTemplateStorage;
-import org.apache.streampipes.storage.api.user.IPasswordRecoveryTokenStorage;
-import org.apache.streampipes.storage.api.user.IRefreshTokenStorage;
-import org.apache.streampipes.storage.api.user.IUserActivationTokenStorage;
-import org.apache.streampipes.storage.couchdb.impl.connect.AdapterDescriptionStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.pipeline.CompactPipelineTemplateStorageImpl;
-import org.apache.streampipes.storage.couchdb.impl.pipeline.DataProcessorStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.pipeline.DataSinkStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.pipeline.DataStreamStorageImpl;
-import org.apache.streampipes.storage.couchdb.impl.pipeline.PipelineCanvasMetadataStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.pipeline.PipelineElementDescriptionStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.pipeline.PipelineElementTemplateStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.system.CertificateStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.system.ExtensionsServiceConfigurationStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.system.ExtensionsServiceStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.system.GenericStorageImpl;
-import org.apache.streampipes.storage.couchdb.impl.system.ImageStorageImpl;
 import org.apache.streampipes.storage.couchdb.impl.system.TransformationScriptTemplateStorageImpl;
-import org.apache.streampipes.storage.couchdb.impl.user.PasswordRecoveryTokenStorageImpl;
-import org.apache.streampipes.storage.couchdb.impl.user.RefreshTokenStorageImpl;
-import org.apache.streampipes.storage.couchdb.impl.user.UserActivationTokenStorageImpl;
 
 public class CouchDbStorageManager implements INoSqlStorage {
 
-  @Override
-  public IAdapterStorage getAdapterDescriptionStorage() {
-    return new AdapterDescriptionStorageImpl();
-  }
-
   @Override
   public IGenericStorage getGenericStorage() {
     return new GenericStorageImpl();
   }
 
-  @Override
-  public IImageStorage getImageStorage() {
-    return new ImageStorageImpl();
-  }
-
   @Override
   public IPipelineElementTemplateStorage getPipelineElementTemplateStorage() {
     return new PipelineElementTemplateStorageImpl();
   }
 
-  @Override
-  public IPipelineCanvasMetadataStorage getPipelineCanvasMetadataStorage() {
-    return new PipelineCanvasMetadataStorageImpl();
-  }
-
   @Override
   public IPipelineElementDescriptionStorage getPipelineElementDescriptionStorage() {
     return new PipelineElementDescriptionStorageImpl();
   }
 
-  @Override
-  public IDataProcessorStorage getDataProcessorStorage() {
-    return new DataProcessorStorageImpl();
-  }
-
   @Override
   public IDataSinkStorage getDataSinkStorage() {
     return new DataSinkStorageImpl();
@@ -100,21 +66,6 @@ public class CouchDbStorageManager implements INoSqlStorage {
     return new DataStreamStorageImpl();
   }
 
-  @Override
-  public IPasswordRecoveryTokenStorage getPasswordRecoveryTokenStorage() {
-    return new PasswordRecoveryTokenStorageImpl();
-  }
-
-  @Override
-  public IUserActivationTokenStorage getUserActivationTokenStorage() {
-    return new UserActivationTokenStorageImpl();
-  }
-
-  @Override
-  public IRefreshTokenStorage getRefreshTokenStorage() {
-    return new RefreshTokenStorageImpl();
-  }
-
   @Override
   public IExtensionsServiceStorage getExtensionsServiceStorage() {
     return new ExtensionsServiceStorageImpl();
diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml
index 464bcadc3d..7dc4f3fc26 100644
--- a/streampipes-user-management/pom.xml
+++ b/streampipes-user-management/pom.xml
@@ -79,6 +79,11 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/service/RefreshTokenService.java b/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/service/RefreshTokenService.java
index e380ce1f88..3b6e2ea798 100644
--- a/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/service/RefreshTokenService.java
+++ b/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/service/RefreshTokenService.java
@@ -19,7 +19,6 @@ package org.apache.streampipes.user.management.service;
 
 import org.apache.streampipes.model.client.user.RefreshToken;
 import org.apache.streampipes.storage.api.user.IRefreshTokenStorage;
-import org.apache.streampipes.storage.management.StorageDispatcher;
 import org.apache.streampipes.user.management.util.TokenUtil;
 
 import java.util.UUID;
@@ -32,10 +31,8 @@ public class RefreshTokenService {
 
   private final IRefreshTokenStorage refreshTokenStorage;
 
-  public RefreshTokenService() {
-    this.refreshTokenStorage = StorageDispatcher.INSTANCE
-        .getNoSqlStore()
-        .getRefreshTokenStorage();
+  public RefreshTokenService(IRefreshTokenStorage refreshTokenStorage) {
+    this.refreshTokenStorage = refreshTokenStorage;
   }
 
   public IssuedRefreshToken issueRefreshToken(String principalId,
diff --git a/streampipes-user-management/src/test/java/org/apache/streampipes/user/management/service/RefreshTokenServiceTest.java b/streampipes-user-management/src/test/java/org/apache/streampipes/user/management/service/RefreshTokenServiceTest.java
new file mode 100644
index 0000000000..2a1f0a0588
--- /dev/null
+++ b/streampipes-user-management/src/test/java/org/apache/streampipes/user/management/service/RefreshTokenServiceTest.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.user.management.service;
+
+import org.apache.streampipes.model.Tuple2;
+import org.apache.streampipes.model.client.user.RefreshToken;
+import org.apache.streampipes.storage.api.user.IRefreshTokenStorage;
+import org.apache.streampipes.user.management.util.TokenUtil;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class RefreshTokenServiceTest {
+
+  private final IRefreshTokenStorage storage = mock(IRefreshTokenStorage.class);
+  private final RefreshTokenService service = new RefreshTokenService(storage);
+
+  @Test
+  void persistsOnlyHashAndKeepsSessionLifetime() {
+    when(storage.persist(any())).thenReturn(new Tuple2<>(true, "stored"));
+
+    var issued = service.issueRefreshToken("principal", false);
+
+    var captured = ArgumentCaptor.forClass(RefreshToken.class);
+    verify(storage).persist(captured.capture());
+    var stored = captured.getValue();
+    assertEquals(TokenUtil.hashToken(issued.rawToken()), stored.getHashedToken());
+    assertNotEquals(issued.rawToken(), stored.getHashedToken());
+    assertEquals("principal", stored.getPrincipalId());
+    assertEquals(24L * 60 * 60 * 1000, stored.getExpiresAtMillis() - stored.getCreatedAtMillis());
+  }
+
+  @Test
+  void rotatesValidTokenAndRevokesPreviousToken() {
+    var existing = token();
+    when(storage.findByHashedToken(TokenUtil.hashToken("test-token"))).thenReturn(existing);
+    when(storage.persist(any())).thenReturn(new Tuple2<>(true, "stored"));
+
+    var replacement = service.rotateRefreshToken("test-token");
+
+    assertNotNull(replacement);
+    assertNotNull(existing.getRevokedAtMillis());
+    assertEquals(replacement.tokenId(), existing.getReplacedByTokenId());
+    verify(storage).updateElement(existing);
+  }
+
+  @Test
+  void rejectsExpiredAndRevokedTokens() {
+    var existing = token();
+    existing.setExpiresAtMillis(0);
+    when(storage.findByHashedToken(TokenUtil.hashToken("test-token"))).thenReturn(existing);
+    assertNull(service.rotateRefreshToken("test-token"));
+
+    existing.setExpiresAtMillis(System.currentTimeMillis() + 60_000);
+    existing.setRevokedAtMillis(1L);
+    assertNull(service.rotateRefreshToken("test-token"));
+    verify(storage, never()).persist(any());
+  }
+
+  @Test
+  void doesNotReturnTokenWhenPersistenceFails() {
+    when(storage.persist(any())).thenReturn(new Tuple2<>(false, "failed"));
+
+    assertThrows(IllegalStateException.class, () -> service.issueRefreshToken("principal", false));
+  }
+
+  private RefreshToken token() {
+    return RefreshToken.create("id", "principal", TokenUtil.hashToken("test-token"),
+        System.currentTimeMillis(), System.currentTimeMillis() + 60_000, false);
+  }
+}