diff --git a/Modules/CppRestSdk/files.cmake b/Modules/CppRestSdk/files.cmake
index 39eceff64b..b6b047eaa9 100644
--- a/Modules/CppRestSdk/files.cmake
+++ b/Modules/CppRestSdk/files.cmake
@@ -1,12 +1,14 @@
 file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   mitkRESTServer.cpp
   mitkRESTClient.cpp
   mitkDICOMWeb.cpp
   mitkRESTClientMicroService.cpp
   mitkRESTServerMicroService.cpp
   mitkCppRestSdkActivator.cpp
   mitkIRESTClient.cpp
   mitkIRESTServer.cpp
+  mitkIRESTManager.cpp
+  mitkRESTManager.cpp
 )
diff --git a/Modules/CppRestSdk/include/mitkIRESTClient.h b/Modules/CppRestSdk/include/mitkIRESTClient.h
index e53a56d13c..fa6488715f 100644
--- a/Modules/CppRestSdk/include/mitkIRESTClient.h
+++ b/Modules/CppRestSdk/include/mitkIRESTClient.h
@@ -1,21 +1,20 @@
 #ifndef mitkIRESTClient_h
 #define mitkIRESTClient_h
 
 #include <MitkCoreExports.h>
 #include <mitkServiceInterface.h>
 
 namespace mitk
 {
   class IRESTClient
   {
   public:
     virtual ~IRESTClient();
 
     virtual void TestFunctionClient() = 0;
   };
 }
 
-MITK_DECLARE_SERVICE_INTERFACE(mitk::IRESTClient, "org.mitk.IRESTClient")
 #endif
 
 
diff --git a/Modules/CppRestSdk/include/mitkIRESTManager.h b/Modules/CppRestSdk/include/mitkIRESTManager.h
new file mode 100644
index 0000000000..013f74a8c0
--- /dev/null
+++ b/Modules/CppRestSdk/include/mitkIRESTManager.h
@@ -0,0 +1,18 @@
+#ifndef mitkIRESTManager_h
+#define mitkIRESTManager_h
+
+#include <MitkCoreExports.h>
+#include <mitkServiceInterface.h>
+
+namespace mitk
+{
+  class IRESTManager
+  {
+  public:
+    virtual ~IRESTManager();
+
+    virtual void TestFunctionManager() = 0;
+  };
+} // namespace mitk
+
+#endif
diff --git a/Modules/CppRestSdk/include/mitkRESTManager.h b/Modules/CppRestSdk/include/mitkRESTManager.h
new file mode 100644
index 0000000000..ccc281d48b
--- /dev/null
+++ b/Modules/CppRestSdk/include/mitkRESTManager.h
@@ -0,0 +1,23 @@
+#ifndef mitkRESTManager_h
+#define mitkRESTManager_h
+
+#include <mitkIRESTManager.h>
+#include <mitkRESTClientMicroService.h>
+#include <mitkRESTServerMicroService.h>
+
+namespace mitk
+{
+  class RESTManager : public IRESTManager
+  {
+  public:
+    RESTManager();
+    ~RESTManager() override;
+
+    void TestFunctionManager() override;
+
+  private:
+    std::map<int, RESTClientMicroService> clientMap; //Map with port client pairs
+    std::map<int, RESTServerMicroService> serverMap; //Map with port server pairs
+  };
+} // namespace mitk
+#endif // !mitkRESTManager_h
diff --git a/Modules/CppRestSdk/src/mitkCppRestSdkActivator.cpp b/Modules/CppRestSdk/src/mitkCppRestSdkActivator.cpp
index d26354fb56..998b216070 100644
--- a/Modules/CppRestSdk/src/mitkCppRestSdkActivator.cpp
+++ b/Modules/CppRestSdk/src/mitkCppRestSdkActivator.cpp
@@ -1,52 +1,36 @@
 #include "mitkCppRestSdkActivator.h"
 
 #include <usGetModuleContext.h>
 #include<usModule.h> 
 #include<usModuleActivator.h> 
 #include<usModuleContext.h> 
 #include<usModuleEvent.h> 
 #include<usModuleInitialization.h> 
 #include<usModuleResource.h> 
 #include<usModuleResourceStream.h> 
 #include<usModuleSettings.h> 
 #include<usServiceTracker.h>
 
 
 void MitkCppRestSdkActivator::Load(us::ModuleContext *context)
 {
-  m_RESTClientMicroService.reset(new mitk::RESTClientMicroService);
-  context->RegisterService<mitk::IRESTClient>(m_RESTClientMicroService.get());
+  m_RESTManager.reset(new mitk::RESTManager);
+  context->RegisterService<mitk::IRESTManager>(m_RESTManager.get());
 
-  m_RESTServerMicroService.reset(new mitk::RESTServerMicroService);
-  context->RegisterService<mitk::IRESTServer>(m_RESTServerMicroService.get());
-
-
-  us::ServiceReference<mitk::IRESTClient> refClient = context->GetServiceReference<mitk::IRESTClient>();
-  if (refClient)
+  us::ServiceReference<mitk::IRESTManager> refManager = context->GetServiceReference<mitk::IRESTManager>();
+  if (refManager)
   {
-    auto serviceClient = context->GetService(refClient);
+    auto serviceClient = context->GetService(refManager);
     if (serviceClient)
     {
-      serviceClient->TestFunctionClient();
+      serviceClient->TestFunctionManager();
     }
   }
-
-
-  us::ServiceReference<mitk::IRESTServer> refServer = context->GetServiceReference<mitk::IRESTServer>();
-  if (refServer)
-  {
-    auto serviceServer = context->GetService(refServer);
-    if (serviceServer)
-    {
-      serviceServer->TestFunctionServer();
-    }
-  }
-
 }
 
 void MitkCppRestSdkActivator::Unload(us::ModuleContext *) 
 {
 
 }
 
 US_EXPORT_MODULE_ACTIVATOR(MitkCppRestSdkActivator)
diff --git a/Modules/CppRestSdk/src/mitkCppRestSdkActivator.h b/Modules/CppRestSdk/src/mitkCppRestSdkActivator.h
index 021a9be143..767c675fab 100644
--- a/Modules/CppRestSdk/src/mitkCppRestSdkActivator.h
+++ b/Modules/CppRestSdk/src/mitkCppRestSdkActivator.h
@@ -1,23 +1,21 @@
 #ifndef MITKCPPRESTSDKACTIVATOR_H_
 #define MITKCPPRESTSDKACTIVATOR_H_
 
-#include <mitkRESTClientMicroService.h>
-#include <mitkRESTServerMicroService.h>
+#include <mitkRESTManager.h>
 
 #include <usModuleActivator.h>
 #include <usModuleEvent.h> 
 #include <usServiceRegistration.h> 
 #include <usServiceTracker.h>
 
 class MitkCppRestSdkActivator : public us::ModuleActivator
 {
 public:
   void Load(us::ModuleContext *context) override;
   void Unload(us::ModuleContext *) override;
 
 private:
-  std::unique_ptr<mitk::RESTClientMicroService> m_RESTClientMicroService;
-  std::unique_ptr<mitk::RESTServerMicroService> m_RESTServerMicroService;
+  std::unique_ptr<mitk::RESTManager> m_RESTManager;
 
 };
 #endif
diff --git a/Modules/CppRestSdk/src/mitkIRESTManager.cpp b/Modules/CppRestSdk/src/mitkIRESTManager.cpp
new file mode 100644
index 0000000000..65788c646f
--- /dev/null
+++ b/Modules/CppRestSdk/src/mitkIRESTManager.cpp
@@ -0,0 +1,3 @@
+#include "mitkIRESTManager.h"
+
+mitk::IRESTManager::~IRESTManager() {}
\ No newline at end of file
diff --git a/Modules/CppRestSdk/src/mitkRESTManager.cpp b/Modules/CppRestSdk/src/mitkRESTManager.cpp
new file mode 100644
index 0000000000..2e9755d6ad
--- /dev/null
+++ b/Modules/CppRestSdk/src/mitkRESTManager.cpp
@@ -0,0 +1,11 @@
+#include "mitkRESTManager.h"
+#include <mitkCommon.h>
+
+mitk::RESTManager::RESTManager() {}
+
+mitk::RESTManager::~RESTManager() {}
+
+void mitk::RESTManager::TestFunctionManager() 
+{
+  MITK_INFO << "Test for Manager";
+}